summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-07-06 16:20:03 +0000
committerJeroen Roovers <jer@gentoo.org>2012-07-06 16:20:03 +0000
commit6f5b5414d43d41d5d8f8f4418c5396b64b72eb37 (patch)
treee915110579d8fd22cfa833718ddb34b31239f8da /x11-terms
parentinstall duce files with USE=ocamlduce, by Jacques-Pascal Deplaix, bug #425020 (diff)
downloadgentoo-2-6f5b5414d43d41d5d8f8f4418c5396b64b72eb37.tar.gz
gentoo-2-6f5b5414d43d41d5d8f8f4418c5396b64b72eb37.tar.bz2
gentoo-2-6f5b5414d43d41d5d8f8f4418c5396b64b72eb37.zip
Fix building against >perl-core/ExtUtils-ParseX-3 (reported by Keshav Kini in bug #424697).
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/rxvt-unicode/ChangeLog7
-rw-r--r--x11-terms/rxvt-unicode/files/rxvt-unicode-9.15-xsubpp.patch11
-rw-r--r--x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild6
3 files changed, 21 insertions, 3 deletions
diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index b28412879051..101cad5b9076 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-terms/rxvt-unicode
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.221 2012/06/18 02:42:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.222 2012/07/06 16:20:03 jer Exp $
+
+ 06 Jul 2012; Jeroen Roovers <jer@gentoo.org> rxvt-unicode-9.15-r1.ebuild,
+ +files/rxvt-unicode-9.15-xsubpp.patch:
+ Fix building against >perl-core/ExtUtils-ParseX-3 (reported by Keshav Kini in
+ bug #424697).
*rxvt-unicode-9.15-r1 (18 Jun 2012)
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.15-xsubpp.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.15-xsubpp.patch
new file mode 100644
index 000000000000..6e75d419e6f4
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.15-xsubpp.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -112,7 +112,7 @@
+ $(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt
+
+ rxvtperl.C: rxvtperl.xs iom_perl.h iom_perl.xs typemap typemap.iom
+- PERL="$(PERL)" $(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
++ PERL="$(PERL)" $(PERL) /usr/bin/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
+
+ rxvtperl.o: rxvtperl.C perlxsi.c
+ $(COMPILE) $(PERLFLAGS) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
index a28cb1fdb797..9f51f53d9bb7 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild,v 1.1 2012/06/18 02:42:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.15-r1.ebuild,v 1.2 2012/07/06 16:20:03 jer Exp $
EAPI="4"
@@ -41,7 +41,9 @@ REQUIRED_USE="vanilla? ( !alt-font-width !buffer-on-clear focused-urgency !secon
src_prepare() {
# fix for prefix not installing properly
- epatch "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
+ epatch \
+ "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch \
+ "${FILESDIR}"/${PN}-9.15-xsubpp.patch
if ! use afterimage && ! use pixbuf; then
einfo " + If you want transparency support, please enable either the *pixbuf*"