4.13.3
This commit is contained in:
Rex Dieter
parent
bc86df28d4
commit
13cd99aa64
|
|
@ -1 +1 @@
|
|||
/kdelibs-4.13.2.tar.xz
|
||||
/kdelibs-4.13.3.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
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
|
||||
|
||||
13
kdelibs.spec
13
kdelibs.spec
|
|
@ -38,8 +38,8 @@
|
|||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.13.2
|
||||
Release: 11%{?dist}
|
||||
Version: 4.13.3
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -176,10 +176,7 @@ 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
|
||||
|
||||
|
|
@ -398,10 +395,7 @@ 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}
|
||||
|
|
@ -731,6 +725,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 14 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.13.3-1
|
||||
- 4.13.3
|
||||
|
||||
* Fri Jul 11 2014 Than Ngo <than@redhat.com> - 6:4.13.2-11
|
||||
- fix issue in opening a terminal in Konqueror/Dolphin does not inherit environment variable
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue