[arch-commits] Commit in libcups/trunk (PKGBUILD gnutls-pkgconfig.dpatch)

[andyrtr at archlinux.org]

    Date: Saturday, July 4, 2009 @ 15:02:06
  Author: andyrtr
Revision: 44874

upgpkg: libcups 1.3.11-1
    new version 1.3.11; enable dbus support; add patch for #15341

Added:
  libcups/trunk/gnutls-pkgconfig.dpatch
Modified:
  libcups/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 ++++++++++----
 gnutls-pkgconfig.dpatch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-04 18:20:36 UTC (rev 44873)
+++ PKGBUILD	2009-07-04 19:02:06 UTC (rev 44874)
@@ -9,17 +9,23 @@
 license=('GPL')
 url="http://www.cups.org/"
 depends=('gnutls>=2.8.1' 'libtiff>=3.8.2-5' 'libpng>=1.2.37' 'heimdal>=1.2.1-5') 
-makedepends=('poppler>=0.10.7-2')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2)
-md5sums=('17f3e2bcb3cae3dd9dceb65a2bfd295f')
+makedepends=('poppler>=0.10.7-2' 'autoconf')
+source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
+	gnutls-pkgconfig.dpatch)
+md5sums=('17f3e2bcb3cae3dd9dceb65a2bfd295f'
+         '7322c46c2f33863dce85eb75a1d9ccab')
 
 build() {
   cd ${srcdir}/cups-${pkgver}
+  # http://patch-tracking.debian.net/patch/series/view/cups/1.3.10-5/gnutls-pkgconfig.dpatch
+  patch -Np1 -i ${srcdir}/gnutls-pkgconfig.dpatch || return 1
+  aclocal
+  autoconf
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon --with-cups-group=lp --without-php \
      --enable-pam=yes --disable-ldap --libdir=/usr/lib --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-gnutls \
+     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls \
      --enable-pdftops --with-pdftops=pdftops --with-optim="$CFLAGS"
 
   for dir in cups filter; do

Added: gnutls-pkgconfig.dpatch
===================================================================
--- gnutls-pkgconfig.dpatch	                        (rev 0)
+++ gnutls-pkgconfig.dpatch	2009-07-04 19:02:06 UTC (rev 44874)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gnutls-pkgconfig.dpatch by  <martin.pitt at ubuntu.com>
+##
+## Use pkg-config instead of deprecated libgnutls-config
+## (STR #3178, Debian #529903; from upstream SVN)
+ at DPATCH@
+diff -urNad cups-1.3.10~/config-scripts/cups-ssl.m4 cups-1.3.10/config-scripts/cups-ssl.m4
+--- cups-1.3.10~/config-scripts/cups-ssl.m4	2007-07-11 23:46:42.000000000 +0200
++++ cups-1.3.10/config-scripts/cups-ssl.m4	2009-06-08 08:03:27.854814655 +0200
+@@ -64,11 +64,11 @@
+     fi
+ 
+     dnl Then look for GNU TLS...
+-    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then
++    if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
+     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+-	if test "x$LIBGNUTLSCONFIG" != x; then
+-	    SSLLIBS=`$LIBGNUTLSCONFIG --libs`
+-	    SSLFLAGS=`$LIBGNUTLSCONFIG --cflags`
++	if $PKGCONFIG --exists gnutls; then
++	    SSLLIBS=`$PKGCONFIG --libs gnutls`
++	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
+ 	    ENCRYPTION_REQUIRED="  Encryption Required"
+ 	    AC_DEFINE(HAVE_SSL)
+ 	    AC_DEFINE(HAVE_GNUTLS)
+