[arch-commits] Commit in lib32-libcups/repos/multilib-x86_64 (4 files)

[Florian Pritz]

    Date: Tuesday, October 29, 2013 @ 14:50:42
  Author: bluewind
Revision: 99548

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libcups/repos/multilib-x86_64/PKGBUILD
    (from rev 99547, lib32-libcups/trunk/PKGBUILD)
  lib32-libcups/repos/multilib-x86_64/fix-libusb-configure.patch
    (from rev 99547, 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                   |   88 +++++++++++++++++++++----------------------
 fix-libusb-configure.patch |   24 +++++------
 2 files changed, 56 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-29 13:50:39 UTC (rev 99547)
+++ PKGBUILD	2013-10-29 13:50:42 UTC (rev 99548)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.6.4
-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
-http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
-fix-libusb-configure.patch)
-md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f'
-         '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 99547, lib32-libcups/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-10-29 13:50:42 UTC (rev 99548)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+_pkgbasename=libcups
+pkgname=lib32-$_pkgbasename
+pkgver=1.7.0
+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
+http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
+fix-libusb-configure.patch)
+md5sums=('c67d1b041f8e8959dc4d769a95bd9d25'
+         '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 --disable-dnssd \
+     --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-10-29 13:50:39 UTC (rev 99547)
+++ fix-libusb-configure.patch	2013-10-29 13:50:42 UTC (rev 99548)
@@ -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 99547, lib32-libcups/trunk/fix-libusb-configure.patch)
===================================================================
--- fix-libusb-configure.patch	                        (rev 0)
+++ fix-libusb-configure.patch	2013-10-29 13:50:42 UTC (rev 99548)
@@ -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)