rev 20268 - in kde-extras/digikam/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-01-10 14:44:45 +0000 (Sun, 10 Jan 2016)
New Revision: 20268

Added:
   kde-extras/digikam/trunk/debian/patches/upstream_fix-compilation-with-Lensfun-0.3.2.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
fix build with lensfun >= 0.3.2

backport upstream commit 0f159981176faa6da701f112bfe557b79804d468


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2016-01-10 00:27:03 UTC (rev 20267)
+++ kde-extras/digikam/trunk/debian/changelog	2016-01-10 14:44:45 UTC (rev 20268)
@@ -3,6 +3,11 @@
   * Switch build-dep from libusb-dev to libusb-1.0-0-dev.
     Closes: #810406.
 
+  [ Pino Toscano ]
+  * Backport upstream commit 0f159981176faa6da701f112bfe557b79804d468 to fix
+    build with lensfun >= 0.3.2; patch
+    upstream_fix-compilation-with-Lensfun-0.3.2.patch.
+
  -- Steve M. Robbins <smr at debian.org>  Sat, 09 Jan 2016 15:49:46 -0600
 
 digikam (4:4.14.0-3) unstable; urgency=medium

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2016-01-10 00:27:03 UTC (rev 20267)
+++ kde-extras/digikam/trunk/debian/patches/series	2016-01-10 14:44:45 UTC (rev 20268)
@@ -2,3 +2,4 @@
 doc-linkage.patch
 mysql-global-conf.patch
 sendimages-icedove.diff
+upstream_fix-compilation-with-Lensfun-0.3.2.patch

Added: kde-extras/digikam/trunk/debian/patches/upstream_fix-compilation-with-Lensfun-0.3.2.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/upstream_fix-compilation-with-Lensfun-0.3.2.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/upstream_fix-compilation-with-Lensfun-0.3.2.patch	2016-01-10 14:44:45 UTC (rev 20268)
@@ -0,0 +1,28 @@
+From 0f159981176faa6da701f112bfe557b79804d468 Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Mon, 14 Dec 2015 22:40:55 +0059
+Subject: [PATCH] fix compilation with Lensfun 0.3.2 It still compatible with
+ older lensfun releases. BUGS: 356672 FIXED-IN: 5.0.0
+
+---
+ libs/dimg/filters/lens/lensfuniface.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/core/libs/dimg/filters/lens/lensfuniface.h b/libs/dimg/filters/lens/lensfuniface.h
+index 148be26..1a9c540 100644
+--- a/core/libs/dimg/filters/lens/lensfuniface.h
++++ b/core/libs/dimg/filters/lens/lensfuniface.h
+@@ -24,10 +24,7 @@
+ 
+ // Lib LensFun includes
+ 
+-extern "C"
+-{
+ #include <lensfun.h>
+-}
+ 
+ // local includes
+ 
+-- 
+2.6.4
+