[arch-commits] Commit in ncurses/trunk (PKGBUILD set_field_buffer.patch)

[Allan McRae]

    Date: Monday, November 15, 2010 @ 00:44:12
  Author: allan
Revision: 99531

upgpkg: ncurses 5.7-4
bug fix...

Added:
  ncurses/trunk/set_field_buffer.patch
Modified:
  ncurses/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   25 +++++++++++++++----------
 set_field_buffer.patch |    9 +++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-15 02:01:25 UTC (rev 99530)
+++ PKGBUILD	2010-11-15 05:44:12 UTC (rev 99531)
@@ -4,25 +4,30 @@
 
 pkgname=ncurses
 pkgver=5.7
-pkgrel=3
+pkgrel=4
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ncurses/"
 license=('MIT')
 depends=('glibc')
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cce05daf61a64501ef6cd8da1f727ec6')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        set_field_buffer.patch)
+md5sums=('cce05daf61a64501ef6cd8da1f727ec6'
+         '04c8d6d95140a29d72c0eb685a2eeffd')
 
 build() {
   cd ${srcdir}/
   mkdir ncurses{,w}-build
-  
+
+  # http://permalink.gmane.org/gmane.comp.lib.ncurses.bugs/3559
+  patch -Np1 -i ${srcdir}/set_field_buffer.patch
+
   cd ${srcdir}/ncursesw-build
   ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \
      --with-shared --with-normal --without-debug --without-ada \
      --with-install-prefix=${pkgdir} --enable-widec 
   # add --enable-ext-colors with next soname bump
-  make || return 1
+  make
 
   # libncurses.so.5 for external binary support 
   cd ${srcdir}/ncurses-build
@@ -30,7 +35,7 @@
   ../${pkgname}-${pkgver}/configure --prefix=/usr \
     --with-shared --with-normal --without-debug --without-ada \
     --with-install-prefix=${pkgdir} $CONFIGFLAG
-  make || return 1
+  make
 }
 
 package() {
@@ -43,10 +48,10 @@
   ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so
 
   # Fool packages looking to link to non-wide-character ncurses libraries
-  for lib in curses ncurses form panel menu ; do \
-    rm -f ${pkgdir}/usr/lib/lib${lib}.so ; \
-    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so ; \
-    ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a ; \
+  for lib in curses ncurses form panel menu; do
+    rm -f ${pkgdir}/usr/lib/lib${lib}.so
+    echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
+    ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
   done
   ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
 

Added: set_field_buffer.patch
===================================================================
--- set_field_buffer.patch	                        (rev 0)
+++ set_field_buffer.patch	2010-11-15 05:44:12 UTC (rev 99531)
@@ -0,0 +1,9 @@
+--- src/ncurses-5.7/form/frm_driver.c        2008/10/18 16:25:00     1.88 
++++ src/ncurses-5.7/form/frm_driver.c        2008/12/06 23:08:12 
+@@ -4366,6 +4366,7 @@ 
+       delwin(field->working);
+       field->working = newpad(field->drows, field->dcols);
+     }
++  len = Buffer_Length(field); 
+   wclear(field->working);
+   mvwaddstr(field->working, 0, 0, value);