From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
Date: Sun, 25 Nov 2018 17:36:25 +0000 (UTC) [thread overview]
Message-ID: <1543167318.78b1fa1e72173409b92d3232486c6a366fe829c3.asturm@gentoo> (raw)
commit: 78b1fa1e72173409b92d3232486c6a366fe829c3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 17:30:36 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 17:35:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b1fa1e
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 <AT> gentoo.org>
...1015-ImageMagick-7.diff => zbar-0.10_p20121015-ImageMagick-7.patch} | 3 +++
media-gfx/zbar/zbar-0.20.1.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
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 a56ab7d913b..f58c3e4d9c4 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 045ba2301cb..a24c1daade0 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
next reply other threads:[~2018-11-25 17:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-25 17:36 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-09 8:53 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/ Sam James
2022-05-08 23:29 Andreas Sturmlechner
2021-06-04 11:23 Marek Szuba
2021-06-04 11:23 Marek Szuba
2020-02-03 17:37 Andreas Sturmlechner
2017-05-23 9:20 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1543167318.78b1fa1e72173409b92d3232486c6a366fe829c3.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox