backport CUPS 2.2 build fix from Trinity / Slávek Banko

* Wed Sep 28 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-77
- backport CUPS 2.2 build fix from Trinity / Slávek Banko
This commit is contained in:
Kevin Kofler 2016-09-28 19:26:56 +02:00
parent fd6aba6f21
commit 15481db604
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,11 @@
diff -ur kdelibs-3.5.10/kdeprint/cups/cupsaddsmb2.cpp kdelibs-3.5.10-cups22/kdeprint/cups/cupsaddsmb2.cpp
--- kdelibs-3.5.10/kdeprint/cups/cupsaddsmb2.cpp 2005-10-10 17:06:30.000000000 +0200
+++ kdelibs-3.5.10-cups22/kdeprint/cups/cupsaddsmb2.cpp 2016-09-28 19:23:09.264863318 +0200
@@ -39,6 +39,7 @@
#include <kstdguiitem.h>
#include <cups/cups.h>
+#include <cups/ppd.h>
#include <ctype.h>
CupsAddSmb::CupsAddSmb(QWidget *parent, const char *name)

View File

@ -18,7 +18,7 @@
Summary: KDE 3 Libraries
Name: kdelibs3
Version: 3.5.10
Release: 76%{?dist}
Release: 77%{?dist}
License: LGPLv2
Url: http://www.kde.org/
@ -89,6 +89,9 @@ Patch111: kdelibs-3.5.10-kde-config_kde-version.patch
# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=9bc0d2cd9d38750658770e69bf0445dc5162beb7
# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=91bf63b43bf4cc9ff640bd3c11549644cef05e6e
Patch150: kdelibs-3.5.10-cups16.patch
# build fix for CUPS 2.2 by Slávek Banko, backported by Kevin Kofler
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=52a1b55368ec53b14347996851aca7eb29374397
Patch151: kdelibs-3.5.10-cups22.patch
## security fixes
# fix CVE-2009-2537 - select length DoS
@ -275,6 +278,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
%patch111 -p1 -b .kde-config_kde-version
%patch150 -p1 -b .cups16
%patch151 -p1 -b .cups22
# security fixes
%patch200 -p1 -b .cve-2009-2537
@ -613,6 +617,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%changelog
* Wed Sep 28 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-77
- backport CUPS 2.2 build fix from Trinity / Slávek Banko
* Wed Sep 28 2016 Than Ngo <than@redhat.com> - 3.5.10-76
- fix bz#1376181, fix endless loop in svgicons