SF.net SVN: gar:[24184] csw/mgar/pkg/urxvt/trunk

[opk at users.sourceforge.net]

Revision: 24184
          http://sourceforge.net/p/gar/code/24184
Author:   opk
Date:     2014-10-16 08:58:07 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
update urxvt recipe for 9.20 release

Modified Paths:
--------------
    csw/mgar/pkg/urxvt/trunk/Makefile
    csw/mgar/pkg/urxvt/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/urxvt/trunk/files/0001-remove-old-solaris-fix.patch
    csw/mgar/pkg/urxvt/trunk/files/0002-hardcode-missing-constant.patch

Modified: csw/mgar/pkg/urxvt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/urxvt/trunk/Makefile	2014-10-16 08:46:32 UTC (rev 24183)
+++ csw/mgar/pkg/urxvt/trunk/Makefile	2014-10-16 08:58:07 UTC (rev 24184)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = rxvt-unicode
-VERSION = 9.07
+VERSION = 9.20
 GARTYPE = v2
 
 DESCRIPTION = VT102 emulator for the X window system (pron. ouR XVT, unicode)
@@ -22,16 +22,28 @@
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 DISTFILES += urxvt-wrapper
 VENDOR_URL = http://software.schmorp.de/pkg/rxvt-unicode.html
-PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc
 GARCOMPILER = GNU
 
-PATCHFILES += rxvt-unicode-9.06-solaris8.patch
+EXTRA_INC = /opt/csw/X11/include
+EXTRA_LIB = /opt/csw/X11/lib
+EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib
+PATCHFILES += 0001-remove-old-solaris-fix.patch
+PATCHFILES += 0002-hardcode-missing-constant.patch
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-perl
 CONFIGURE_ARGS += --with-terminfo=/opt/csw/share/terminfo
+EXTRA_LDFLAGS  = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
+EXTRA_LINKER_FLAGS = -lrt
 
 PACKAGES = CSWrxvt-unicode
 SPKG_DESC_CSWrxvt-unicode = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWstartupnotif
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWrxvt-unicode += CSWterminfo
 CHECKPKG_OVERRIDES_CSWrxvt-unicode += surplus-dependency|CSWterminfo
 OBSOLETED_BY_CSWrxvt-unicode = CSWurxvt

Modified: csw/mgar/pkg/urxvt/trunk/checksums
===================================================================
--- csw/mgar/pkg/urxvt/trunk/checksums	2014-10-16 08:46:32 UTC (rev 24183)
+++ csw/mgar/pkg/urxvt/trunk/checksums	2014-10-16 08:58:07 UTC (rev 24184)
@@ -1 +1 @@
-49bb52c99e002bf85eb41d8385d903b5  rxvt-unicode-9.07.tar.bz2
+4a5b823f08d21036f94a6c51e94d025b  rxvt-unicode-9.20.tar.bz2

Added: csw/mgar/pkg/urxvt/trunk/files/0001-remove-old-solaris-fix.patch
===================================================================
--- csw/mgar/pkg/urxvt/trunk/files/0001-remove-old-solaris-fix.patch	                        (rev 0)
+++ csw/mgar/pkg/urxvt/trunk/files/0001-remove-old-solaris-fix.patch	2014-10-16 08:58:07 UTC (rev 24184)
@@ -0,0 +1,25 @@
+From 5265afa04ab6b31f50b0de46f47d1a5d0c03f465 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Wed, 3 Sep 2014 17:30:29 +0200
+Subject: [PATCH] remove old solaris fix
+
+---
+ configure | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure b/configure
+index c756724..46fca6b 100755
+--- a/configure
++++ b/configure
+@@ -7146,8 +7146,6 @@ fi
+ case $host in
+    *-*-solaris*)
+ 
+-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+-
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5
+ $as_echo_n "checking for library containing sendmsg... " >&6; }
+ if ${ac_cv_search_sendmsg+:} false; then :
+-- 
+2.0.3
+

Added: csw/mgar/pkg/urxvt/trunk/files/0002-hardcode-missing-constant.patch
===================================================================
--- csw/mgar/pkg/urxvt/trunk/files/0002-hardcode-missing-constant.patch	                        (rev 0)
+++ csw/mgar/pkg/urxvt/trunk/files/0002-hardcode-missing-constant.patch	2014-10-16 08:58:07 UTC (rev 24184)
@@ -0,0 +1,32 @@
+From 06cf0665727d6052b93a5ca838ba0db2200dec65 Mon Sep 17 00:00:00 2001
+From: Oliver Kiddle <opk at opencsw.org>
+Date: Thu, 16 Oct 2014 09:42:22 +0200
+Subject: [PATCH] hardcode missing constant
+
+---
+ src/rxvtimg.C | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rxvtimg.C b/src/rxvtimg.C
+index d561e59..5ff1963 100644
+--- a/src/rxvtimg.C
++++ b/src/rxvtimg.C
+@@ -685,13 +685,13 @@ rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
+       if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
+         {
+           XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
+-          XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
++          XRenderFillRectangle (dpy, 39, dst, &mask_w, 0, 0, w, h);
+           mask_c.red   = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
+           mask_c.green = -mask_c.green;
+           mask_c.blue  = -mask_c.blue;
+           mask_c.alpha = -mask_c.alpha;
+           XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
+-          XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
++          XRenderFillRectangle (dpy, 39, dst, &mask_w, 0, 0, w, h);
+         }
+     }
+ 
+-- 
+2.0.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.