From: Johannes Huber <johu@gentoo.org>
Date: Sun, 29 Jan 2017 12:41:31 +0000 (+0100)
Subject: kde-apps/libkdcraw: Fix build w/ ecm 5.31
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c44a69cfad936e0cb969503083a5099d2f7ef70;p=gentoo.git

kde-apps/libkdcraw: Fix build w/ ecm 5.31

Add upstream patch to fix build with next extra cmake modules version. This add
cflags -fno-operator-names by default, which breaks the build here.

Thanks-to: karolherbst

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch b/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch
new file mode 100644
index 000000000000..41993344f8a8
--- /dev/null
+++ b/kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch
@@ -0,0 +1,31 @@
+commit 0c7d309289c78631be4b595119d4783fe21cf65b
+Author: Aleix Pol <aleixpol@kde.org>
+Date:   Wed Jan 18 12:13:20 2017 +0100
+
+    Fix build
+    
+    frameworks/libkdcraw/src/kdcraw_p.h:49:5: warning: 'not' is not defined,
+    evaluates to 0
+
+diff --git a/src/kdcraw_p.h b/src/kdcraw_p.h
+index f639ca4..71b36b3 100644
+--- a/src/kdcraw_p.h
++++ b/src/kdcraw_p.h
+@@ -31,7 +31,7 @@
+ #include <QByteArray>
+ 
+ // Pragma directives to reduce warnings from LibRaw header files.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -46,7 +46,7 @@
+ #include <libraw.h>
+ 
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+ 
diff --git a/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
index bbd65e43ee19..1daec0d30e25 100644
--- a/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
@@ -17,3 +17,5 @@ DEPEND="
 	>=media-libs/libraw-0.16:=
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-ecm531.patch" )