diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-22 00:02:33 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-22 00:02:33 +0000 |
| commit | 62e13d20ed92262c7396eff00d048ce815693e74 (patch) | |
| tree | 2a02f5885ef928a5c3776a9f1a5c0c37d0d531a4 /multilib | |
| parent | d9687afd09db8b04c5ae90edf22df599532256c6 (diff) | |
Tue May 22 00:02:33 UTC 2012
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/lib32-e2fsprogs/PKGBUILD | 4 | ||||
| -rw-r--r-- | multilib/lib32-libcups/PKGBUILD | 13 | ||||
| -rw-r--r-- | multilib/lib32-libcups/fix-libusb-configure.patch | 12 |
3 files changed, 22 insertions, 7 deletions
diff --git a/multilib/lib32-e2fsprogs/PKGBUILD b/multilib/lib32-e2fsprogs/PKGBUILD index 40b2ef39d..b413c9146 100644 --- a/multilib/lib32-e2fsprogs/PKGBUILD +++ b/multilib/lib32-e2fsprogs/PKGBUILD @@ -4,7 +4,7 @@ _pkgbasename=e2fsprogs pkgname=lib32-e2fsprogs -pkgver=1.42.2 +pkgver=1.42.3 pkgrel=1 pkgdesc="Ext2 filesystem libraries (32-bit)" arch=('x86_64') @@ -13,7 +13,7 @@ url="http://e2fsprogs.sourceforge.net" depends=('lib32-util-linux' $_pkgbasename) makedepends=('bc' 'gcc-multilib') source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz") -sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25') +sha1sums=('0da8c787604876fe23b0f608389c3854ae1a2420') build() { export CC="gcc -m32" diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD index 0258acf26..356b3274a 100644 --- a/multilib/lib32-libcups/PKGBUILD +++ b/multilib/lib32-libcups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63968 2012-02-08 18:20:35Z pschmitz $ +# $Id: PKGBUILD 70966 2012-05-20 20:35:00Z bluewind $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> _pkgbasename=libcups pkgname=lib32-$_pkgbasename -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 pkgdesc="The CUPS Printing System - client libraries (32-bit)" arch=('x86_64') @@ -11,8 +11,9 @@ license=('GPL') url="http://www.cups.org/" depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename) makedepends=(gcc-multilib) -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) -md5sums=('9471d2a7c920cfbb17133c32d2e6866f') +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 fix-libusb-configure.patch) +md5sums=('e1ad15257aa6f162414ea3beae0c5df8' + '9cf39a66f21d1208a585367b25cf117b') build() { export CC="gcc -m32" @@ -20,13 +21,15 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd ${srcdir}/cups-${pkgver} + + patch -p1 -i "$srcdir/fix-libusb-configure.patch" aclocal -I config-scripts autoconf -I config-scripts ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \ - --enable-ssl=no --disable-gnutls --enable-threads \ + --enable-ssl=no --disable-gnutls --enable-threads --enable-libusb=no \ --with-optim="$CFLAGS" --libdir=/usr/lib32 make } diff --git a/multilib/lib32-libcups/fix-libusb-configure.patch b/multilib/lib32-libcups/fix-libusb-configure.patch new file mode 100644 index 000000000..02476c0b8 --- /dev/null +++ b/multilib/lib32-libcups/fix-libusb-configure.patch @@ -0,0 +1,12 @@ +diff -ur cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4 +--- cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 2012-05-20 22:31:15.702071734 +0200 ++++ cups-1.5.3/config-scripts/cups-common.m4 2012-05-20 22:31:29.395622693 +0200 +@@ -216,7 +216,7 @@ + AC_SUBST(LIBUSB) + + if test "x$PKGCONFIG" != x; then +- if test x$enable_libusb = xyes -o $uname != Darwin; then ++ if test x$enable_libusb = xyes -a $uname != Darwin; then + AC_MSG_CHECKING(for libusb-1.0) + if $PKGCONFIG --exists libusb-1.0; then + AC_MSG_RESULT(yes) |