- up to 4.14.0

diff --git a/kde4-kdelibs-ssl.patch b/kde4-kdelibs-ssl.patch
deleted file mode 100644 (file)
index 648d4fd..0000000
--- a/kde4-kdelibs-ssl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Wed, 18 Jun 2014 18:29:04 +0000
-Subject: Don't require a job to handle messageboxes.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
----
-Don't require a job to handle messageboxes.
-
-The POP3 ioslave doesn't have a job when it gets here.
----
-
-
---- 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 @@
- 
-         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 {
-

diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 5857397d42a302ae40c6164ad4c468fda945dfed..de37ac5634242b600a1075720bce48c47983aa08 100644 (file)
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -16,12 +16,12 @@ Summary(pt_BR.UTF-8):       Bibliotecas de fundação do KDE
 Summary(ru.UTF-8):     K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):     K Desktop Environment - Бібліотеки
 Name:          kde4-kdelibs
-Version:       4.13.2
-Release:       2
+Version:       4.14.0
+Release:       1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
-# Source0-md5: 51fa096f017e9c3c9480bcfad654ad86
+# Source0-md5: f246fc5485b085b36843e954b5b56922
 Source1:       %{name}-pld_box.png
 Patch100:      %{name}-branch.diff
 Patch0:                %{name}-branding.patch
@@ -31,7 +31,6 @@ Patch3:               %{name}-aboutPLD.patch
 Patch4:                %{name}-devicemanager_remove.patch
 Patch5:                kde4-kdelibs-sync.patch
 Patch6:                kde4-kdelibs-pld-flags.patch
-Patch7:                %{name}-ssl.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenEXR-devel >= 1.2.2
 BuildRequires: Qt3Support-devel >= %{qtver}
@@ -245,7 +244,6 @@ KDE.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp