[arch-commits] Commit in thinkfinger/trunk (PKGBUILD gcc46.patch)

[Andrea Scarpino]

    Date: Friday, December 2, 2011 @ 02:41:52
  Author: andrea
Revision: 144026

upgpkg: thinkfinger 0.3-5

Fix build; sign package

Added:
  thinkfinger/trunk/gcc46.patch
Modified:
  thinkfinger/trunk/PKGBUILD

-------------+
 PKGBUILD    |   25 ++++++++++++++++---------
 gcc46.patch |   22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-02 04:00:48 UTC (rev 144025)
+++ PKGBUILD	2011-12-02 07:41:52 UTC (rev 144026)
@@ -1,27 +1,35 @@
 # $Id$
-# Maintainer: François Charette <francois.archlinux.org>
+# Maintainer:
+# Contributor: François Charette <francois.archlinux.org>
 # Contributor: Damir Perisa <damir.archlinux.org>
 # Contributor: Björn Martensen <bjoern.martensen at gmail.com>
 
 pkgname=thinkfinger
 pkgver=0.3
-pkgrel=4
-pkgdesc="ThinkFinger is a driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
+pkgrel=5
+pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
 url="http://thinkfinger.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=("GPL")
 depends=('pam' 'libusb-compat')
 install=thinkfinger.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/thinkfinger/$pkgname-$pkgver.tar.gz thinkfinger-uinput-hack.patch)
+options=('!libtool' 'emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'thinkfinger-uinput-hack.patch'
+        'gcc46.patch')
 md5sums=('588565233bcbea5ff0a7f5314361c380'
-         '71dc334282d19e6db4f6254542ba563c')
+         '71dc334282d19e6db4f6254542ba563c'
+         '93c80f342329a5bd40f5f324fe670225')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
   # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580
-  patch -p0 < ../thinkfinger-uinput-hack.patch
-  ./configure 	--prefix=/usr \
+  patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch
+
+  patch -p1 -i "${srcdir}"/gcc46.patch
+
+  ./configure --prefix=/usr \
   		--with-securedir=/lib/security \
 		--with-birdir=/etc/pam_thinkfinger
   make
@@ -35,4 +43,3 @@
   
   make DESTDIR=$pkgdir install
 }
-

Added: gcc46.patch
===================================================================
--- gcc46.patch	                        (rev 0)
+++ gcc46.patch	2011-12-02 07:41:52 UTC (rev 144026)
@@ -0,0 +1,22 @@
+--- a/pam/Makefile.am
++++ b/pam/Makefile.am
+@@ -8,7 +8,7 @@ pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h p
+ else
+ pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ endif
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ 
+--- a/pam/Makefile.in
++++ b/pam/Makefile.in
+@@ -201,7 +201,7 @@ pamdir = $(SECUREDIR)
+ INCLUDES = -I$(top_srcdir)/libthinkfinger
+ @HAVE_OLD_PAM_FALSE at pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ @HAVE_OLD_PAM_TRUE at pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ all: all-am