commit: d4658e180df072cdcb4102bc79b8b5b08558df60 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Sun Jun 18 09:51:06 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sun Jun 18 09:51:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4658e18
media-gfx/ufraw: Fix build with gcc 7. Patch by Johannes Hirte, bug #618068 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../ufraw/files/ufraw-0.22-drop_superfluous_abs.patch | 16 ++++++++++++++++ media-gfx/ufraw/ufraw-0.22-r1.ebuild | 1 + 2 files changed, 17 insertions(+) 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 00000000000..8c11f664978 --- /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 225999943e4..155af1ce170 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() {
