summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-08-22 22:12:30 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-08-22 22:21:39 +0200
commit5f5e2bfcba50b555f8bfd7083c5f74c265771a2e (patch)
tree3cbc339f9f2bbc57a839e863eb10148bed75dd7e /media-gfx
parentmedia-gfx/imagemagick: provide unrestricted policy during build to pass tests (diff)
downloadgentoo-5f5e2bfcba50b555f8bfd7083c5f74c265771a2e.tar.gz
gentoo-5f5e2bfcba50b555f8bfd7083c5f74c265771a2e.tar.bz2
gentoo-5f5e2bfcba50b555f8bfd7083c5f74c265771a2e.zip
media-gfx/imagemagick: fix build issue in MagickCore/quantum-private.h
Closes: https://bugs.gentoo.org/664226 Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch24
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild2
2 files changed, 26 insertions, 0 deletions
diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch b/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch
new file mode 100644
index 00000000000..4514dcc7d2c
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/664226
+
+From 6cc5e2d68431249a647f22e5320f8a0481e3e3f4 Mon Sep 17 00:00:00 2001
+From: Cristy <urban-warrior@imagemagick.org>
+Date: Wed, 15 Aug 2018 16:59:30 -0400
+Subject: [PATCH] Fix compile exception
+
+---
+ MagickCore/quantum-private.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
+index e02c70348c..2ff6babb7c 100644
+--- a/MagickCore/quantum-private.h
++++ b/MagickCore/quantum-private.h
+@@ -659,7 +659,7 @@ static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
+ return(0);
+ if (quantum >= 18446744073709551615)
+ return(18446744073709551615);
+- return((MagickSizeType (quantum+0.5));
++ return((MagickSizeType) (quantum+0.5));
+ #endif
+ }
+
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
index be9dabf5dac..48cf34160ea 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.10-r1.ebuild
@@ -16,6 +16,8 @@ else
MY_P=ImageMagick-$(ver_rs 3 '-')
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+ PATCHES+=( "${FILESDIR}"/${P}-quantum-private-compile-fix.patch ) #664226
fi
DESCRIPTION="A collection of tools and libraries for many image formats"