summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2020-04-26 12:28:55 +0200
committerJoonas Niilola <juippis@gentoo.org>2020-04-26 16:36:51 +0300
commitc4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f (patch)
treef1f1e6993890781067ddb689cb4cd4784e2a2f46
parentx11-terms/kitty-terminfo: bump to 0.17.3 (diff)
downloadgentoo-c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f.tar.gz
gentoo-c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f.tar.bz2
gentoo-c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f.zip
media-gfx/zbar: remove unused patch
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15525 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
-rw-r--r--media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
deleted file mode 100644
index f58c3e4d9c4..00000000000
--- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixed build with imagemagick-7 (bug #592324).
-Thanks-to: J├╝rgen Rose
-
-diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac
---- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200
-+++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200
-@@ -324,7 +324,7 @@
- dnl double check ImageMagick install (bug #2582232)
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
-- AC_CHECK_HEADER([wand/MagickWand.h],
-+ AC_CHECK_HEADER([MagickWand/MagickWand.h],
- [have_IM="yes"],
- [have_IM="broken"])
- CPPFLAGS="$CPPFLAGS_save"])])
-diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c
---- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200
-+++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200
-@@ -44,7 +44,7 @@
- #endif
-
- #ifdef HAVE_IMAGEMAGICK
--# include <wand/MagickWand.h>
-+# include <MagickWand/MagickWand.h>
-
- /* ImageMagick frequently changes API names - just use the original
- * (more stable?) names to match GraphicsMagick