From faa7170e1d0c6bdc507fa42eb51212cf1f91674d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 3 Dec 2012 22:27:22 +0100 Subject: [PATCH] drop patch which is already merged in 4.9.4 --- kdelibs-4.9.3-delete-downloadDialog.patch | 10 ---------- kdelibs.spec | 2 -- 2 files changed, 12 deletions(-) delete mode 100644 kdelibs-4.9.3-delete-downloadDialog.patch diff --git a/kdelibs-4.9.3-delete-downloadDialog.patch b/kdelibs-4.9.3-delete-downloadDialog.patch deleted file mode 100644 index 4e0387b..0000000 --- a/kdelibs-4.9.3-delete-downloadDialog.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdelibs-4.9.3/plasma/private/packages.cpp 2012-10-19 12:26:32.000000000 +0200 -+++ kdelibs-4.9.3/plasma/private/packages.cpp_new 2012-11-23 13:19:25.757302077 +0100 -@@ -109,6 +109,7 @@ void PlasmoidPackage::createNewWidgetBro - m_knsDialog = knsDialog = new KNS3::DownloadDialog("plasmoids.knsrc", parent); - knsDialog->setProperty("DoNotCloseController", true); - connect(knsDialog, SIGNAL(accepted()), this, SIGNAL(newWidgetBrowserFinished())); -+ connect(knsDialog, SIGNAL(accepted()), knsDialog, SLOT(deleteLater())); - } - - knsDialog->show(); diff --git a/kdelibs.spec b/kdelibs.spec index 0a90c8a..34c91fa 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -162,7 +162,6 @@ Patch58: kdelibs-cmake_python3.patch Patch59: kdelibs-4.9.3-kcm_ssl.patch ## upstream -Patch100: kdelibs-4.9.3-delete-downloadDialog.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -337,7 +336,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch59 -p1 -b .filter # upstream patches -%patch100 -p1 -b .delete-downloadDialog # security fixes %patch200 -p1 -b .CVE-2009-2702