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

[Eric Bélanger]

    Date: Monday, February 8, 2010 @ 23:31:12
  Author: eric
Revision: 67625

Merged revisions 67623 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/rxvt-unicode/trunk

........
  r67623 | eric | 2010-02-08 23:30:11 -0500 (Mon, 08 Feb 2010) | 2 lines
  
  upgpkg: rxvt-unicode 9.07-1
      Upstream update, Updated license
........

Modified:
  rxvt-unicode/repos/extra-x86_64/	(properties)
  rxvt-unicode/repos/extra-x86_64/PKGBUILD
Deleted:
  rxvt-unicode/repos/extra-x86_64/rxvt-unicode-9.06-glibc-2.10.patch

------------------------------------+
 PKGBUILD                           |   20 ++++++----------
 rxvt-unicode-9.06-glibc-2.10.patch |   42 -----------------------------------
 2 files changed, 8 insertions(+), 54 deletions(-)


Property changes on: rxvt-unicode/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /rxvt-unicode/trunk:1-53470
   + /rxvt-unicode/trunk:1-67624

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-09 04:30:31 UTC (rev 67624)
+++ extra-x86_64/PKGBUILD	2010-02-09 04:31:12 UTC (rev 67625)
@@ -3,28 +3,24 @@
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.06
-pkgrel=3
+pkgver=9.07
+pkgrel=1
 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')
 optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
-license=("GPL2")
+license=("GPL")
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
-        ${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')
+        ${pkgname}.desktop ${pkgname}.png popup-menu-hang.diff)
+md5sums=('49bb52c99e002bf85eb41d8385d903b5' '5bfefa1b41c2b81ca18f2ef847330543'\
+         '84328cada91751df07324d95f8be4d1b' 'aead33ba3b08eeb251fb0c1427a4a024')
+sha1sums=('0e623daa15c45ba3add622277d32493a97059619' '79b7cacb7d6ce4a34f8a31a2e33475a8f7bf69cb'\
+         '9ff58d7b1d60838c51c9045bc0be342fac456790' 'ec4013f4af3a45da928b75f40fbf6389070e7fdd')
 
 build() {
   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 \

Deleted: extra-x86_64/rxvt-unicode-9.06-glibc-2.10.patch
===================================================================
--- extra-x86_64/rxvt-unicode-9.06-glibc-2.10.patch	2010-02-09 04:30:31 UTC (rev 67624)
+++ extra-x86_64/rxvt-unicode-9.06-glibc-2.10.patch	2010-02-09 04:31:12 UTC (rev 67625)
@@ -1,42 +0,0 @@
---- 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);
- }