From 5c1ea25b9b7e01f09b80ff71fdbc161bf06af217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sun, 5 Aug 2018 11:38:12 +0200 Subject: [PATCH] [media-gfx/imagemagick] version bump to 6.9.10.8 --- media-gfx/imagemagick/Manifest | 2 +- .../imagemagick-7.0.26-FTBFS-on-i386.patch | 36 ------------------- ...0.5.ebuild => imagemagick-6.9.10.8.ebuild} | 4 +-- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch rename media-gfx/imagemagick/{imagemagick-6.9.10.5.ebuild => imagemagick-6.9.10.8.ebuild} (94%) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 444acac2a..7a0ac4f7c 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1 +1 @@ -DIST ImageMagick-6.9.10-5.tar.xz 8921204 BLAKE2B b11c6dded5b42b797585e8253441fa6265de9f06241206b9ce29781df6c8896e9dd0ec967191ff28fcae445130d38e7e781728cbc27752b33b3422d971459952 SHA512 b6c068918a2c23bc86d84a1fd81bd8c0aea83fee0c33b5c686c7c6180231be2b27c1c43be111555017d2065fa97ba36c084e1479ff771846b73d500d67c7f85b +DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2 diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch b/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch deleted file mode 100644 index c568ed345..000000000 --- a/media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch +++ /dev/null @@ -1,36 +0,0 @@ -Gentoo-Bug: https://bugs.gentoo.org/653752 -Upstream issue: https://github.com/ImageMagick/ImageMagick/issues/1019 - - -From 0c26fea274e615ff6b179bdd30e970a55f6c3f52 Mon Sep 17 00:00:00 2001 -From: Svante Signell -Date: Mon, 25 Jun 2018 16:06:19 +0200 -Subject: Fix FTBFS on i386 any - -bug-debian: https://bugs.debian.org/898914 ---- - Magick++/tests/attributes.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp -index 9ebc67f2d..e969def27 100644 ---- a/Magick++/tests/attributes.cpp -+++ b/Magick++/tests/attributes.cpp -@@ -154,7 +154,7 @@ int main( int /*argc*/, char ** argv) - // - - // Test default value. -- if ( image.backgroundColor() != ColorRGB("white") ) -+ if ( image.backgroundColor() != string(ColorRGB("white")) ) - { - ++failures; - cout << "Line: " << __LINE__ << ", backgroundColor default (" -@@ -1068,7 +1068,7 @@ int main( int /*argc*/, char ** argv) - // pixelColor - // - // Test default -- if ( image.pixelColor(40,60) != canvasColor ) -+ if ( image.pixelColor(40,60) != string(canvasColor) ) - { - ++failures; - cout << "Line: " << __LINE__ << ", pixelColor default (" diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild similarity index 94% rename from media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild rename to media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild index 324500b22..6186c3f47 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.5.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~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" +KEYWORDS="alpha amd64 arm 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" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" @@ -64,8 +64,6 @@ DEPEND="${RDEPEND} REQUIRED_USE="corefonts? ( truetype ) test? ( corefonts )" -PATCHES=( "${FILESDIR}"/${PN}-7.0.26-FTBFS-on-i386.patch ) - S="${WORKDIR}/${MY_P}" src_prepare() {