rev 20837 - in kde-extras/digikam/branches/5.3/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2017-09-29 04:53:57 +0000 (Fri, 29 Sep 2017)
New Revision: 20837

Added:
   kde-extras/digikam/branches/5.3/debian/patches/0001-Disable-fno-operator-names.patch
Modified:
   kde-extras/digikam/branches/5.3/debian/changelog
   kde-extras/digikam/branches/5.3/debian/patches/series
Log:
remove -fno-operator-names, avoid build failure.

Modified: kde-extras/digikam/branches/5.3/debian/changelog
===================================================================
--- kde-extras/digikam/branches/5.3/debian/changelog	2017-09-29 04:05:57 UTC (rev 20836)
+++ kde-extras/digikam/branches/5.3/debian/changelog	2017-09-29 04:53:57 UTC (rev 20837)
@@ -1,3 +1,11 @@
+digikam (4:5.3.0-3) unstable; urgency=medium
+
+  * patches/0001-Disable-fno-operator-names.patch: New.  Strip
+    "-fno-operator-names" from compiler flags to avoid build failure.
+    Closes: #876154.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 28 Sep 2017 23:47:38 -0500
+
 digikam (4:5.3.0-2) unstable; urgency=medium
 
   * kipi-plugins: Change konqueror from Recommends to Suggested.  Closes:

Added: kde-extras/digikam/branches/5.3/debian/patches/0001-Disable-fno-operator-names.patch
===================================================================
--- kde-extras/digikam/branches/5.3/debian/patches/0001-Disable-fno-operator-names.patch	                        (rev 0)
+++ kde-extras/digikam/branches/5.3/debian/patches/0001-Disable-fno-operator-names.patch	2017-09-29 04:53:57 UTC (rev 20837)
@@ -0,0 +1,29 @@
+From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich <moritz at tarn-vedra.de>
+Date: Wed, 22 Feb 2017 15:28:11 +0100
+Subject: [PATCH] Disable `-fno-operator-names`
+
+Patch obtained from https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
+Workaround for KDE's ECM change; see https://bugs.kde.org/show_bug.cgi?id=375195
+
+
+---
+ core/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 89e06827e6..01d0c88ea9 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -98,6 +98,8 @@ include(MacroOpenCV)
+ include(MacroJPEG)
+ include(MacroBoolTo01)
+ 
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ # ==================================================================================================
+ 
+ option(ENABLE_OPENCV3               "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)"                           OFF)
+-- 
+2.11.1
+

Modified: kde-extras/digikam/branches/5.3/debian/patches/series
===================================================================
--- kde-extras/digikam/branches/5.3/debian/patches/series	2017-09-29 04:05:57 UTC (rev 20836)
+++ kde-extras/digikam/branches/5.3/debian/patches/series	2017-09-29 04:53:57 UTC (rev 20837)
@@ -1 +1,2 @@
 cmake-disable-jasper.patch
+0001-Disable-fno-operator-names.patch