summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-06-18 11:51:06 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-06-18 11:51:19 +0200
commitd4658e180df072cdcb4102bc79b8b5b08558df60 (patch)
tree972c044e51a385e95628c1c858d7b9bddac71d37 /media-gfx/ufraw
parentmedia-libs/libwmf: keyword ~arm64 (diff)
downloadgentoo-d4658e180df072cdcb4102bc79b8b5b08558df60.tar.gz
gentoo-d4658e180df072cdcb4102bc79b8b5b08558df60.tar.bz2
gentoo-d4658e180df072cdcb4102bc79b8b5b08558df60.zip
media-gfx/ufraw: Fix build with gcc 7.
Patch by Johannes Hirte, bug #618068 Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'media-gfx/ufraw')
-rw-r--r--media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch16
-rw-r--r--media-gfx/ufraw/ufraw-0.22-r1.ebuild1
2 files changed, 17 insertions, 0 deletions
diff --git a/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
new file mode 100644
index 000000000000..8c11f6649781
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.22-drop_superfluous_abs.patch
@@ -0,0 +1,16 @@
+Fixes build with gcc 7, by Johannes Hirte.
+https://bugs.gentoo.org/show_bug.cgi?id=618068
+
+diff --git a/../old/dcraw.cc b/dcraw.cc
+index 88c8068..cedf86b 100644
+--- a/../old/dcraw.cc
++++ b/dcraw.cc
+@@ -9242,7 +9242,7 @@ canon_a5:
+ if (make[0] == 'O') {
+ i = find_green (12, 32, 1188864, 3576832);
+ c = find_green (12, 32, 2383920, 2387016);
+- if (abs(i) < abs(c)) {
++ if (i < c) {
+ SWAP(i,c);
+ load_flags = 24;
+ }
diff --git a/media-gfx/ufraw/ufraw-0.22-r1.ebuild b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
index 225999943e4e..155af1ce1709 100644
--- a/media-gfx/ufraw/ufraw-0.22-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.22-r1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
"${FILESDIR}"/${P}-jasper-automagic.patch
"${FILESDIR}"/${P}-crashfix.patch
+ "${FILESDIR}"/${P}-drop_superfluous_abs.patch
)
src_prepare() {