Merge branch 'master' into f20

This commit is contained in:
Rex Dieter 2014-06-30 12:11:12 -05:00
commit 557f3f61c5
8 changed files with 291 additions and 28 deletions

7
.gitignore vendored
View File

@ -1,6 +1 @@
/kdelibs-4.11.3.tar.xz
/kdelibs-4.11.97.tar.xz
/kdelibs-4.12.0.tar.xz
/kdelibs-4.12.1.tar.xz
/kdelibs-4.12.2.tar.xz
/kdelibs-4.12.3.tar.xz
/kdelibs-4.13.2.tar.xz

View File

@ -0,0 +1,36 @@
From 684bb98b31d338d85e1e6089cac381a507a5b4d8 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.toscano@tiscali.it>
Date: Fri, 13 Jun 2014 02:41:50 +0200
Subject: [PATCH 06/12] Do not set global loading of DTD and entities, no more
needed
The global settings have been replaced by the fine-grained
parameters passed to xmlReadFile.
Moreover a libxml2 regression prevents those parameters from
being used when the patch for CVE-2014-0191 is applied, see
https://bugzilla.gnome.org/show_bug.cgi?id=730290
A new libxml2 patch is going to be deployed soon, but anyway
this code works even without setting those parameters.
CCBUG: 335001
---
kdoctools/meinproc.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 0467f22..de4fbc8 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -157,9 +157,6 @@ int main(int argc, char **argv) {
}
}
- xmlSubstituteEntitiesDefault(1);
- xmlLoadExtDtdDefaultValue = 1;
-
QVector<const char *> params;
#ifndef Q_WS_WIN
// libxslt parses the path given to outputFile as XPath expression which fails
--
1.8.3.1

View File

@ -0,0 +1,58 @@
From bbae87dc1be3ae063796a582774bd5642cacdd5d Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 18 Jun 2014 20:29:04 +0200
Subject: [PATCH 08/12] Don't require a job to handle messageboxes.
The POP3 ioslave doesn't have a job when it gets here.
---
kio/kio/usernotificationhandler.cpp | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp
index 10043cf..2b2e091 100644
--- a/kio/kio/usernotificationhandler.cpp
+++ b/kio/kio/usernotificationhandler.cpp
@@ -19,7 +19,7 @@
#include "usernotificationhandler_p.h"
#include "slave.h"
-#include "job_p.h"
+#include "jobuidelegate.h"
#include <kdebug.h>
@@ -76,19 +76,18 @@ void UserNotificationHandler::processRequest()
if (m_cachedResults.contains(key)) {
result = *(m_cachedResults[key]);
- } else if (r->slave->job()) {
- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
- if (jobPrivate) {
- result = jobPrivate->requestMessageBox(r->type,
- r->data.value(MSG_TEXT).toString(),
- r->data.value(MSG_CAPTION).toString(),
- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
- r->data.value(MSG_YES_BUTTON_ICON).toString(),
- r->data.value(MSG_NO_BUTTON_ICON).toString(),
- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
- r->data.value(MSG_META_DATA).toMap());
- }
+ } else {
+ JobUiDelegate ui;
+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
+ result = ui.requestMessageBox(type,
+ r->data.value(MSG_TEXT).toString(),
+ r->data.value(MSG_CAPTION).toString(),
+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
+ r->data.value(MSG_META_DATA).toMap());
m_cachedResults.insert(key, new int(result));
}
} else {
--
1.8.3.1

12
kdelibs-4.12.90-dot.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up kdelibs-4.12.90/doc/common/Doxyfile.global.dot kdelibs-4.12.90/doc/common/Doxyfile.global
--- kdelibs-4.12.90/doc/common/Doxyfile.global.dot 2014-03-17 13:15:23.252517997 -0500
+++ kdelibs-4.12.90/doc/common/Doxyfile.global 2014-03-17 13:16:02.472100942 -0500
@@ -1360,7 +1360,7 @@ HIDE_UNDOC_RELATIONS = NO
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = YES
+HAVE_DOT = NO
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.

View File

@ -0,0 +1,30 @@
diff -up kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE 2014-06-08 17:15:31.037189262 -0500
+++ kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake 2014-06-09 08:00:43.074844711 -0500
@@ -1097,7 +1097,7 @@ endif (APPLE)
if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE)
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
@@ -1112,7 +1112,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C
endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile)
endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (CMAKE_C_COMPILER MATCHES "icc")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE)
set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -1216,7 +1216,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
# It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
# and also because it is/was needed by glibc for snprintf to be available when building C files.
# See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
- add_definitions (-D_BSD_SOURCE)
+ add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE)
endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
if (CMAKE_SYSTEM_NAME STREQUAL GNU)

View File

@ -1,12 +0,0 @@
diff -up kdelibs-4.9.3/doc/common/Doxyfile.global.me kdelibs-4.9.3/doc/common/Doxyfile.global
--- kdelibs-4.9.3/doc/common/Doxyfile.global.me 2012-12-04 16:57:09.239184154 +0100
+++ kdelibs-4.9.3/doc/common/Doxyfile.global 2012-12-04 16:57:13.157191451 +0100
@@ -1392,7 +1392,7 @@ HIDE_UNDOC_RELATIONS = NO
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = YES
+HAVE_DOT = NO
# By default doxygen will write a font called FreeSans.ttf to the output
# directory and reference it in all dot files that doxygen generates. This

