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

[Eric Belanger]

    Date: Monday, June 23, 2008 @ 00:19:01
  Author: eric
Revision: 3499

Merged revisions 2994-3498 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/brltty/trunk

........
  r3498 | eric | 2008-06-23 00:18:49 -0400 (Mon, 23 Jun 2008) | 2 lines
  
  upgpkg: brltty 3.9-1
      Upstream update, fixed for glibc 2.8, disabled SMP build, removed old patch
........

Modified:
  brltty/repos/testing-x86_64/	(properties)
  brltty/repos/testing-x86_64/PKGBUILD
Deleted:
  brltty/repos/testing-x86_64/fix-kernelincludes.patch

--------------------------+
 PKGBUILD                 |   13 ++++++-------
 fix-kernelincludes.patch |   21 ---------------------
 2 files changed, 6 insertions(+), 28 deletions(-)


Property changes on: brltty/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /brltty/trunk:1-2993
   + /brltty/trunk:1-3498

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-06-23 04:18:49 UTC (rev 3498)
+++ testing-x86_64/PKGBUILD	2008-06-23 04:19:01 UTC (rev 3499)
@@ -2,21 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: William Rea <sillywilly at gmail.com>
 pkgname=brltty
-pkgver=3.7.2
-pkgrel=2
+pkgver=3.9
+pkgrel=1
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://mielke.cc/brltty"
 license=('GPL' 'LGPL')
 depends=('libxaw' 'at-spi>=1.7.11' 'gpm>=1.20.4')
-source=(http://mielke.cc/brltty/releases/brltty-${pkgver}.tar.gz
-	fix-kernelincludes.patch)
-md5sums=('0ae3da8252783a4d20e1ed4e55cede5b' '27e8a1ecbfe76764626220c3a064118a')
+options=('!makeflags')
+source=(http://mielke.cc/brltty/releases/brltty-${pkgver}.tar.gz)
+md5sums=('7ce54ba2d38b7c220870e8c781f36743')
 
 build() {
   cd ${startdir}/src/brltty-${pkgver}
-  patch -Np1 -i ${startdir}/src/fix-kernelincludes.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-gpm
+  CFLAGS+="${CFLAGS} -D_GNU_SOURCE"  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-gpm
   make || return 1
   make INSTALL_ROOT=${startdir}/pkg install
 }

Deleted: testing-x86_64/fix-kernelincludes.patch
===================================================================
--- testing-x86_64/fix-kernelincludes.patch	2008-06-23 04:18:49 UTC (rev 3498)
+++ testing-x86_64/fix-kernelincludes.patch	2008-06-23 04:19:01 UTC (rev 3499)
@@ -1,21 +0,0 @@
---- brltty-3.7.2/Programs/usb_linux.c.orig	2006-10-01 11:09:13.000000000 +0000
-+++ brltty-3.7.2/Programs/usb_linux.c	2006-10-01 11:09:19.000000000 +0000
-@@ -30,7 +30,6 @@
- #include <sys/stat.h>
- #include <sys/vfs.h>
- #include <sys/ioctl.h>
--#include <linux/compiler.h>
- #include <linux/usbdevice_fs.h>
- 
- #ifndef USBDEVFS_DISCONNECT
---- brltty-3.7.2/Programs/api_client.c.orig	2006-10-01 11:09:37.000000000 +0000
-+++ brltty-3.7.2/Programs/api_client.c	2006-10-01 11:09:55.000000000 +0000
-@@ -74,7 +74,7 @@
- 
- #ifdef linux
- #include <linux/major.h>
--#include <linux/tty.h>
-+#include <linux/vt.h>
- #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES
- #endif /* linux */
-