From 328ff5a801cde5afe8f30e064a0ed1e2fdc56b27 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Nov 17 2014 15:21:43 +0000
Subject: fix/workaround FTBFS against newer libjpeg-turbo (kde#340944)


---

diff --git a/digikam-libjpeg_turbo_macros.patch b/digikam-libjpeg_turbo_macros.patch
new file mode 100644
index 0000000..b79c635
--- /dev/null
+++ b/digikam-libjpeg_turbo_macros.patch
@@ -0,0 +1,61 @@
+diff -up digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h.JPP digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h
+--- digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h.JPP	2014-11-12 04:52:49.000000000 -0600
++++ digikam-4.5.0/core/libs/dimg/loaders/iccjpeg.h	2014-11-17 09:05:03.975853379 -0600
+@@ -45,6 +45,13 @@
+ #include <stdio.h>    /* needed to define "FILE", "NULL" */
+ #include <jpeglib.h>
+ 
++#ifndef JPP
++#define JPP(x) x
++#endif
++
++#ifndef FAR
++#define FAR
++#endif
+ 
+ /**
+  * This routine writes the given ICC profile data into a JPEG file.
+diff -up digikam-4.5.0/core/libs/jpegutils/libjpeg-62/jinclude.h.JPP digikam-4.5.0/core/libs/jpegutils/libjpeg-62/jinclude.h
+diff -up digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h.JPP digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h
+--- digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h.JPP	2014-11-12 04:52:49.000000000 -0600
++++ digikam-4.5.0/core/libs/jpegutils/libjpeg-62/transupp.h	2014-11-17 09:07:33.447361822 -0600
+@@ -32,6 +32,9 @@
+ #define jcopy_markers_execute			jCMrkExec
+ #endif /* NEED_SHORT_EXTERNAL_NAMES */
+ 
++#ifndef JPP
++#define JPP(x) x
++#endif
+ 
+ /*
+  * Codes for supported types of image transformations.
+diff -up digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h.JPP digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h
+--- digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h.JPP	2014-11-12 04:53:14.000000000 -0600
++++ digikam-4.5.0/extra/kipi-plugins/common/libkipiplugins/tools/imageio/iccjpeg.h	2014-11-17 09:00:48.591123547 -0600
+@@ -45,6 +45,13 @@
+ #include <stdio.h>    /* needed to define "FILE", "NULL" */
+ #include <jpeglib.h>
+ 
++#ifndef JPP
++#define JPP(x) x
++#endif
++
++#ifndef FAR
++#define FAR
++#endif
+ 
+ /**
+  * This routine writes the given ICC profile data into a JPEG file.
+diff -up digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h.JPP digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h
+--- digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h.JPP	2014-11-12 04:53:14.000000000 -0600
++++ digikam-4.5.0/extra/kipi-plugins/jpeglossless/libjpeg/transupp.h	2014-11-17 09:02:17.295615766 -0600
+@@ -94,6 +94,9 @@ namespace KIPIJPEGLossLessPlugin
+ #define jcopy_markers_execute		jCMrkExec
+ #endif /* NEED_SHORT_EXTERNAL_NAMES */
+ 
++#ifndef JPP
++#define JPP(x) x
++#endif
+ 
+ /*
+  * Codes for supported types of image transformations.
diff --git a/digikam.spec b/digikam.spec
index b4368ec..5afcc88 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 
 Name:    digikam
 Version: 4.5.0
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
@@ -25,7 +25,10 @@ Source1: digikam-import.desktop
 #-DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON enables also libkipi, libkexiv2, libkdcraw, libksane
 # https://bugs.kde.org/show_bug.cgi?id=340945
 Patch0: digikam-4.5.0-enable-libs.patch
+
 ## upstreamable patches
+# fix/workaround FTBFS against newer libjpeg-turbo, https://bugs.kde.org/show_bug.cgi?id=340944
+Patch1: digikam-libjpeg_turbo_macros.patch
 
 ## upstream patches
 
@@ -239,6 +242,7 @@ BuildArch: noarch
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch0 -p1 -b .enable-libs
+%patch1 -p1 -b .libjpeg_turbo_macros
 
 ## HACK to allow building with older opencv (for now), see
 # https://bugzilla.redhat.com/show_bug.cgi?id=1119036
@@ -563,6 +567,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Mon Nov 17 2014 Rex Dieter <rdieter@fedoraproject.org> 4.5.0-2
+- fix/workaround FTBFS against newer libjpeg-turbo (kde#340944)
+
 * Fri Nov 14 2014 Alexey Kurov <nucleo@fedoraproject.org> - 4.5.0-1
 - digikam-4.5.0