From avleeuwen@piwebs.com  Wed Apr 12 10:51:44 2006
Return-Path: <avleeuwen@piwebs.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0B53816A406
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 10:51:44 +0000 (UTC)
	(envelope-from avleeuwen@piwebs.com)
Received: from mailbox.opera.com (mail.opera.com [193.69.113.66])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E6C243D46
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 10:51:42 +0000 (GMT)
	(envelope-from avleeuwen@piwebs.com)
Received: from avl.opera.com (pat.opera.com [193.69.113.22])
	by mailbox.opera.com (8.13.4/8.13.4/Debian-3) with ESMTP id k3CApe10007401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 10:51:40 GMT
Message-Id: <1144839183.52701@avl.opera.com>
Date: Wed, 12 Apr 2006 12:53:03 +0200
From: "Arjan van Leeuwen" <avleeuwen@piwebs.com>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [PATCH] Make Digikam compile on FreeBSD 4.x
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify:

>Number:         95645
>Category:       ports
>Synopsis:       [PATCH] Make Digikam compile on FreeBSD 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 12 11:00:27 GMT 2006
>Closed-Date:    Sat Jun 10 15:55:00 GMT 2006
>Last-Modified:  Sat Jun 10 15:55:00 GMT 2006
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 6.0-SECURITY i386
>Organization:
Opera Software ASA 
>Environment:


System: FreeBSD 6.0-SECURITY #0: Tue Feb 28 22:53:43 UTC 2006
    root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC



>Description:


This patch fixes compilation of digikam (graphics/digikam) on FreeBSD 4.x.

Reported by: Kris


>How-To-Repeat:





>Fix:


--- digikam.diff begins here ---
diff -urN /usr/ports/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp digikam/files/patch-digikam_digikam_scanlib.cpp
--- /usr/ports/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp	Thu Jan  1 01:00:00 1970
+++ digikam/files/patch-digikam_digikam_scanlib.cpp	Tue Apr 11 14:00:00 2006
@@ -0,0 +1,20 @@
+--- digikam/digikam/scanlib.cpp.orig	Tue Apr 11 13:48:55 2006
++++ digikam/digikam/scanlib.cpp	Tue Apr 11 13:50:28 2006
+@@ -260,7 +260,7 @@
+     int items = 0;
+ 
+     QDir dir( directory );
+-    if ( !dir.exists() or !dir.isReadable() )
++    if ( !dir.exists() || !dir.isReadable() )
+         return 0;
+ 
+     const QFileInfoList *list = dir.entryInfoList();
+@@ -287,7 +287,7 @@
+ void ScanLib::allFiles(const QString& directory)
+ {
+     QDir dir( directory );
+-    if ( !dir.exists() or !dir.isReadable() )
++    if ( !dir.exists() || !dir.isReadable() )
+     {
+         kdWarning() << "Folder does not exist or is not readable: "
+                     << directory << endl;
diff -urN /usr/ports/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp digikam/files/patch-digikam_kioslave_digikamdates.cpp
--- /usr/ports/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp	Thu Jan  1 01:00:00 1970
+++ digikam/files/patch-digikam_kioslave_digikamdates.cpp	Tue Apr 11 14:00:00 2006
@@ -0,0 +1,11 @@
+--- digikam/kioslave/digikamdates.cpp.orig	Tue Apr 11 13:53:08 2006
++++ digikam/kioslave/digikamdates.cpp	Tue Apr 11 13:53:54 2006
+@@ -186,7 +186,7 @@
+                          .arg(moStr2)
+                          .arg(yr,4)
+                          .arg(moStr1,2),
+-                         &values, false);
++                         &values);
+ 
+             Q_LLONG     imageid;
+             QString     name;
diff -urN /usr/ports/graphics/digikam/files/patch-digikam_libs_dcraw_dcraw_parse.cpp digikam/files/patch-digikam_libs_dcraw_dcraw_parse.cpp
--- /usr/ports/graphics/digikam/files/patch-digikam_libs_dcraw_dcraw_parse.cpp	Thu Jan  1 01:00:00 1970
+++ digikam/files/patch-digikam_libs_dcraw_dcraw_parse.cpp	Tue Apr 11 14:00:00 2006
@@ -0,0 +1,14 @@
+--- digikam/libs/dcraw/dcraw_parse.cpp.orig	Tue Apr 11 13:17:23 2006
++++ digikam/libs/dcraw/dcraw_parse.cpp	Tue Apr 11 13:34:31 2006
+@@ -25,7 +25,11 @@
+ extern "C" 
+ {
+ #include <ctype.h>
++#if defined(__FreeBSD__) && __FreeBSD__ < 5
++#include <sys/param.h>
++#else
+ #include <netinet/in.h>
++#endif
+ }
+ 
+ // C++ includes
diff -urN /usr/ports/graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp
--- /usr/ports/graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp	Sun Feb  5 10:56:36 2006
+++ digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp	Tue Apr 11 14:00:01 2006
@@ -1,5 +1,35 @@
---- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Mon Jan 23 22:31:31 2006
-+++ digikam/utilities/imageeditor/imlibinterface.cpp	Mon Jan 23 22:32:01 2006
+--- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Mon Jan 16 19:10:18 2006
++++ digikam/utilities/imageeditor/imlibinterface.cpp	Tue Apr 11 13:31:25 2006
+@@ -21,14 +21,6 @@
+ 
+ // Lib Tiff includes.
+ 
+-extern "C" 
+-{
+-#include <tiffio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <unistd.h>
+-}
+- 
+ // C++ includes.
+ 
+ #include <cmath>
+@@ -36,6 +28,14 @@
+ #include <cstdlib>
+ #include <iostream>
+ 
++extern "C"
++{
++#include <tiffio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++}
++
+ // Qt includes.
+ 
+ #include <qstring.h>
 @@ -203,7 +203,7 @@
      {
          return PNG_IMAGE;
--- digikam.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Tue May 9 23:42:10 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95645 

From: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
To: "Arjan van Leeuwen" <avleeuwen@piwebs.com>
Cc: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/95645: [PATCH] Make Digikam compile on FreeBSD 4.x
Date: Thu, 11 May 2006 21:44:23 +0300

 --Sig_177/IAZGUFU+_skBNw0eO6k
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 Please take a look at:
 http://sce-tindy.tecnik93.com/tb/logs/4-STABLE-i386-myPT/digikam-0.8.1_2.log
 the pkg_delete part, maybe you can figure out what's wrong.
 
 
 Thanks,
 --=20
 IOnut - Un^d^dregistered ;) FreeBSD "user"
   "Intellectual Property" is   nowhere near as valuable   as "Intellect"
 
 BOFH excuse #338:
 old inkjet cartridges emanate barium-based fumes
 
 
 
 --Sig_177/IAZGUFU+_skBNw0eO6k
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)
 
 iD8DBQFEY4YHBX6fi0k6KXsRAtXjAJ41V7/FlIM/N9qPzd6cFovmhWJUvwCfVQJF
 7CBTJMFfnVKpVjk78bA1BC0=
 =kWjn
 -----END PGP SIGNATURE-----
 
 --Sig_177/IAZGUFU+_skBNw0eO6k--
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Thu May 11 19:25:02 UTC 2006 
State-Changed-Why:  
Ask for maintainer fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95645 
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Sun Jun 4 17:15:26 UTC 2006 
State-Changed-Why:  
Maintainer time-out 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95645 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Sat Jun 10 15:54:59 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95645 
>Unformatted:
