media-gfx/zbar: mv diff -> patch, add basic patch header

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
similarity index 93%
rename from media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
rename to media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
index a56ab7d913b058219caf4f4967dfb8ebabf054f8..f58c3e4d9c454f4bec428f4d6ff43ad77bdd202f 100644 (file)
--- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff
+++ b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
@@ -1,3 +1,6 @@
+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

diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
index 045ba2301cb6c9c19df5b50fe0bdbe3a3fd1355e..a24c1daade0a4b45c6d3bbdad56e0a8d59fe6d1a 100644 (file)
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
        default
 
        if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-               eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.diff"
+               eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
        fi
 
        use python && python_fix_shebang examples/upcrpc.py test/*.py