[packages/kdelibs] add cups 2.0 patch (from fedora)
glen
glen at pld-linux.org
Sun Mar 22 07:44:11 CET 2015
commit bcb7f052e8bc037076d4c9fef15b04586bb12ff5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Mar 22 08:14:17 2015 +0200
add cups 2.0 patch (from fedora)
kdelibs-cups20.patch | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++
kdelibs.spec | 2 +
2 files changed, 161 insertions(+)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 03315b0..25cf43c 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -64,6 +64,7 @@ Patch18: %{name}-3.5.10-ossl-1.x.patch
Patch19: %{name}-gcc4.patch
Patch20: boost-1.50.patch
Patch21: kdelibs-cups16.patch
+Patch22: kdelibs-cups20.patch
URL: http://www.kde.org/
%{?with_openexr:BuildRequires: OpenEXR-devel >= 1.4.0.a}
BuildRequires: acl-devel
@@ -383,6 +384,7 @@ strony innych użytkowników lokalnych.
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p1
mv -f configure{,.dist}
:>admin/test-driver
diff --git a/kdelibs-cups20.patch b/kdelibs-cups20.patch
new file mode 100644
index 0000000..10e30f5
--- /dev/null
+++ b/kdelibs-cups20.patch
@@ -0,0 +1,159 @@
+diff -ur kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c kdelibs-3.5.10-cups20/kdeprint/cups/cupsdconf2/cups-util.c
+--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c 2007-10-08 11:52:10.000000000 +0200
++++ kdelibs-3.5.10-cups20/kdeprint/cups/cupsdconf2/cups-util.c 2014-11-25 21:41:51.000000000 +0100
+@@ -32,7 +32,7 @@
+ char prompt[1024]; /* Prompt string */
+ int digest_tries; /* Number of tries with Digest */
+ static char filename[HTTP_MAX_URI]; /* Local filename */
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ const char *fqdn = 0;
+ #else
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
+@@ -118,7 +118,7 @@
+ * See if we should retry the current digest password...
+ */
+
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+ #else
+ www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
+@@ -129,7 +129,7 @@
+ /*
+ * Nope - get a password from the user...
+ */
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ fqdn = cups_server->hostname;
+ #else
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
+@@ -154,7 +154,7 @@
+ * Got a password; encode it for the server...
+ */
+
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+ #else
+ www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
+@@ -166,7 +166,7 @@
+ */
+
+ snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+ #else
+ httpEncode64(encode, plain);
+@@ -235,7 +235,7 @@
+ */
+
+ while ((bytes =
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ httpRead
+ #else
+ httpRead2
+@@ -265,7 +265,7 @@
+ http_status_t status; /* HTTP status from server */
+ char prompt[1024]; /* Prompt string */
+ int digest_tries; /* Number of tries with Digest */
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ const char *fqdn = 0;
+ #else
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
+@@ -340,7 +340,7 @@
+ break;
+ }
+ else
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ httpWrite
+ #else
+ httpWrite2
+@@ -349,7 +349,7 @@
+
+ if (status == HTTP_CONTINUE)
+ {
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ httpWrite
+ #else
+ httpWrite2
+@@ -380,7 +380,7 @@
+ * See if we should retry the current digest password...
+ */
+
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+ #else
+ www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
+@@ -393,7 +393,7 @@
+ */
+
+
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ fqdn = cups_server->hostname;
+ #else
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
+@@ -417,7 +417,7 @@
+ * Got a password; encode it for the server...
+ */
+
+-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
+ www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
+ #else
+ www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
+@@ -429,7 +429,7 @@
+ */
+
+ snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+ #else
+ httpEncode64(encode, plain);
+@@ -511,7 +511,7 @@
+ * See if we are accessing localhost...
+ the struct has changed in newer versions - PiggZ (adam at piggz.co.uk)
+ */
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+ if (!httpAddrLocalhost(http))
+ #else
+ if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
+diff -ur kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10-cups20/kdeprint/cups/ipprequest.cpp
+--- kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2007-10-08 11:52:10.000000000 +0200
++++ kdelibs-3.5.10-cups20/kdeprint/cups/ipprequest.cpp 2014-11-25 21:41:51.000000000 +0100
+@@ -310,7 +310,7 @@
+ }
+
+ #ifdef HAVE_CUPS_NO_PWD_CACHE
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2)
+ strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
+ #else
+ httpSetAuthString( HTTP, NULL, cups_authstring.data() );
+@@ -324,7 +324,7 @@
+
+ request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
+ #ifdef HAVE_CUPS_NO_PWD_CACHE
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
++#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2)
+ cups_authstring = HTTP->authstring;
+ #else
+ cups_authstring = httpGetAuthString( HTTP );
+@@ -523,7 +523,7 @@
+ cupsFreeOptions(n, options);
+
+ // find an remove that annoying "document-format" attribute
+-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
++#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+ ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
+ ippDeleteAttribute(request_, attr);
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/bcb7f052e8bc037076d4c9fef15b04586bb12ff5
More information about the pld-cvs-commit
mailing list