mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
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>
This commit is contained in:
committed by
Joonas Niilola
parent
f54f2b1683
commit
c4b3f3e8d1
@@ -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
|
||||
Reference in New Issue
Block a user