Date: Wednesday, March 20, 2013 @ 10:42:01
Author: bluewind
Revision: 86586
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libcups/repos/multilib-x86_64/PKGBUILD
(from rev 86585, lib32-libcups/trunk/PKGBUILD)
lib32-libcups/repos/multilib-x86_64/fix-libusb-configure.patch
(from rev 86585, lib32-libcups/trunk/fix-libusb-configure.patch)
Deleted:
lib32-libcups/repos/multilib-x86_64/PKGBUILD
lib32-libcups/repos/multilib-x86_64/fix-libusb-configure.patch
----------------------------+
PKGBUILD | 84 +++++++++++++++++++++----------------------
fix-libusb-configure.patch | 24 ++++++------
2 files changed, 54 insertions(+), 54 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-20 09:41:55 UTC (rev 86585)
+++ PKGBUILD 2013-03-20 09:42:01 UTC (rev 86586)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="The CUPS Printing System - client libraries (32-bit)"
-arch=('x86_64')
-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
fix-libusb-configure.patch)
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
- '9cf39a66f21d1208a585367b25cf117b')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- 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-libusb=no \
- --disable-avahi \
- --with-optim="$CFLAGS" --libdir=/usr/lib32
- make
-}
-
-package() {
- cd ${srcdir}/cups-${pkgver}
- make BUILDROOT=${pkgdir} install-libs
-}
-
Copied: lib32-libcups/repos/multilib-x86_64/PKGBUILD (from rev 86585,
lib32-libcups/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-03-20 09:42:01 UTC (rev 86586)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+
+_pkgbasename=libcups
+pkgname=lib32-$_pkgbasename
+pkgver=1.6.2
+pkgrel=1
+pkgdesc="The CUPS Printing System - client libraries (32-bit)"
+arch=('x86_64')
+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
fix-libusb-configure.patch)
+md5sums=('13c8b2b2336d42001abe4899766b62dc'
+ '9cf39a66f21d1208a585367b25cf117b')
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ 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-libusb=no \
+ --disable-avahi \
+ --with-optim="$CFLAGS" --libdir=/usr/lib32
+ make
+}
+
+package() {
+ cd ${srcdir}/cups-${pkgver}
+ make BUILDROOT=${pkgdir} install-libs
+}
+
Deleted: fix-libusb-configure.patch
===================================================================
--- fix-libusb-configure.patch 2013-03-20 09:41:55 UTC (rev 86585)
+++ fix-libusb-configure.patch 2013-03-20 09:42:01 UTC (rev 86586)
@@ -1,12 +0,0 @@
-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)
Copied: lib32-libcups/repos/multilib-x86_64/fix-libusb-configure.patch (from
rev 86585, lib32-libcups/trunk/fix-libusb-configure.patch)
===================================================================
--- fix-libusb-configure.patch (rev 0)
+++ fix-libusb-configure.patch 2013-03-20 09:42:01 UTC (rev 86586)
@@ -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)
