commit f34c7619b8bc83f3223ce30f7e182da41378fcfd
Author: Jan Rękorajski <[email protected]>
Date: Sat Oct 5 23:02:08 2019 +0200
- fix building with cups 2.2+
- rel 3
cups-2.2.patch | 25 +++++++++++++++++++++++++
kde4-print-manager.spec | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/kde4-print-manager.spec b/kde4-print-manager.spec
index c74e5f7..c005ecf 100644
--- a/kde4-print-manager.spec
+++ b/kde4-print-manager.spec
@@ -7,11 +7,12 @@
Summary: K Desktop Environment - print manager
Name: kde4-print-manager
Version: 4.14.3
-Release: 2
+Release: 3
License: GPL
Group: X11/Applications
Source0:
http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
# Source0-md5: 234e9152d0b0f17b65cbc62407e03094
+Patch0: cups-2.2.patch
URL: http://www.kde.org/
BuildRequires: automoc4
BuildRequires: cups-devel
@@ -32,6 +33,7 @@ aktualne zadania drukarki, ostrzezenia i bledy.
%prep
%setup -q -n %{orgname}-%{version}
+%patch0 -p1
%build
install -d build
diff --git a/cups-2.2.patch b/cups-2.2.patch
new file mode 100644
index 0000000..7739b8a
--- /dev/null
+++ b/cups-2.2.patch
@@ -0,0 +1,25 @@
+From 971e75934bc64627226d61565f68aff3c9b0000b Mon Sep 17 00:00:00 2001
+From: Rex Dieter <[email protected]>
+Date: Mon, 12 Sep 2016 11:58:12 -0500
+Subject: [PATCH] fix FTBFS against cups-2.2
+
+cupsGetPPD2 moved to cups/ppd.h
+
+BUG: 366483
+FIXED-IN: 16.08.2
+---
+ libkcups/KCupsRequest.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libkcups/KCupsRequest.cpp b/libkcups/KCupsRequest.cpp
+index 39a5cf5..3625bec 100644
+--- a/libkcups/KCupsRequest.cpp
++++ b/libkcups/KCupsRequest.cpp
+@@ -29,6 +29,7 @@
+ #include <QStringBuilder>
+
+ #include <cups/adminutil.h>
++#include <cups/ppd.h>
+
+ #define CUPS_DATADIR "/usr/share/cups"
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-print-manager.git/commitdiff/f34c7619b8bc83f3223ce30f7e182da41378fcfd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
