diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-04 14:32:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-04 14:32:45 +0100 |
| commit | 03346d9676b006b2ba496a44d56f3efccc185d6a (patch) | |
| tree | 3e6c51e16a4f6c2b64c5109af508539d54455d9a /extra/thinkfinger | |
| parent | 61c0d1ec341c4979f7722696d3b7e6a958f81b10 (diff) | |
| parent | 851376cd7720e1f9b35e0a7c26bfd66399f0c4d3 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/python-pymongo/PKGBUILD
extra/boost/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/lyx/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/thinkfinger')
| -rw-r--r-- | extra/thinkfinger/PKGBUILD | 27 | ||||
| -rw-r--r-- | extra/thinkfinger/gcc46.patch | 22 |
2 files changed, 39 insertions, 10 deletions
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index f9cfe45e5..2ef0460bf 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 101457 2010-11-29 10:02:41Z allan $ -# Maintainer: François Charette <francois.archlinux.org> +# $Id: PKGBUILD 144027 2011-12-02 07:42:30Z andrea $ +# Maintainer: +# Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> # Contributor: Björn Martensen <bjoern.martensen@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' 'mips64el') 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 @@ package() { make DESTDIR=$pkgdir install } - diff --git a/extra/thinkfinger/gcc46.patch b/extra/thinkfinger/gcc46.patch new file mode 100644 index 000000000..24e4b534f --- /dev/null +++ b/extra/thinkfinger/gcc46.patch @@ -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@pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c + @HAVE_OLD_PAM_TRUE@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 |