From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/
Date: Mon, 15 May 2017 15:23:23 +0000 (UTC) [thread overview]
Message-ID: <1494861785.ffb4b769ec24ec1e0801375dadacffd557b6ce75.aballier@gentoo> (raw)
commit: ffb4b769ec24ec1e0801375dadacffd557b6ce75
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 15:23:05 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon May 15 15:23:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb4b769
media-gfx/sam2p: Import upstream fix to build with perl 5.26, bug #617014
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch | 23 +++++++++++++++++++++++
media-gfx/sam2p/sam2p-0.49.3.ebuild | 4 ++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
new file mode 100644
index 00000000000..cb24dbda1bd
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch
@@ -0,0 +1,23 @@
+commit 79a7de171f461a1c79089fa770f0da186e87c723
+Author: Peter Szabo <pts@fazekas.hu>
+Date: Sun Apr 30 04:00:23 2017 +0200
+
+ fixed Perl 5.26 compatibility for perl -x (https://github.com/pts/sam2p/issues/2)
+
+diff --git a/Makefile b/Makefile
+index 849b09d..1791a9c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -71,10 +71,10 @@ sam2p_version.h: debian/changelog
+ sam2p_main.o: sam2p_version.h
+
+ xpmc.h: cols2.pl
+- perl -x cols2.pl >xpmc.h
++ perl -x ./cols2.pl >xpmc.h
+
+ #HQ=perl -e'$$_=join"",<STDIN>; s@([^\w\.\/\-])@sprintf"\\%03o",ord$$1@ge; print "\"$$_\"\n"'
+-HQ=perl -x hq.pl
++HQ=perl -x ./hq.pl
+ #%.tth: %.tte
+ # <$< >$@ $(HQ)
+ #%.tth: %.ttm
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index 446f3a38cd3..d27c1270348 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ DEPEND="dev-lang/perl"
RESTRICT="test"
-PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch )
+PATCHES=( "${FILESDIR}"/${P}-build-fixes.patch "${FILESDIR}/${P}-perl526.patch" )
src_prepare() {
default
next reply other threads:[~2017-05-15 15:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-15 15:23 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-01 16:25 [gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/files/, media-gfx/sam2p/ Sam James
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=1494861785.ffb4b769ec24ec1e0801375dadacffd557b6ce75.aballier@gentoo \
--to=aballier@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