View File

@ -38,8 +38,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Summary: KDE Libraries
Version: 4.12.3
Release: 1%{?dist}
Version: 4.13.2
Release: 8%{?dist}
Name: kdelibs
Epoch: 6
@ -135,6 +135,10 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch
# https://git.reviewboard.kde.org/r/102439/
Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
# glibc-2.20 has deprecated _BSD_SOURCE in favor of _DEFAULT_SOURCE
# http://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes
Patch51: kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch
# Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default)
Patch52: kdelibs-4.10.0-SOLID_UPNP.patch
@ -148,7 +152,7 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch
Patch59: kdelibs-4.9.3-kcm_ssl.patch
# disable dot to reduce apidoc size
Patch61: kdelibs-4.9.3-dot.patch
Patch61: kdelibs-4.12.90-dot.patch
# workaround for bz#969524 on arm
Patch62: kdelibs-4.11.3-arm.patch
@ -169,7 +173,10 @@ Patch092: return-application-icons-properly.patch
# revert disabling of packagekit
Patch093: turn-the-packagekit-support-feature-off-by-default.patch
Patch106: 0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch
## security fix
Patch158: 0008-Don-t-require-a-job-to-handle-messageboxes.patch
# rhel patches
@ -280,7 +287,7 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
Summary: Header files for compiling KDE 4 applications
Provides: plasma-devel = %{version}-%{release}
Provides: nepomuk-devel = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release}
Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}
@ -297,15 +304,34 @@ Requires: pkgconfig(phonon)
# considered part of nepomuk-devel
Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano)
Requires: qt4-devel
%if 0%{?webkit}
Requires: pkgconfig(QtWebKit)
%endif
%{?x_deps:Requires: %{x_deps}}
%description devel
This package includes the header files you will need to compile
applications for KDE 4.
%package webkit
Summary: KDE WebKit support library
# upgrade path, when -webkit subpkg landed
Obsoletes: kdelibs < 6:4.13.2-6
Provides: kdelibs4-webkit = %{version}-%{release}
%{?_isa:Provides: kdelibs4-webkit%{?_isa} = %{version}-%{release}}
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description webkit
%{summary}.
%package webkit-devel
Summary: Development files for KDE WebKit support library
# upgrade path, when -webkit subpkg landed
Obsoletes: kdelibs-devel < 6:4.13.2-6
Provides: kdelibs4-webkit-devel = %{version}-%{release}
%{?_isa:Provides: kdelibs4-webkit-devel%{?_isa} = %{version}-%{release}}
Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: pkgconfig(QtWebKit)
%description webkit-devel
%{summary}.
%package apidocs
Summary: KDE 4 API documentation
Requires: kde-filesystem
@ -353,6 +379,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstreamable patches
%patch50 -p1 -b .knewstuff2_gpg2
%patch51 -p1 -b .glibc_DEFAULT_SOURCE
%patch52 -p1 -b .SOLID_UPNP
%patch53 -p1 -b .kjs-s390
%patch54 -p1 -b .kjs-locale
@ -367,7 +394,10 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch092 -p1 -R -b .return-application-icons-properly
%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
%patch106 -p1 -b .0006
# security fixes
%patch158 -p1 -b .0008
# rhel patches
%if ! 0%{?webkit}
@ -552,7 +582,43 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_docdir}/HTML/en/sonnet/
%{_kde4_docdir}/HTML/en/kioslave/
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/libkcmutils.so.4*
%{_kde4_libdir}/libkde3support.so.4*
%{_kde4_libdir}/libkdeclarative.so.5*
%{_kde4_libdir}/libkdecore.so.5*
%{_kde4_libdir}/libkdefakes.so.5*
%{_kde4_libdir}/libkdesu.so.5*
%{_kde4_libdir}/libkdeui.so.5*
%{_kde4_libdir}/libkdnssd.so.4*
%{_kde4_libdir}/libkemoticons.so.4*
%{_kde4_libdir}/libkfile.so.4*
%{_kde4_libdir}/libkhtml.so.5*
%{_kde4_libdir}/libkidletime.so.4*
%{_kde4_libdir}/libkimproxy.so.4*
%{_kde4_libdir}/libkio.so.5*
%{_kde4_libdir}/libkjsapi.so.4*
%{_kde4_libdir}/libkjsembed.so.4*
%{_kde4_libdir}/libkjs.so.4*
%{_kde4_libdir}/libkmediaplayer.so.4*
%{_kde4_libdir}/libknewstuff2.so.4*
%{_kde4_libdir}/libknewstuff3.so.4*
%{_kde4_libdir}/libknotifyconfig.so.4*
%{_kde4_libdir}/libkntlm.so.4*
%{_kde4_libdir}/libkparts.so.4*
%{_kde4_libdir}/libkprintutils.so.4*
%{_kde4_libdir}/libkpty.so.4*
%{_kde4_libdir}/libkrosscore.so.4*
%{_kde4_libdir}/libkrossui.so.4*
%{_kde4_libdir}/libktexteditor.so.4*
%{_kde4_libdir}/libkunitconversion.so.4*
%{_kde4_libdir}/libkunittest.so.4*
%{_kde4_libdir}/libkutils.so.4*
%{_kde4_libdir}/libnepomukquery.so.4*
%{_kde4_libdir}/libnepomuk.so.4*
%{_kde4_libdir}/libnepomukutils.so.4*
%{_kde4_libdir}/libplasma.so.3*
%{_kde4_libdir}/libsolid.so.4*
%{_kde4_libdir}/libthreadweaver.so.4*
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kconf_update_bin/
%dir %{_kde4_libdir}/kde4/
@ -571,7 +637,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%{_kde4_libexecdir}/lnusertemp
%{_kde4_libexecdir}/start_kdeinit
%{_kde4_libexecdir}/start_kdeinit_wrapper
%{_kde4_libdir}/kde4/plugins/
%dir %{_kde4_libdir}/kde4/plugins/
%dir %{_kde4_libdir}/kde4/plugins/designer/
%{_kde4_libdir}/kde4/plugins/designer/kde3supportwidgets.so
%{_kde4_libdir}/kde4/plugins/designer/kdedeprecated.so
%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.so
%{_kde4_libdir}/kde4/plugins/imageformats/
%{_kde4_libdir}/kde4/plugins/kauth/
%{_kde4_libdir}/kde4/plugins/script/
%{_kde4_sysconfdir}/xdg/menus/*.menu
%{_mandir}/man1/checkXML.1*
%{_mandir}/man1/kde4-config.1*
@ -586,6 +659,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%{_mandir}/man8/kdeinit4.8*
%{_mandir}/man8/meinproc4.8*
%if 0%{?webkit}
%post webkit -p /sbin/ldconfig
%postun webkit -p /sbin/ldconfig
%files webkit
%{_kde4_libdir}/libkdewebkit.so.5*
%{_kde4_libdir}/kde4/plugins/designer/kdewebkitwidgets.so
%endif
%files common
%{_kde4_bindir}/preparetips
%{_kde4_configdir}/colors/
@ -612,6 +694,25 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%{_kde4_libdir}/cmake/KDeclarative/
%{_kde4_libdir}/kde4/devel/
%if 0%{?webkit}
%exclude %{_kde4_includedir}/kdewebkit_export.h
%exclude %{_kde4_includedir}/kgraphicswebview.h
%exclude %{_kde4_includedir}/kwebpage.h
%exclude %{_kde4_includedir}/kwebpluginfactory.h
%exclude %{_kde4_includedir}/kwebview.h
%exclude %{_kde4_includedir}/kwebwallet.h
%exclude %{_kde4_libdir}/kde4/devel/libkdewebkit.so
%files webkit-devel
%{_kde4_includedir}/kdewebkit_export.h
%{_kde4_includedir}/kgraphicswebview.h
%{_kde4_includedir}/kwebpage.h
%{_kde4_includedir}/kwebpluginfactory.h
%{_kde4_includedir}/kwebview.h
%{_kde4_includedir}/kwebwallet.h
%{_kde4_libdir}/kde4/devel/libkdewebkit.so
%endif
%if 0%{?apidocs}
%files apidocs
%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
@ -624,6 +725,49 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Fri Jun 20 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.2-8
- %%files enumerate libs
- move kdewebkitwidgets.so to -webkit too
* Thu Jun 19 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.13.2-7
- add Obsoletes for -webkit upgrade path
* Thu Jun 19 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.13.2-6
- -webkit subpkg
* Thu Jun 19 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.13.2-5
- backport another meinproc/libxml2 fix (kde#335001)
* Thu Jun 19 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.13.2-4
- POP3 kiosloave silently accepted invalid SSL certificates (#1111022, #1111023, CVE-2014-3494)
* Mon Jun 09 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.2-3
- FindKDE4Internal.cmake: define _DEFAULT_SOURCE too (to avoid _BSD_SOURCE deprecation warnings)
* Sun Jun 08 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.2-2
- respin
* Sat Jun 07 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.2-1
- 4.13.2
* Fri May 23 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.1-2
- meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 (kde#335001)
* Sat May 10 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.1-1
- 4.13.1
* Fri Apr 11 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.0-1
- 4.13.0
* Thu Apr 03 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.97-1
- 4.12.97
* Sat Mar 22 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.95-1
- 4.12.95
* Mon Mar 17 2014 Rex Dieter <rdieter@fedoraproject.org> 6:4.12.90-1
- 4.12.90
* Sat Mar 01 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.3-1
- 4.12.3

View File

@ -1 +1 @@
8b85c9ece434b6cbff364197827b649f kdelibs-4.12.3.tar.xz
51fa096f017e9c3c9480bcfad654ad86 kdelibs-4.13.2.tar.xz