summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-08-05 01:24:54 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-08-05 01:26:01 +0200
commit3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd (patch)
tree37e23f7a2d24499cfc795e0bc2d37e140b0c333f /media-gfx/imagemagick/files
parentmedia-gfx/imagemagick: move stable keywords (diff)
downloadgentoo-3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd.tar.gz
gentoo-3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd.tar.bz2
gentoo-3ff42ccd51d4f7ce5aeef730d7dbd296a98390cd.zip
media-gfx/imagemagick: security cleanup (bug #660826)
Package-Manager: Portage-2.3.44, Repoman-2.3.10
Diffstat (limited to 'media-gfx/imagemagick/files')
-rw-r--r--media-gfx/imagemagick/files/imagemagick-7.0.26-FTBFS-on-i386.patch36
1 files changed, 0 insertions, 36 deletions
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 c568ed345ecd..000000000000
--- 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 <svante.signell@gmail.com>
-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 ("