[arch-commits] CVS update of extra (3 files)

[Tobias Kieslich]

    Date: Tuesday, October 30, 2007 @ 14:13:21
  Author: tobias
    Path: /home/cvs-extra/extra

   Added: lib/t1lib/overflow.patch (1.1)
Modified: lib/t1lib/PKGBUILD (1.4 -> 1.5)
          x11/rxvt-unicode/PKGBUILD (1.17 -> 1.18)

upstream for rxvt-unicode
upstream and bugfix for t1lib


---------------------------+
 lib/t1lib/PKGBUILD        |   20 ++++++++++++--------
 lib/t1lib/overflow.patch  |   15 +++++++++++++++
 x11/rxvt-unicode/PKGBUILD |   16 ++++++++++++----
 3 files changed, 39 insertions(+), 12 deletions(-)


Index: extra/lib/t1lib/PKGBUILD
diff -u extra/lib/t1lib/PKGBUILD:1.4 extra/lib/t1lib/PKGBUILD:1.5
--- extra/lib/t1lib/PKGBUILD:1.4	Sun May 28 07:37:21 2006
+++ extra/lib/t1lib/PKGBUILD	Tue Oct 30 14:13:21 2007
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD,v 1.4 2006/05/28 11:37:21 notz Exp $
+# $Id: PKGBUILD,v 1.5 2007/10/30 18:13:21 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Rainer Moll <renari at arcor.de>
 
 pkgname=t1lib
-pkgver=5.1.0
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts"
 arch=(i686 x86_64)
+license="GPL"
 depends=('libxaw')
+options=(!libtool)
 url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
-license="GPL"
-source=(http://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-5.1.0.tar.gz)
-md5sums=('a05bed4aa63637052e60690ccde70421')
+source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz \
+        overflow.patch)
+md5sums=('b1b86b5014364d92ab3b7cee6c81e29d'
+         '1568c9e0e52c20f7bf493b114c85428d')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  cd lib/t1lib
+  patch -Np0 -i ../../../overflow.patch || return 1
+  cd ../..
   ./configure --prefix=/usr
   make without_doc || return 1
   make prefix=$startdir/pkg/usr install
-  # libtoolslay
-  find $startdir/pkg -name '*.la' -exec rm {} \;
 }
Index: extra/lib/t1lib/overflow.patch
diff -u /dev/null extra/lib/t1lib/overflow.patch:1.1
--- /dev/null	Tue Oct 30 14:13:21 2007
+++ extra/lib/t1lib/overflow.patch	Tue Oct 30 14:13:21 2007
@@ -0,0 +1,15 @@
+--- t1env.c.orig	2007-09-16 19:56:38.319184208 +0200
++++ t1env.c	2007-09-16 20:05:02.057070439 +0200
+@@ -611,6 +611,12 @@
+ #endif 
+     strcat( pathbuf, DIRECTORY_SEP);
+     /* And finally the filename: */
++    /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
++       let's try next pathbuf */
++    if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
++	i++;
++    	continue;
++    }
+     strcat( pathbuf, StrippedName);
+     
+     /* Check for existence of the path: */
Index: extra/x11/rxvt-unicode/PKGBUILD
diff -u extra/x11/rxvt-unicode/PKGBUILD:1.17 extra/x11/rxvt-unicode/PKGBUILD:1.18
--- extra/x11/rxvt-unicode/PKGBUILD:1.17	Wed Aug  1 20:17:48 2007
+++ extra/x11/rxvt-unicode/PKGBUILD	Tue Oct 30 14:13:20 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.17 2007/08/02 00:17:48 tobias Exp $
+# $Id: PKGBUILD,v 1.18 2007/10/30 18:13:20 tobias Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=8.3
+pkgver=8.4
 pkgrel=1
 pkgdesc="an unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 license="GPL"
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop ${pkgname}.png)
-md5sums=('c53043a5178e2eeb33578148d56f8f96'
+md5sums=('d15ba0ea7cb54ce7a2a41650e2a5e6ab'
          '5bfefa1b41c2b81ca18f2ef847330543'
          '84328cada91751df07324d95f8be4d1b')
 
@@ -21,10 +21,18 @@
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
+    --enable-font-styles \
+    --enable-xim \
+    --enable-keepscrolling \
+    --enable-selectionscrolling \
+    --enable-smart-resize \
     --enable-xpm-background \
     --enable-transparency \
     --enable-menubar \
-    --enable-24bit
+    --enable-24bit \
+    --enable-utmp \
+    --enable-wtmp \
+    --enable-lastlog
   make || return 1
   mkdir -p ${startdir}/pkg/usr/share/terminfo
   export TERMINFO=${startdir}/pkg/usr/share/terminfo