summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-11-25 18:30:36 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-11-25 18:35:18 +0100
commit78b1fa1e72173409b92d3232486c6a366fe829c3 (patch)
tree17614d60e6025b7be392a74d926c8fb19d7e3919 /media-gfx/zbar
parentmedia-gfx/zbar: Drop 0.10_p20121015-r3 (diff)
downloadgentoo-78b1fa1e72173409b92d3232486c6a366fe829c3.tar.gz
gentoo-78b1fa1e72173409b92d3232486c6a366fe829c3.tar.bz2
gentoo-78b1fa1e72173409b92d3232486c6a366fe829c3.zip
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>
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r--media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch (renamed from media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.diff)3
-rw-r--r--media-gfx/zbar/zbar-0.20.1.ebuild2
2 files changed, 4 insertions, 1 deletions
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
index a56ab7d913b0..f58c3e4d9c45 100644
--- 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 045ba2301cb6..a24c1daade0a 100644
--- 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