ports/95645: [PATCH] Make Digikam compile on FreeBSD 4.x

[Arjan van Leeuwen]

>Number:         95645
>Category:       ports
>Synopsis:       [PATCH] Make Digikam compile on FreeBSD 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 12 11:00:27 GMT 2006
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: