[packages/kde4-kde3support] - fix building with cups 2.0 - rel 49
baggins
baggins at pld-linux.org
Tue Nov 11 22:05:28 CET 2014
commit 3d6cbe63f8a46e28d98f922d8dc5f770bdbb770b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Nov 11 22:03:41 2014 +0100
- fix building with cups 2.0
- rel 49
kde4-kde3support.spec | 4 +++-
kdelibs-cups2.patch | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kde3support.spec b/kde4-kde3support.spec
index 3a14bbe..69885d1 100644
--- a/kde4-kde3support.spec
+++ b/kde4-kde3support.spec
@@ -18,7 +18,7 @@ Summary(ru.UTF-8): K Desktop Environment 3 - Библиотеки
Summary(uk.UTF-8): K Desktop Environment 3 - Бібліотеки
Name: kde4-kde3support
Version: 3.5.10
-Release: 48
+Release: 49
License: LGPL v2
Group: X11/Libraries
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{origname}-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Patch8: openssl1.patch
Patch9: %{name}-qt4.patch
Patch10: boost-1.50.patch
Patch11: kdelibs-cups16.patch
+Patch12: kdelibs-cups2.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: acl-devel
@@ -248,6 +249,7 @@ KDE.
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
mv -f configure{,.dist}
:>admin/test-driver
diff --git a/kdelibs-cups2.patch b/kdelibs-cups2.patch
new file mode 100644
index 0000000..c4b28b4
--- /dev/null
+++ b/kdelibs-cups2.patch
@@ -0,0 +1,40 @@
+--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c.orig 2014-11-11 21:07:48.000000000 +0100
++++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c 2014-11-11 22:01:12.743376515 +0100
+@@ -167,7 +167,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_MINOR >= 2) || (CUPS_VERSION_MAJOR > 1)
+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+ #else
+ httpEncode64(encode, plain);
+@@ -430,7 +430,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_MINOR >= 2) || (CUPS_VERSION_MAJOR > 1)
+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
+ #else
+ httpEncode64(encode, plain);
+@@ -512,7 +512,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_MINOR >= 2 ) || (CUPS_VERSION_MAJOR > 1)
+ if (!httpAddrLocalhost(http))
+ #else
+ if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
+--- kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp~ 2014-11-11 21:07:48.000000000 +0100
++++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2014-11-11 22:02:13.353376077 +0100
+@@ -751,7 +751,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_MINOR >= 2) || (CUPS_VERSION_MAJOR > 1)
+ ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
+ ippDeleteAttribute(request_, attr);
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kde3support.git/commitdiff/3d6cbe63f8a46e28d98f922d8dc5f770bdbb770b
More information about the pld-cvs-commit
mailing list