[arch-commits] Commit in klibc-kbd/trunk (PKGBUILD no-fflush.patch)

[Roman Kyrylych]

    Date: Monday, October 12, 2009 @ 19:50:28
  Author: roman
Revision: 55468

Updated to a new version

Despite 1.15.1 claims klibc support only one patch could be removed.
Also had to hack the autogenerated 'configure' script
because it tried to test compiler by compiling a code that contained
ferror that has a different behaviour in klibc.

Modified:
  klibc-kbd/trunk/PKGBUILD
Deleted:
  klibc-kbd/trunk/no-fflush.patch

-----------------+
 PKGBUILD        |   23 ++++++++++-------------
 no-fflush.patch |   14 --------------
 2 files changed, 10 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-12 23:36:53 UTC (rev 55467)
+++ PKGBUILD	2009-10-12 23:50:28 UTC (rev 55468)
@@ -2,39 +2,36 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-kbd
-pkgver=1.15.20080312
-pkgrel=10
+pkgver=1.15.1
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
 license=('GPL')
 groups=('base')
 depends=('klibc' $(basename /lib/klibc-*.so .so) 'kbd')
-source=(ftp://ftp.archlinux.org/other/kbd/kbd-$pkgver.tar.gz
-        #ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-${pkgver}.tar.gz
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-${pkgver}.tar.gz
         no-isatty.patch
         no-exit.patch
-        no-fflush.patch
         keymap_install
         keymap_hook)
-md5sums=('709b087bb9d6c073bade70eda2da7770'
+md5sums=('f997c490fe5ede839aacf31da6c4eb06'
          '53e9612ac5fc1b23601f793410742ed3'
          '8c1bec330e8c98355502ac861561667d'
-         '8310d1a6cc72b5827898d0e9e29824ab'
          '735d7268f567deee4db3bed951a8303a'
          '85457e44dfd7046224e87f0add8da4b2')
+options=('force')
 
 build() {
-  cd ${srcdir}
-  #cd ${srcdir}/kbd-${pkgver}
-  patch -Np1 -i no-isatty.patch || return 1
-  patch -Np1 -i no-exit.patch || return 1
-  patch -Np1 -i no-fflush.patch || return 1
+  cd ${srcdir}/kbd-${pkgver}
+  patch -Np1 -i ../no-isatty.patch || return 1
+  patch -Np1 -i ../no-exit.patch || return 1
 
   aclocal
   autoconf
   automake --add-missing
-  ./configure --datadir=/share/kbd --enable-klibc
+  sed -i 's/ferror (f)/0/' configure
+  ./configure --enable-klibc --disable-klibc-layout --datadir=/share/kbd
 
   cd src/
   make kbd_mode loadkeys setfont || return 1

Deleted: no-fflush.patch
===================================================================
--- no-fflush.patch	2009-10-12 23:36:53 UTC (rev 55467)
+++ no-fflush.patch	2009-10-12 23:50:28 UTC (rev 55468)
@@ -1,14 +0,0 @@
-diff -Nur src.orig/src/klibc_compat.c src/src/klibc_compat.c
---- src.orig/src/klibc_compat.c	2008-03-12 01:56:14.000000000 +0100
-+++ src/src/klibc_compat.c	2008-09-15 18:59:31.000000000 +0200
-@@ -18,10 +18,6 @@
-     return (errno != 0 && errno != EOF);
- }
- 
--int fflush(FILE *stream) {
--    return 0;
--}
--
- int ungetc(int c, FILE *stream) {
-     if (fseek(stream, -1, SEEK_CUR) < 0)
- 	return EOF;