[arch-commits] Commit in rxvt-unicode/trunk (3 files)

Eric Bélanger eric at archlinux.org
Thu Oct 1 01:43:22 UTC 2009


    Date: Wednesday, September 30, 2009 @ 21:43:22
  Author: eric
Revision: 53470

upgpkg: rxvt-unicode 9.06-3
    Rebuilt against perl 5.10.1-3, fixed pop-up menu hang (close FS#14892), added build patch (close FS#14892 and FS#16264)

Added:
  rxvt-unicode/trunk/popup-menu-hang.diff
  rxvt-unicode/trunk/rxvt-unicode-9.06-glibc-2.10.patch
Modified:
  rxvt-unicode/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   35 +++++++++++++++++------------
 popup-menu-hang.diff               |   24 ++++++++++++++++++++
 rxvt-unicode-9.06-glibc-2.10.patch |   42 +++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-01 01:30:49 UTC (rev 53469)
+++ PKGBUILD	2009-10-01 01:43:22 UTC (rev 53470)
@@ -4,8 +4,8 @@
 
 pkgname=rxvt-unicode
 pkgver=9.06
-pkgrel=2
-pkgdesc="an unicode enabled rxvt-clone terminal emulator (urxvt)"
+pkgrel=3
+pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=(i686 x86_64)
 depends=('gcc-libs' 'libxft' 'libxpm')
 makedepends=('ncurses' 'perl>=5.10.0' 'pkgconfig')
@@ -13,12 +13,19 @@
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
 license=("GPL2")
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${pkgname}.desktop ${pkgname}.png)
-md5sums=('4cb9330e99fc0b0b05cebf3581557dd8' '5bfefa1b41c2b81ca18f2ef847330543' \
-         '84328cada91751df07324d95f8be4d1b')
+        ${pkgname}.desktop ${pkgname}.png rxvt-unicode-9.06-glibc-2.10.patch \
+        popup-menu-hang.diff)
+md5sums=('4cb9330e99fc0b0b05cebf3581557dd8' '5bfefa1b41c2b81ca18f2ef847330543'\
+         '84328cada91751df07324d95f8be4d1b' '9fdeead0d3a05f18daf831da0204288f'\
+         'aead33ba3b08eeb251fb0c1427a4a024')
+sha1sums=('df623ebdad001de534781721f8298ba1add0df2c' '79b7cacb7d6ce4a34f8a31a2e33475a8f7bf69cb'\
+         '9ff58d7b1d60838c51c9045bc0be342fac456790' '0d6a3c382db068e17a25480eaf67e1a1392a90f3'\
+         'ec4013f4af3a45da928b75f40fbf6389070e7fdd')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../rxvt-unicode-9.06-glibc-2.10.patch || return 1
+  patch -p0 < ../popup-menu-hang.diff || return 1
   ./configure --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
     --enable-font-styles \
@@ -30,17 +37,17 @@
     --enable-transparency \
     --enable-utmp \
     --enable-wtmp \
-    --enable-lastlog
+    --enable-lastlog || return 1
   make || return 1
-  mkdir -p ${startdir}/pkg/usr/share/terminfo
-  export TERMINFO=${startdir}/pkg/usr/share/terminfo
-  make DESTDIR=${startdir}/pkg install
+  install -d "${pkgdir}/usr/share/terminfo"
+  export TERMINFO="${pkgdir}/usr/share/terminfo"
+  make DESTDIR="${pkgdir}" install || return 1
  # install the tabbing wrapper ( requires gtk2-perl! )
-  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
-  install -Dm 755 doc/rxvt-tabbed ${startdir}/pkg/usr/bin/urxvt-tabbed
+  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed || return 1
+  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed" || return 1
  # install freedesktop menu and icon ( icon from cvs checkout )
   install -Dm644 ../${pkgname}.desktop \
-    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -Dm644 ../${pkgname}.png \
-    ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }

Added: popup-menu-hang.diff
===================================================================
--- popup-menu-hang.diff	                        (rev 0)
+++ popup-menu-hang.diff	2009-10-01 01:43:22 UTC (rev 53470)
@@ -0,0 +1,24 @@
+Index: src/perl/urxvt-popup
+===================================================================
+RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v
+retrieving revision 1.15
+diff -u -r1.15 urxvt-popup
+--- src/perl/urxvt-popup	24 Dec 2007 08:21:40 -0000	1.15
++++ src/perl/urxvt-popup	2 Aug 2009 08:22:52 -0000
+@@ -120,7 +120,7 @@
+    $self->refresh;
+ 
+    # might fail, but try anyways
+-   $self->grab ($self->{data}{event}{time}, 1)
++   $self->grab ($self->{data}{event}{time})
+       and $self->allow_events_async;
+ 
+    on_button_press $self, $self->{data}{event} if $self->{data}{event}{button};
+@@ -132,7 +132,7 @@
+    my ($self, $event) = @_;
+ 
+    # should definitely not fail
+-   $self->grab ($self->{data}{event}{time}, 1)
++   $self->grab ($self->{data}{event}{time})
+       and $self->allow_events_async;
+ }

Added: rxvt-unicode-9.06-glibc-2.10.patch
===================================================================
--- rxvt-unicode-9.06-glibc-2.10.patch	                        (rev 0)
+++ rxvt-unicode-9.06-glibc-2.10.patch	2009-10-01 01:43:22 UTC (rev 53470)
@@ -0,0 +1,42 @@
+--- src/background.C.orig	2009-04-25 01:12:46.000000000 +0200
++++ src/background.C	2009-04-25 01:19:21.000000000 +0200
+@@ -261,7 +261,7 @@
+   unsigned int w = 0, h = 0;
+   unsigned int n;
+   unsigned long new_flags = (flags & (~geometryFlags));
+-  char *p;
++  const char *p;
+ #  define MAXLEN_GEOM		256 /* could be longer than regular geometry string */
+ 
+   if (geom == NULL)
+@@ -677,7 +677,7 @@
+       if (!target->asimman)
+         target->asimman = create_generic_imageman (target->rs[Rs_path]);
+ 
+-      if (char *f = strchr (file, ';'))
++      if (char *f = (char *) strchr (file, ';'))
+         {
+           size_t len = f - file;
+           f = (char *)malloc (len + 1);
+--- src/command.C.orig	2009-04-25 01:20:29.000000000 +0200
++++ src/command.C	2009-04-25 01:21:20.000000000 +0200
+@@ -3336,7 +3336,7 @@
+           }
+         else
+           {
+-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
++            char *eq = (char *) strchr (str, '='); // constness lost, but verified to be ok
+ 
+             if (eq)
+               {
+--- src/misc.C.orig	2009-04-25 01:41:05.000000000 +0200
++++ src/misc.C	2009-04-25 01:41:37.000000000 +0200
+@@ -170,7 +170,7 @@
+ char *
+ rxvt_basename (const char *str) NOTHROW
+ {
+-  char *base = strrchr (str, '/');
++  char *base = (char *) strrchr (str, '/');
+ 
+   return (char *) (base ? base + 1 : str);
+ }




More information about the arch-commits mailing list