Skip to content

Commit

Permalink
kde-apps/libkdcraw: Fix build w/ ecm 5.31
Browse files Browse the repository at this point in the history
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
  • Loading branch information
johu committed Jan 29, 2017
1 parent 2d3dac8 commit 0c44a69
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
31 changes: 31 additions & 0 deletions kde-apps/libkdcraw/files/libkdcraw-16.12.1-ecm531.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
commit 0c7d309289c78631be4b595119d4783fe21cf65b
Author: Aleix Pol <[email protected]>
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

2 changes: 2 additions & 0 deletions kde-apps/libkdcraw/libkdcraw-16.12.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ DEPEND="
>=media-libs/libraw-0.16:=
"
RDEPEND="${DEPEND}"

PATCHES=( "${FILESDIR}/${P}-ecm531.patch" )

0 comments on commit 0c44a69

Please sign in to comment.