ports/75846: [patch] graphics/digikam: Unbreak on 4.X

[Volker Stolz]

>Number:         75846
>Category:       ports
>Synopsis:       [patch] graphics/digikam: Unbreak on 4.X
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 05 10:00:41 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Volker Stolz
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Lehrstuhl für Informatik II; RWTH Aachen Universität
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.10-STABLE FreeBSD 4.10-STABLE #20: Thu Oct 28 13:24:05 CEST 2004 root at menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386


>Description:
Unbreak -- could somebody please test if this causes problems on 5/6?
>How-To-Repeat:
>Fix:
Add new patchfile:

--- patch-vs begins here ---
--- digikam/digikam/digikamfirstrun.cpp.orig	Wed Jan  5 10:40:08 2005
+++ digikam/digikam/digikamfirstrun.cpp	Wed Jan  5 10:40:39 2005
@@ -20,15 +20,6 @@
  * 
  * ============================================================ */
 
-// C Ansi includes.
- 
-extern "C"
-{
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-}
-
 // C++ Includes.
  
 #include <iostream>
@@ -65,6 +56,15 @@
 #include "firstrunUI.h"
 
 #include <iostream>
+// C Ansi includes.
+ 
+extern "C"
+{
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+}
+
 using namespace std;
 
 DigikamFirstRun::DigikamFirstRun( KConfig* config,
--- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Wed Jan  5 10:45:12 2005
+++ digikam/utilities/imageeditor/imlibinterface.cpp	Wed Jan  5 10:45:29 2005
@@ -22,13 +22,6 @@
 
 #define PI 3.14159265
  
-// Lib Tiff includes.
-
-extern "C" 
-{
-#include <tiffio.h>
-}
- 
 // C++ includes.
 
 #include <cmath>
@@ -59,6 +52,13 @@
 #include "albumsettings.h"
 #include "imlibinterface.h"
 
+// Lib Tiff includes.
+
+extern "C" 
+{
+#include <tiffio.h>
+}
+ 
 namespace Digikam
 {
 
--- patch-vs ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: