Remove unused patch.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 20 insertions, 137 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index ca2a9086814a..f41013601304 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.272 2013/01/28 12:13:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.273 2013/01/28 13:23:21 kensington Exp $
+
+  28 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/konqueror-4.9.3-crash.patch:
+  Remove unused patch.
 
   28 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -konqueror-4.9.3-r1.ebuild,
   -konqueror-4.9.3.ebuild, -konqueror-4.9.4.ebuild:
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index e992c1805435..8cb6974b2cd2 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,5 +1,18 @@
-AUX konqueror-4.9.3-crash.patch 5835 SHA256 3450fc99b35027df6fc75cabe5372e2c63c3883091b7df39c5fcc0a053863362 SHA512 9732c65b4a60390cf2fbb79d619baf03792da73c468844eb3523ece8cd4e19fe84fac36ea1c2954208c1ea03a9a83427af9de7e1d8e992ff8604dd6ccd7d1b2b WHIRLPOOL da50c06723f148b5a60c1730b1333377d3caa01d331f0910ff85486780fdd9ce39248f072eb642d724733c2a4a37de6fcc0a390311391f4edac0f78ec2a14585
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kde-baseapps-4.9.5.tar.xz 2527344 SHA256 8ebd4f005874a7818d7258575f22f35cbb57a667a36bf34301fa55d695c9b74d SHA512 a71d1953cba0996b07d630a950c8ebf4c7d0b8243bc2f9b331debc6162c0ee31f43811c8f8f90659c64ebb6c3228d750c6754f8db244884457a9cef6aa3dd804 WHIRLPOOL 1c1d6289ef8202089d7519701c3046867466d5406698e7af8d44fef8126e1689361190475dccf2cb155504c2fb0a232a7e68abc0f58a313bb3f08264ef10766f
 EBUILD konqueror-4.9.5.ebuild 1236 SHA256 218e82e0f0cba697092683c04f00c5c1ae70c6b090ad25f91c6bbfeffb373638 SHA512 11b98f5aaa9e529635e9273c4ee4b65e06eed602a24817ab4b4b587c1bc72cbff0b4e7bd1352d71e3ea3f172a180e33a8f3dc8bfbb557a8de7e3053a420e3bc5 WHIRLPOOL 1e0ee5586a1974b77fbae7004a85703c19abe2213f379d2d37e6d336241454818fb978543ce37b3902051d29f12e71663cb01af2b96dcc192f98c1000fc7f3f1
-MISC ChangeLog 35246 SHA256 93cec440aafe3bbc8f9603bd6e37dcff02665800bc1499848303f5d916096a1a SHA512 96297284a81b73b0edb2b48b6d7a271cbbc531cd6db1bde6af6ed6e05d5125dba27f30cf7de37a693664a4bc9d4c824be9f7540c41f90f57ef2d77c0dc730286 WHIRLPOOL 0289f22209decac80dd20ad09f6b0f9cd359f40762f3620d9e3aed8f917a008616d221c7335f93cce0b3983634a94f925f6fbf1f73b3cb0f0ec24f05df4779f6
+MISC ChangeLog 35371 SHA256 5faa7b4cf10e56b736a5e792dd53838f75a94c3fd84f47ce3ff6cd82516bd86d SHA512 b070a3cc69bd331f9d62b501b733f494f36e8afc54efd73c23751aa48ec7f34c65d18602a40fdb0f3d5f4cc8984cc0da59c8c4050503222e6f72859505108ea5 WHIRLPOOL be2109c38e59ce936e5c3984e204b03e19f27b78f71e825f10792ac19743bd5c8cf774641237947a1fcd8e5a538bf965d8d227169c9da51f4d59e6771f473917
 MISC metadata.xml 247 SHA256 6569683d0d0645fc26a371127f3c7b7135eaa937900e718d17f57b729457b754 SHA512 51f1bee5af253468e645e68f3da14f74ff7ff3e6ccc0f8298f5eb6c855693b551e8f32676f5ab3bdaee12125fd32b1210bd111abaf7f89dfdd88a7062c53ed24 WHIRLPOOL 51bf0af3505b9669fbe561b31f399f91ff6b3b6bbaccdbe7e3e544d84a120933fa116ed798eebebe806487549e22cb88331f452e9a7e03ace4a5a994727d40d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBnsBAAoJEMbwO6tnXQ0sHrcIAImKqym35EdD3zE5TAYSAYja
+KiJYgYCYqKnyabKoZJkYyDlMiFvoeC9giMo/Nlyz08ENN5GDFV3MSAmyCTrrHEoF
+iOZVkvLakqA62ku3elqtB5DMjCt+UrKIcXDzjvPvGG93y66hmkwZYwUsA4nMnJNA
+57baRhakkijU+u5ojs2IpKYM94RhEbcfSdHplaprnf+xadFv3inMMxLFDilWIn/G
+lSlMebNZhv2i4+3z4WwIA/p41bO+Rs/M5sGjDl5t7had4giM5Hf81Ay5g5vZU6R5
+ERNpUbBgKUIkVAV0vBk9nygNZb2kEzkGAgTL6WEihcMXSmb2tSNkWE2ZGffKmhA=
+=ZuFI
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konqueror/files/konqueror-4.9.3-crash.patch b/kde-base/konqueror/files/konqueror-4.9.3-crash.patch
deleted file mode 100644
index 4a653f083cbb..000000000000
--- a/kde-base/konqueror/files/konqueror-4.9.3-crash.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 71f411a4ee7ba98843b9af81f327b67f8294087f Mon Sep 17 00:00:00 2001
-From: Dawit Alemayehu <adawit@kde.org>
-Date: Sat, 10 Nov 2012 16:37:15 -0500
-Subject: [PATCH] Do not crash when global policy is changed and the Apply
- button is pressed.
-
-BUG: 307831
-FIXED-IN: 4.9.4
----
- konqueror/settings/kio/kcookiespolicies.cpp | 43 ++++++++++++++---------------
- konqueror/settings/kio/kcookiespolicies.h   |  2 +-
- 2 files changed, 21 insertions(+), 24 deletions(-)
-
-diff --git a/konqueror/settings/kio/kcookiespolicies.cpp b/konqueror/settings/kio/kcookiespolicies.cpp
-index 75d265f..48154d3 100644
---- a/konqueror/settings/kio/kcookiespolicies.cpp
-+++ b/konqueror/settings/kio/kcookiespolicies.cpp
-@@ -181,14 +181,13 @@ void KCookiesPolicies::addNewPolicy (const QString& domain)
-         pdlg.setPolicy (KCookieAdvice::Accept);
- 
-     if (pdlg.exec() && !pdlg.domain().isEmpty()) {
--        QString domain = tolerantFromAce (pdlg.domain().toLatin1());
--        int advice = pdlg.advice();
-+        const QString domain = tolerantFromAce (pdlg.domain().toLatin1());
-+        const int advice = pdlg.advice();
- 
-         if (!handleDuplicate (domain, advice)) {
-             const char* strAdvice = KCookieAdvice::adviceToStr (advice);
--            QTreeWidgetItem* item = new QTreeWidgetItem (mUi.lvDomainPolicy,
--                    QStringList() << domain << i18n (strAdvice));
--            m_pDomainPolicy.insert (item, strAdvice);
-+            new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << domain << i18n (strAdvice));
-+            m_pDomainPolicy.insert (domain, strAdvice);
-             configChanged();
-         }
-     }
-@@ -202,25 +201,24 @@ void KCookiesPolicies::addPressed()
- 
- void KCookiesPolicies::changePressed()
- {
--    QTreeWidgetItem* index = mUi.lvDomainPolicy->currentItem();
-+    QTreeWidgetItem* item = mUi.lvDomainPolicy->currentItem();
- 
--    if (!index)
-+    if (!item)
-         return;
- 
--    QString oldDomain = index->text (0);
--
-+    const QString oldDomain = item->text(0);
-     KCookiesPolicySelectionDlg pdlg (this);
-     pdlg.setWindowTitle (i18nc ("@title:window", "Change Cookie Policy"));
--    pdlg.setPolicy (KCookieAdvice::strToAdvice (m_pDomainPolicy[index]));
-+    pdlg.setPolicy (KCookieAdvice::strToAdvice (m_pDomainPolicy.value(oldDomain)));
-     pdlg.setEnableHostEdit (true, oldDomain);
- 
-     if (pdlg.exec() && !pdlg.domain().isEmpty()) {
--        QString newDomain = tolerantFromAce (pdlg.domain().toLatin1());
--        int advice = pdlg.advice();
-+        const QString newDomain = tolerantFromAce (pdlg.domain().toLatin1());
-+        const int advice = pdlg.advice();
-         if (newDomain == oldDomain || !handleDuplicate (newDomain, advice)) {
--            m_pDomainPolicy[index] = KCookieAdvice::adviceToStr (advice);
--            index->setText (0, newDomain);
--            index->setText (1, i18n (m_pDomainPolicy[index]));
-+            m_pDomainPolicy[newDomain] = KCookieAdvice::adviceToStr (advice);
-+            item->setText (0, newDomain);
-+            item->setText (1, i18n (m_pDomainPolicy.value(newDomain)));
-             configChanged();
-         }
-     }
-@@ -238,9 +236,9 @@ bool KCookiesPolicies::handleDuplicate (const QString& domain, int advice)
-                       i18nc ("@title:window", "Duplicate Policy"),
-                       KGuiItem (i18n ("Replace")));
-             if (res == KMessageBox::Continue) {
--                m_pDomainPolicy[item] = KCookieAdvice::adviceToStr (advice);
-+                m_pDomainPolicy[domain] = KCookieAdvice::adviceToStr (advice);
-                 item->setText (0, domain);
--                item->setText (1, i18n (m_pDomainPolicy[item]));
-+                item->setText (1, i18n (m_pDomainPolicy.value(domain)));
-                 configChanged();
-                 return true;
-             } else
-@@ -260,7 +258,7 @@ void KCookiesPolicies::deletePressed()
-         if (!nextItem)
-             nextItem = mUi.lvDomainPolicy->itemAbove (item);
- 
--        m_pDomainPolicy.remove (item);
-+        m_pDomainPolicy.remove (item->text(0));
-         delete item;
-     }
- 
-@@ -300,9 +298,9 @@ void KCookiesPolicies::updateDomainList (const QStringList& domainConfig)
-         splitDomainAdvice (*it, domain, advice);
- 
-         if (!domain.isEmpty()) {
--            QTreeWidgetItem* index = new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << tolerantFromAce (domain.toLatin1()) <<
-+            QTreeWidgetItem* item = new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << tolerantFromAce (domain.toLatin1()) <<
-                     i18n (KCookieAdvice::adviceToStr (advice)));
--            m_pDomainPolicy[index] = KCookieAdvice::adviceToStr (advice);
-+            m_pDomainPolicy[item->text(0)] = KCookieAdvice::adviceToStr (advice);
-         }
-     }    
- 
-@@ -384,11 +382,10 @@ void KCookiesPolicies::save()
-     group.writeEntry ("CookieGlobalAdvice", advice);
- 
-     QStringList domainConfig;
--    QMapIterator<QTreeWidgetItem*, const char*> it (m_pDomainPolicy);
-+    QMapIterator<QString, const char*> it (m_pDomainPolicy);
-     while (it.hasNext()) {
-         it.next();
--        QTreeWidgetItem* item = it.key();
--        QString policy = tolerantToAce (item->text (0));
-+        QString policy = it.key();
-         policy += QLatin1Char (':');
-         policy += QLatin1String (it.value());
-         domainConfig << policy;
-diff --git a/konqueror/settings/kio/kcookiespolicies.h b/konqueror/settings/kio/kcookiespolicies.h
-index b035ad5..ee87a94 100644
---- a/konqueror/settings/kio/kcookiespolicies.h
-+++ b/konqueror/settings/kio/kcookiespolicies.h
-@@ -73,7 +73,7 @@ private:
- private:
-     int d_itemsSelected;
-     Ui::KCookiePoliciesUI mUi;
--    QMap<QTreeWidgetItem*, const char*> m_pDomainPolicy;
-+    QMap<QString, const char*> m_pDomainPolicy;
- };
- 
- #endif // KCOOKIESPOLICIES_H
--- 
-1.8.0
-