[arch-commits] CVS update of extra/kde/kdelibs (PKGBUILD kdelibs-3.5.7-cups13.patch)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Oct 3 22:13:02 UTC 2007
Date: Wednesday, October 3, 2007 @ 18:13:02
Author: andyrtr
Path: /home/cvs-extra/extra/kde/kdelibs
Added: kdelibs-3.5.7-cups13.patch (1.1)
Modified: PKGBUILD (1.87 -> 1.88)
fix build against new cups
----------------------------+
PKGBUILD | 36 ++++++++++--------
kdelibs-3.5.7-cups13.patch | 82 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 16 deletions(-)
Index: extra/kde/kdelibs/PKGBUILD
diff -u extra/kde/kdelibs/PKGBUILD:1.87 extra/kde/kdelibs/PKGBUILD:1.88
--- extra/kde/kdelibs/PKGBUILD:1.87 Sat Sep 29 12:24:03 2007
+++ extra/kde/kdelibs/PKGBUILD Wed Oct 3 18:13:02 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.87 2007/09/29 16:24:03 tpowa Exp $
+# $Id: PKGBUILD,v 1.88 2007/10/03 22:13:02 andyrtr Exp $
# Contributor: Roman Kreisel <roman.kreisel at epost.de>
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=kdelibs
pkgver=3.5.7
kdever=3.5.7
-pkgrel=7
+pkgrel=8
pkgdesc="KDE Core Libraries"
arch=(i686 x86_64)
url="http://www.kde.org"
@@ -16,7 +16,7 @@
depends=('arts>=1.5.7' 'db>=4.6' 'libxslt' 'pcre' 'libart-lgpl' 'openexr'
'avahi>=0.6.9' 'jasper>=1.900.1' 'fam' 'bzip2' 'openssl' 'libidn' 'perl'
'aspell' 'heimdal>=1.0.1' 'acl' 'libtiff' 'qt>=3.3.7')
-makedepends=(pkgconfig cups)
+makedepends=(pkgconfig "cups>=1.3.3")
# for easier build, just uncomment the mirror you want to use
mirror="ftp.solnet.ch/mirror/KDE" # updated every 2 hours, very fast for Europe
@@ -34,7 +34,21 @@
kicker-crash.patch
kde-menu.patch
inotify.patch
- gmail.fix)
+ gmail.fix
+ kdelibs-3.5.7-cups13.patch)
+md5sums=('50ed644f2ec91963570fe2b155652957'
+ '4c0fb2576875ded606f276421fc49752'
+ 'b7b98e965960f2d55741a10070aa943d'
+ 'c9e8c50d4b26648cf4487001db9dca48'
+ 'a66270abcdd0dcb2e28d3b2464927ff6'
+ '6061c259247f56f0ede21deabfad2732'
+ '60ab1a486895d6c18ef334ec958c48d6'
+ 'f7abfe849e5122dd01d6b8a884999da0'
+ '091d05a08330372ddbaf5ef9d426be53'
+ 'e94aef45b5a59fe58c7cc085ab1dd3ae'
+ '42d288e71fa0a886bc8882c198a27f2e'
+ 'd888793ff50dafb970f503e3ab6851b6'
+ '507569f4f368f387f42834444ea73994')
build() {
# Source the QT and KDE profile
@@ -50,6 +64,8 @@
patch -Np0 -i $startdir/src/kconf-update-faster.diff || return 1
# fix gmail
patch -Np1 -i $startdir/src/gmail.fix || return 1
+ # fix compilation with cups >1.3
+ patch -Np1 -i $startdir/src/kdelibs-3.5.7-cups13.patch || return 1
# Replace dns-sd implementation with avahi implementation
rm dnssd/*
@@ -85,15 +101,3 @@
cd $startdir/pkg/opt/kde/bin/
ln -s fileshareset.pl filesharelist
}
-md5sums=('50ed644f2ec91963570fe2b155652957'
- '4c0fb2576875ded606f276421fc49752'
- 'b7b98e965960f2d55741a10070aa943d'
- 'c9e8c50d4b26648cf4487001db9dca48'
- 'a66270abcdd0dcb2e28d3b2464927ff6'
- '6061c259247f56f0ede21deabfad2732'
- '60ab1a486895d6c18ef334ec958c48d6'
- 'f7abfe849e5122dd01d6b8a884999da0'
- '091d05a08330372ddbaf5ef9d426be53'
- 'e94aef45b5a59fe58c7cc085ab1dd3ae'
- '42d288e71fa0a886bc8882c198a27f2e'
- 'd888793ff50dafb970f503e3ab6851b6')
Index: extra/kde/kdelibs/kdelibs-3.5.7-cups13.patch
diff -u /dev/null extra/kde/kdelibs/kdelibs-3.5.7-cups13.patch:1.1
--- /dev/null Wed Oct 3 18:13:02 2007
+++ extra/kde/kdelibs/kdelibs-3.5.7-cups13.patch Wed Oct 3 18:13:02 2007
@@ -0,0 +1,82 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13 2006-10-01 12:33:43.000000000 -0500
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-07-19 15:12:48.000000000 -0500
+@@ -108,7 +108,8 @@ cupsGetConf(void)
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -116,7 +117,7 @@ cupsGetConf(void)
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -135,7 +136,8 @@ cupsGetConf(void)
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+@@ -334,7 +336,8 @@ cupsPutConf(const char *name) /* I - Na
+ * See if we should retry the current digest password...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0 ||
+ digest_tries > 1 || !pwdstring[0])
+ {
+ /*
+@@ -342,7 +345,7 @@ cupsPutConf(const char *name) /* I - Na
+ */
+
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
+- cups_server->hostname);
++ cupsServer());
+
+ if ((password = cupsGetPassword(prompt)) == NULL)
+ break;
+@@ -361,7 +364,8 @@ cupsPutConf(const char *name) /* I - Na
+ * Got a password; encode it for the server...
+ */
+
+- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
++ if (strncmp(httpGetField (cups_server, HTTP_FIELD_WWW_AUTHENTICATE),
++ "Basic", 5) == 0)
+ {
+ /*
+ * Basic authentication...
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13 2007-01-15 05:34:19.000000000 -0600
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-07-19 15:15:09.000000000 -0500
+@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
+ return false;
+ }
+
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #endif
+
+@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
+ }
+
+ request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+-#ifdef HAVE_CUPS_NO_PWD_CACHE
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
++ CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
+ cups_authstring = HTTP->authstring;
+ #endif
+ httpClose(HTTP);
More information about the arch-commits
mailing list