Revision: 24199
http://sourceforge.net/p/gar/code/24199
Author: opk
Date: 2014-10-20 14:46:43 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
urxvt: get perl support working
Modified Paths:
--------------
csw/mgar/pkg/urxvt/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/urxvt/trunk/files/0003-handle-old-X-render.patch
csw/mgar/pkg/urxvt/trunk/files/0004-set-options-for-perl.patch
csw/mgar/pkg/urxvt/trunk/files/0005-avoid-bashism-in-install.patch
Modified: csw/mgar/pkg/urxvt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/urxvt/trunk/Makefile 2014-10-18 16:09:39 UTC (rev 24198)
+++ csw/mgar/pkg/urxvt/trunk/Makefile 2014-10-20 14:46:43 UTC (rev 24199)
@@ -35,8 +35,11 @@
EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib
PATCHFILES += 0001-remove-old-solaris-fix.patch
PATCHFILES += 0002-hardcode-missing-constant.patch
+PATCHFILES += 0003-handle-old-X-render.patch
+PATCHFILES += 0004-set-options-for-perl.patch
+PATCHFILES += 0005-avoid-bashism-in-install.patch
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --disable-perl
+CONFIGURE_ARGS += --enable-perl PERL=/opt/csw/bin/perl
CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo
EXTRA_LDFLAGS = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
EXTRA_LINKER_FLAGS = -lrt
@@ -51,6 +54,7 @@
RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibgdk-pixbuf2-0-0
RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWterminfo
RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWterminfo-rxvt-unicode
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWperl
CHECKPKG_OVERRIDES_CSWrxvt-unicode += surplus-dependency|CSWterminfo
CHECKPKG_OVERRIDES_CSWrxvt-unicode +=
surplus-dependency|CSWterminfo-rxvt-unicode
OBSOLETED_BY_CSWrxvt-unicode = CSWurxvt
Added: csw/mgar/pkg/urxvt/trunk/files/0003-handle-old-X-render.patch
===================================================================
--- csw/mgar/pkg/urxvt/trunk/files/0003-handle-old-X-render.patch
(rev 0)
+++ csw/mgar/pkg/urxvt/trunk/files/0003-handle-old-X-render.patch
2014-10-20 14:46:43 UTC (rev 24199)
@@ -0,0 +1,34 @@
+From 54e91b730926bce0c42bd8e4299370a130980cd5 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <o...@opencsw.org>
+Date: Mon, 20 Oct 2014 14:57:15 +0200
+Subject: [PATCH] handle old X render
+
+---
+ src/rxvtperl.xs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
+index 92ad48c..6b8e10c 100644
+--- a/src/rxvtperl.xs
++++ b/src/rxvtperl.xs
+@@ -968,6 +968,8 @@ BOOT:
+ const_iv (PictOpConjointAtopReverse),
+ const_iv (PictOpConjointXor),
+ // 0.11+
++#endif
++# if 0
+ const_iv (PictOpMultiply),
+ const_iv (PictOpScreen),
+ const_iv (PictOpOverlay),
+@@ -983,8 +985,6 @@ BOOT:
+ const_iv (PictOpHSLSaturation),
+ const_iv (PictOpHSLColor),
+ const_iv (PictOpHSLLuminosity),
+-#endif
+-# if 0
+ const_iv (XIMForwardChar),
+ const_iv (XIMBackwardChar),
+ const_iv (XIMForwardWord),
+--
+2.0.3
+
Added: csw/mgar/pkg/urxvt/trunk/files/0004-set-options-for-perl.patch
===================================================================
--- csw/mgar/pkg/urxvt/trunk/files/0004-set-options-for-perl.patch
(rev 0)
+++ csw/mgar/pkg/urxvt/trunk/files/0004-set-options-for-perl.patch
2014-10-20 14:46:43 UTC (rev 24199)
@@ -0,0 +1,36 @@
+From 6536c5cd044cbb5c79c958072dc1566a4efed05e Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <o...@opencsw.org>
+Date: Mon, 20 Oct 2014 15:35:43 +0200
+Subject: [PATCH 5/5] set options for perl
+
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 46fca6b..811ff53 100755
+--- a/configure
++++ b/configure
+@@ -7845,8 +7845,8 @@ $as_echo_n "checking for $PERL suitability... " >&6; }
+
+ save_CXXFLAGS="$CXXFLAGS"
+ save_LIBS="$LIBS"
+- CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
+- LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
++ CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts|sed
's/-xarch=sparc//'` -I/opt/csw/lib/perl/5.10.1/CORE"
++ LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts|sed 's/-xarch=sparc//'`"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -7882,7 +7882,7 @@ $as_echo "#define ENABLE_PERL 1" >>confdefs.h
+
+ IF_PERL=
+ PERL_O=rxvtperl.o
+- PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
++ PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts|sed 's/-xarch=sparc//'`
-I/opt/csw/lib/perl/5.10.1/CORE"
+ PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
+ PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
+ else
+--
+2.0.3
+
Added: csw/mgar/pkg/urxvt/trunk/files/0005-avoid-bashism-in-install.patch
===================================================================
--- csw/mgar/pkg/urxvt/trunk/files/0005-avoid-bashism-in-install.patch
(rev 0)
+++ csw/mgar/pkg/urxvt/trunk/files/0005-avoid-bashism-in-install.patch
2014-10-20 14:46:43 UTC (rev 24199)
@@ -0,0 +1,25 @@
+From 5ef2501d3be90d74c5711c96b7590505ab9aab99 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <o...@opencsw.org>
+Date: Mon, 20 Oct 2014 16:18:42 +0200
+Subject: [PATCH] avoid bashism in install
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c51d3f7..5821ec1 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -107,7 +107,7 @@ install-perl:
+ @IF_PERL@ $(INSTALL_DATA) $(srcdir)/urxvt.pm
$(DESTDIR)$(libdir)/urxvt/urxvt.pm
+ @IF_PERL@ for ext in $(srcdir)/perl/*; do \
+ @IF_PERL@ test -f "$$ext" || continue; \
+-@IF_PERL@ base="$${ext##*/}"; \
++@IF_PERL@ base="`basename $${ext}`"; \
+ @IF_PERL@ $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/; \
+ @IF_PERL@ < "$$ext" \
+ @IF_PERL@ $(PERL) -MPod::Man -e '(new Pod::Man name =>
"'urxvt-$$base'", $(PODOPTS))->parse_from_file' \
+--
+2.0.3
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
