summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-01-08 12:24:16 +0000
committerMichael Palimaka <kensington@gentoo.org>2013-01-08 12:24:16 +0000
commit484a42db0d7d084ae345371fa34476932c241aab (patch)
tree80cefb129bd8f3be345edefc24ef399505284870 /kde-base
parentAdd hppa/fpu fix from Guy Martin #450676 by Jeroen Roovers. (diff)
downloadhistorical-484a42db0d7d084ae345371fa34476932c241aab.tar.gz
historical-484a42db0d7d084ae345371fa34476932c241aab.tar.bz2
historical-484a42db0d7d084ae345371fa34476932c241aab.zip
Remove unused patches.
Package-Manager: portage-2.1.11.38/cvs/Linux x86_64 Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kmail/ChangeLog8
-rw-r--r--kde-base/kmail/Manifest18
-rw-r--r--kde-base/kmail/files/kmail-4.7.4-gcc44.patch11
-rw-r--r--kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch13
-rw-r--r--kde-base/kmail/files/kmail-4.8.4-sec.patch29
-rw-r--r--kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch22
-rw-r--r--kde-base/kmail/files/kmail-4.9.0-gcc44.patch21
-rw-r--r--kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch23
-rw-r--r--kde-base/konqueror/ChangeLog6
-rw-r--r--kde-base/konqueror/Manifest13
-rw-r--r--kde-base/konqueror/files/konqueror-4.9.1-focus.patch43
11 files changed, 28 insertions, 179 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 6fc7c2d6b16b..57cbe3f7eef1 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/kmail
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.323 2013/01/05 20:18:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.324 2013/01/08 12:18:24 kensington Exp $
+
+ 08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+ -files/kmail-4.7.4-gcc44.patch, -files/kmail-4.8.3-qt47-compat.patch,
+ -files/kmail-4.8.4-sec.patch, -files/kmail-4.8.5-spamfilter-mail-loss.patch,
+ -files/kmail-4.9.0-gcc44.patch, -files/kmail-4.9.0-spamfilter-mail-loss.patch:
+ Remove unused patches.
*kmail-4.9.5 (05 Jan 2013)
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 861813cefa2c..3db23ef07d15 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -6,12 +6,6 @@ AUX 4.4/0004-kmail-Make-spell-checking-work-again.patch 1138 SHA256 a7b37c0dc865
AUX 4.4/0004-libkdepim-Make-spell-checking-work-again.patch 1946 SHA256 57ca15b378faab075b8efd76b0379defcef1e8c110b60f65f3fb9272feacc0cc SHA512 ebb33447d06c76dce434ab6847674a1f790ab6300e0617cf8e88289c6af3ab8d96f3e0c62d7e9d01539fd30cc4dff301b9c8a77d1eefa2fc6b72198804dceb4f WHIRLPOOL 4c6a3bc00f976fd456c0940134ca389ad58cd4cb28c30a04d235e96c2a4b3ab6cc4dd25a4ff23558b3278f40f02b4c2ebef6837d244926aceaba4c137ede32ca
AUX 4.4/0005-Fix-bug-276086-crash-on-exit.patch 768 SHA256 f062bbc2e095cadfc53a420bcfe7f87569e7ba0506395285227625401286ea46 SHA512 3b39db7e037e757ddf8f6900f6196a99e0d74fc1f8b8dcf9a7661fbc85f86c6b52afdbcf570f771bbcdf6167b64b16403b9cb522f3e4cec3df10f9018a6b4be9 WHIRLPOOL 761ac1b4e511d68fe639788ce4a23096fcab6d80600e333c4ede8672d97ed380d0a1ccb00cf5628677fcb1cc87f0390213a02372254c68f907d671660b0c3b94
AUX kmail-4.4.9-nodbus.patch 3922 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68 SHA512 e883195c70559b9b161432f6593529a58e1b8b3d3e97d49a33f61a63a7992844e8658c0bf0f38f2f31b6b1e6d1e6f4b4611cf979dbbe98effa24db868402bbdf WHIRLPOOL d8d85987172602036ab4edae3f8aebe601ab7b37cd10eaf0b67faf758ee7f4ca84aebf1be977318f36464f17f765d59b4f284608fb315734be114769f16ffd5e
-AUX kmail-4.7.4-gcc44.patch 492 SHA256 6407d434616d32194c2b58b357dd11d9b427b62d20dd31671da5b1e0881e51f6 SHA512 2a4319050ab9f7813d9a9d365df87f168043b22afd9ba1cfe72f69cd509367c3f7fef144c79a91d8c4322e40daed3cef8ecbab8b456c8e4938c6e39b2acfa149 WHIRLPOOL 1e10746bf795d4192fe9a38a4f26ecbb411c1a026a89721ebf426704ff0d9a8a0c284aa0ef0354c55bfb9756a810a88759fa2201fd37c8c89647f0cfe8b055c3
-AUX kmail-4.8.3-qt47-compat.patch 348 SHA256 d14af0b62c1b5b18841422b985269069d22bbc1cbc6740ceddca7a977794261f SHA512 eef7bc8100a2c40270a77a9d8a1a1204b68347c15d3a03eede441ee544699f3e3894c87e985264c11fa3239b42dcccedb007f2abc7c7d33a8d791d6aed6a7e38 WHIRLPOOL fe82849e18abd34f0722800f0ce396aa5051222d5eaac8efef526e3190093ff238296db5a61f4e5fb9133f54cbe6369ddc6185f160480487860a8158d5141ef8
-AUX kmail-4.8.4-sec.patch 1058 SHA256 55dcb1b4e7de1c2fb391c7aaed42df10c4d2ea93d05549e219c7125f2eb81760 SHA512 bb43df6c27e565ed1f7147129953abfbcb2b52b8b0c5dfd01b340926cdac016b7c3de7625c528eeaf2d0c94059bc82fef11f4c72faf74fbc761baac0ffbfd373 WHIRLPOOL 73e8ac316c1c852de87228aa0ef7dfaa27eb03e359ffee763fa9aefa35d3861671a9ddc77656f41b81b68c99b04aaefa4e673a81556deb973fcaabe2f3a4c3d3
-AUX kmail-4.8.5-spamfilter-mail-loss.patch 1181 SHA256 30710925f55ab20745a31a0dd2b51085ac41195dcf7159c94cd942ca538d3f87 SHA512 3851b0dd79165249fff1d74edc13909e9ac4e1e6fc832ce0eb448d79284ba65d1b5665a266407090daa7fe7da238d9be845950f5cab8890461eb16959a3261ea WHIRLPOOL 176c53fb575424af93d205935347688abe5f72eee8595c522cdfa4f9d099cfc274bd86153521ee7a6fad98287b4ee942879456f6b06452afe9045abaa14798cd
-AUX kmail-4.9.0-gcc44.patch 662 SHA256 410cf3852fd90d9a07f0aee6c0be28660c4c99b5cfb0124a25297978cfca2d79 SHA512 4848d6d88cfce1b456be1003028991b6638fbf7356cb3e70f5b08a3feee8e198951d6688439ded1e9a7c2735d3b38438d663bb57bee89de92af1257882893535 WHIRLPOOL 44ea45313ae729365e48b07d64df459640a6b3748db0d8cdb41618ead958fb05381b722971b0c7d0de3cf86d8b6950a1cbd95d2faeffb83a53fb8f59ed9f6adc
-AUX kmail-4.9.0-spamfilter-mail-loss.patch 1311 SHA256 c5a58ac00fae9da9f7b31fe1843301f343b1e4fb2573862c29eb8de2e85d81e4 SHA512 5cc76586e6aa7ecf91527182e5ab7dff4285c98f0c45b93d4a40f6069368cd7c556dc950cf73685e48d688171b9d885d9716209851f476d64f8726f5af83879f WHIRLPOOL 3d35b25e81a7c882109ef03e0f16d84ccab20bb92fbd5f769c9e27381b93448a4d74518b41f51e05ccf66edae7693a738911967eeff29c729619954c94043175
DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
DIST kdepim-4.9.3.tar.xz 14415092 SHA256 de1f7b796a96d2a7f7f5a621e26ccd79110a171c71b0224a4d4b63453e6680d8 SHA512 8196c917d55d2b5e0dac4d8f75494233a2afc462c6de96b47cf1e9ea3741f07e016d97fa36a9986f2dfbc40c6357772a5c68c8ad1f3230786da3f6c6a0d02682 WHIRLPOOL d5f8680f104824abf63e7b1c6d79060d5c9acbdb581aff276b44abbf5d18da52c836d16e0d3554850e41d9b51a00b714dfe42f0f6bc6e9d143657ab60502a84a
DIST kdepim-4.9.4.tar.xz 14568168 SHA256 b1d865a66020f95d3bec4fafaa5de8796eb08cc0c897968a56aada8fd828ff0a SHA512 a8c7b0910a7cabae39374caeefade5bb075f18281504c87fa4cda291a9bcce2d85974f97eb2f59699039900fa34490f58e1bf72d4ef300d41cd68598f23181bd WHIRLPOOL 7edfdf010de6e3ff790988bb60d0c4abdd361bd1d19e76eb889ca9eab587ebf58308b905b61ae22670509517a9c763eeafde49cd202d9f1fb85a82bcd4bb4700
@@ -21,12 +15,16 @@ EBUILD kmail-4.4.11.1.ebuild 1757 SHA256 9f95b55a5c1d3fa304e1bdf6913bb109808101a
EBUILD kmail-4.9.3.ebuild 1728 SHA256 a51e83b13f934c5b0a42efcdd4a4f6b110764b0c291799d25bd83bcb790ed59f SHA512 e60eb79e221d7fcf3d612c67494bdedde4a02c48dd49218087c1d0900d075efa72c76618e5329ea78c770ea36f5976a1b09f8663ac5e6a987d6ded042a1b90d2 WHIRLPOOL 9a13b97eb953123bc3c8e4f87877f89271d3e9c550d1312c533d602f41e9a4562db4e61bd8b765810a6f4b0e2f09ef8cd26bb7ba0515612d06be796f8ba74b42
EBUILD kmail-4.9.4.ebuild 1739 SHA256 640c8720c9b89aeeca318f9f01dd546b4f477143b3a6559c759452062f366dc6 SHA512 8b02a24ed1e3380a5b7583340d22e054151dc3aa93b6a7d6aea4a5fd2a6461d315091b044a32310eecaee7a169b977027011395d982572f8329c87b5bb47ec7b WHIRLPOOL 7988349b4cb8a717a149a9be4f8cfc3586ef7cb5d9741b97a4fe2f80b39cea5977886a0682b421633b3b31bc001bb51497d64833f555a489a58423b1847610d3
EBUILD kmail-4.9.5.ebuild 1741 SHA256 c54b92d1aef092fdabc1490e214c2520cee59b825d4dce84bb7bf8760d74e558 SHA512 aed9a8636983de54f6616c2b0fb695eb7d1efda00b84a8dbdaafe9bd06ddb0d6ac0334c0f14d2fda8da475eb5b58a38689da8fffed73c1a72d9aba281d0d6068 WHIRLPOOL a9c55317742c1f81cdfb081b4514f58b2b0b08f707bfcd8ad08508a5e187758dd0684f1d7c218bb33e24294a4fff83a34169df33598a9cfcfc405ffeebd499f6
-MISC ChangeLog 42337 SHA256 9e4bd61a91861de6f88deb749f88178e93e6b6461e6fca2d729f0a982840f838 SHA512 4620fe627f3ca6e70aa7995d597e79d0c5c88f9b649e543136851c98b25120d08c4187fb9cc0ff3525b7d586d801097203c990057e4b4f6747ec6540984b8355 WHIRLPOOL 0ac6f587c785c61095a44b2cbd9024fdab1c595d13a934ed15d20979ac4649df35f7e959b93880551169fc8f682fb71c01768874b062aca5126ced4f0236d95c
+MISC ChangeLog 42653 SHA256 011669e191cb168af202ce23cff1311302292eb95e49618887e76aceb3314442 SHA512 31034fe39c556deafc5222cc624bab49270daa5859c238f9c627c0e61cb65974dd7f00bf5eb106d20909d900a2e0d488db06f6ad156e69e0e458dbb3e7f9b4dd WHIRLPOOL c95b7c548cd062510bd2e4b2c632508c61ba189b3abd514389894169f0b8282735a0d25a52eaf459f180952835ff14cea1a2ed034fd559128eb5e8a4c067dc97
MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDoi04ACgkQ23laikJhg1S8QwCfVCpv9j5D7sSgUi2Xm79wiP+s
-8RwAoJRE3KEWZGmHz5e3PCJQl/C5W+Wp
-=XIqm
+iQEcBAEBCAAGBQJQ7A3lAAoJEMbwO6tnXQ0sd7IH/3WgX+RGS6sCzdP0+jzAbpTN
+f3gxqsqoMLgttjErj4VZ7mKDxBADEd74ZVwfBXNPa5a1KBo2B+zizIiT/BUlD/X+
+VCMKlHX7OREnAkkmcC39vboV5Sn9kl+2GweChwgTBEiYF9Z1AimZLl5Mt7fKnIgg
+v+GvWhI3xB2cvuoecw06kH1nKjj+eUVeBVBTkBRd+QotofQwOWnh6WW2G7LMXala
+VJimL3yFSkhlaE9vXYCdmaCpbzstPYkeOHYCOXQTj+iVcVv1cOseGpqwIgjQVjuW
+Xzaz9yHn0sVEq8Hv46wczxBYQYqbfoONxM9iTT6iWNLpHiws8ctFrR9vxDdEFmA=
+=Jlt0
-----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch b/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
deleted file mode 100644
index 363620292c70..000000000000
--- a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kmail-4.7.4.orig/messagecomposer/akonadisender.cpp kmail-4.7.4/messagecomposer/akonadisender.cpp
---- kmail-4.7.4.orig/messagecomposer/akonadisender.cpp 2011-12-02 00:25:40.000000000 +0100
-+++ kmail-4.7.4/messagecomposer/akonadisender.cpp 2011-12-30 23:10:05.151509937 +0100
-@@ -38,7 +38,6 @@
- #include <messagecore/stringutil.h>
- #include <messagecore/messagehelpers.h>
-
--using namespace KMime;
- using namespace KMime::Types;
- using namespace KPIM;
- using namespace MailTransport;
diff --git a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch b/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
deleted file mode 100644
index a6c553260feb..000000000000
--- a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/messageviewer/viewer_p.cpp
-+++ b/messageviewer/viewer_p.cpp
-@@ -1930,8 +1930,10 @@ void ViewerPrivate::slotToggleHtmlMode()
-
- void ViewerPrivate::slotFind()
- {
-+#if QT_VERSION >= 0x040800
- if ( mViewer->hasSelection() )
- mFindBar->setText( mViewer->selectedText() );
-+#endif
- mFindBar->show();
- mFindBar->focusAndSetCursor();
- }
diff --git a/kde-base/kmail/files/kmail-4.8.4-sec.patch b/kde-base/kmail/files/kmail-4.8.4-sec.patch
deleted file mode 100644
index 0e1aa39a068c..000000000000
--- a/kde-base/kmail/files/kmail-4.8.4-sec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dbb2f72f4745e00f53031965a9c10b2d6862bd54 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Mon, 2 Jul 2012 07:00:53 +0200
-Subject: [PATCH] Security fix found by David yesterday during debug (cherry
- picked from commit
- b6a46407d83ad9368a9825c687fa44e660f7104a)
-
----
- messageviewer/htmlquotecolorer.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/messageviewer/htmlquotecolorer.cpp b/messageviewer/htmlquotecolorer.cpp
-index b54e989..67c3062 100644
---- a/messageviewer/htmlquotecolorer.cpp
-+++ b/messageviewer/htmlquotecolorer.cpp
-@@ -40,6 +40,10 @@ QString HTMLQuoteColorer::process( const QString &htmlSource )
- #ifndef KDEPIM_NO_WEBKIT
- // Create a DOM Document from the HTML source
- QWebPage page(0);
-+ page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
-+ page.settings()->setAttribute( QWebSettings::JavaEnabled, false );
-+ page.settings()->setAttribute( QWebSettings::PluginsEnabled, false );
-+
- QWebFrame *frame = page.mainFrame();
- frame->setHtml( htmlSource );
-
---
-1.7.9.2
-
diff --git a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
deleted file mode 100644
index 5e9210ecb9a2..000000000000
--- a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 628faec2651f6f20a438f61fc9c861c0d5eab0f8
-Author: Andras Mantia <amantia@kde.org>
-Date: Sat Aug 25 11:52:45 2012 +0300
-
- Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that needs a content.
-
- FIXED-IN: 4.8.6
-
- BUG: 295484
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 5f66e74..4e37ac7 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -111,6 +111,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
-
- changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
- if (m_filterManager->requiresFullMailBody()) {
-+ changeRecorder()->itemFetchScope().setCacheOnly(false);
- changeRecorder()->itemFetchScope().fetchFullPayload();
- } else {
- changeRecorder()->itemFetchScope().fetchPayloadPart( Akonadi::MessagePart::Header, true );
diff --git a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch b/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
deleted file mode 100644
index 29e7115e1960..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 92bface95453799620cd2368a7c0771c4304bbf3
-Author: David Faure <faure@kde.org>
-Date: Thu Aug 9 11:58:30 2012 +0200
-
- Fix compilation with gcc-4.4.7, a gentoo user reported this fixed the issue.
-
- (Message::Foo was ambiguous due to KMime::Message and namespace Message in
- messagecomposer/util.h)
-
-diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
-index 92593f2..c4bcd86 100644
---- a/kmail/kmreaderwin.cpp
-+++ b/kmail/kmreaderwin.cpp
-@@ -45,7 +45,6 @@ using MessageViewer::CSSHelper;
- #include "stringutil.h"
-
- #include <kmime/kmime_mdn.h>
--using namespace KMime;
-
- #include "messageviewer/viewer.h"
- using namespace MessageViewer;
diff --git a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
deleted file mode 100644
index 9a2dc4b5b095..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit e98937475a7f03e69a3a3c6a4ee67a8d41f027b5
-Author: Andras Mantia <amantia@kde.org>
-Date: Sat Aug 25 11:47:36 2012 +0300
-
- Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that *needs* a content.
-
- FIXED-IN: 4.9.1
-
- BUG: 295484
- (cherry picked from commit c691cb5d9cc7bb337c149e0279e21397f168c314)
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 7220d90..75d6f05 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -117,6 +117,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
- Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
-
- changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
-+ changeRecorder()->itemFetchScope().setCacheOnly(false);
- mRequestedPart = m_filterManager->requiredPart();
- if (mRequestedPart == MailCommon::SearchRule::CompleteMessage) {
- changeRecorder()->itemFetchScope().fetchFullPayload();
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 18e5c2692ea6..4e3e55660921 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.267 2013/01/05 20:18:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.268 2013/01/08 12:22:49 kensington Exp $
+
+ 08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+ -files/konqueror-4.9.1-focus.patch:
+ Remove unused patches.
*konqueror-4.9.5 (05 Jan 2013)
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index 1486c0321ad1..0feeb24baaf5 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,7 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX konqueror-4.9.1-focus.patch 1844 SHA256 5dd34e9fda0c77d71eb3c6126aaead464e25f9b0eaa12fac568d3a433f8f2809 SHA512 868e40c2833e2d6bb088b61620d0f4a34a2c44953082e12e51149727e0101cebecb0cd4d85105e861106eb4377fff54f339e9e1486f48a05cc272f56fb030c4a WHIRLPOOL b2e81b34f3d5b382c3ae230512ace805d6e4c4a5422f232a62476b2e1d47176e343838e11d9fb0efa71f1baf9c5c285551eb2457fb102d4bc262c5197d211be3
AUX konqueror-4.9.3-crash.patch 5835 SHA256 3450fc99b35027df6fc75cabe5372e2c63c3883091b7df39c5fcc0a053863362 SHA512 9732c65b4a60390cf2fbb79d619baf03792da73c468844eb3523ece8cd4e19fe84fac36ea1c2954208c1ea03a9a83427af9de7e1d8e992ff8604dd6ccd7d1b2b WHIRLPOOL da50c06723f148b5a60c1730b1333377d3caa01d331f0910ff85486780fdd9ce39248f072eb642d724733c2a4a37de6fcc0a390311391f4edac0f78ec2a14585
DIST kde-baseapps-4.9.3.tar.xz 2487976 SHA256 26314e40abc5c138c1772aa1cdb61696550284ed5a170f19728b2deb12514bb7 SHA512 86ed31113374ad31aed6b345b9b371d6e282c88fe5e07564a80035229a7aef05d9bf615369e6278406ae72d38b53f84d41ce059ff3bad20f11959500cf493489 WHIRLPOOL 6068bb6b0fae080d1340d047eda9639bb83821baf79a4b0384e7844bca21215b30a480e12dcdfcc181837b77b11da053fa5ae727d2a50c5283b0f34cd5d1d709
DIST kde-baseapps-4.9.4.tar.xz 2523460 SHA256 c04208681afcbee108c51fadaca6ca8ba98090c56d66a454c6acc57288f6c238 SHA512 f709d000ddfbb0d73ceb977d83115b876b954123a0e839aeb99dd4c5bb2458f19f6961e46953c70070e27694941465032c50e050cf6ab2e9990e4b6f1c961a53 WHIRLPOOL 81743b8b7823ed44595de2dfec9356009b04f60e5768b211a88c29fef5afa7d48800610a14e8749fb13f3e2e4e80c53c80d8a00792abe6121b0782fd67c78b5f
@@ -10,12 +9,16 @@ EBUILD konqueror-4.9.3-r1.ebuild 1283 SHA256 d4694f7f784d79f81275be7fce84d39b3b9
EBUILD konqueror-4.9.3.ebuild 1239 SHA256 aa16e069fbea49f0cb7dfe3966123a82b90f2e362885033e943e6fcc38e3a694 SHA512 d9e242c2fbd03b2e459d6a703989291ec117ed161ace7cfabd233289356f5dc257557761885ff8964cc5b322f195e1381b7f123949a52dbb4d29d1572f9120f5 WHIRLPOOL 18103df4f9f616bce18de38beae3da09536cbbccab4f90ff30489a97c694c086298cf23d02eb35dee1828e9c92f84a77607f7bd4070156ea2403b523405fa11c
EBUILD konqueror-4.9.4.ebuild 1242 SHA256 149f796f8b93f76348f9c515c7d90473ebbcd3747f79df637fab3c28be9a11c3 SHA512 7ac50178d9d0df60d047a11ba84d8e149f20ffdca5b677a2117f86a4fc72c4e5347cf8d254798916b290d23e2e234458b46022cee0d6ace771419b412e356364 WHIRLPOOL db0ece7d2c4e3fa456a713a6e956af54bb99ef7d87a255685b3aca15fcb9836b5ee3987126d18a0e296c7f77eee811f72fd39f57cb569e715e1a9524a48d2a39
EBUILD konqueror-4.9.5.ebuild 1244 SHA256 25beaa0e85bce528eee29cd6a26cfd53ed9403a7e2ecb6a1281459099597b373 SHA512 41348cbdcdc91efbc8d4b52367df57af295bf8b94c5a9683e4c0eead7a7838619c6a224b90ed69a3d8b909a74e1981459ac74a8111ec9177c5b4d01ec608e661 WHIRLPOOL 71481b0f8f4194184a3364310c6a4ab2b0fd4d7fbb31765ca7c79a157eed9a8d4b30a3e70edd7f750c5e076af92315dae82e1573be0fbb8b66211c9d7dc4508d
-MISC ChangeLog 34662 SHA256 12d050f95637bc8b08954ed5779db5acfd077d2fb253e25d06314ff10c8710d8 SHA512 95e2f0d783f159a417e8c03d1b04d127df0d45516d93c646a77c96f76dd71ddff3f501fd93584801dbaa83b200cac6dffe693a07e129eff5710969ba320e6f8c WHIRLPOOL 535019bc10e92308f8f5da1272cc5e4a1ae4086a1a272666f1c8cd07812e28b731585f4870657b4b6ee2bff8832137fbf03f4fb76e6c4a2d909ce9836f224a93
+MISC ChangeLog 34784 SHA256 4509dbf8ff68a0854d14e220b85fb19c72b013a981ce45950058684448abed47 SHA512 620286bc8300f7b271c0e11b4dddede480a8531223a6ff0ccb80a110b8c2bf1a2549b48a398bfca8e57b5d771268938958dc9c80f5f39eec5eee229adc5c4bcb WHIRLPOOL 3c8c785017fa2c8712095e86099dd6e4a120286ae0cb9f4eb2a3dad6e98d36c0a54f640e1c49da17dcabdc83f801f5fbfa9de34b00f9977ac3faa377d71334ff
MISC metadata.xml 247 SHA256 6569683d0d0645fc26a371127f3c7b7135eaa937900e718d17f57b729457b754 SHA512 51f1bee5af253468e645e68f3da14f74ff7ff3e6ccc0f8298f5eb6c855693b551e8f32676f5ab3bdaee12125fd32b1210bd111abaf7f89dfdd88a7062c53ed24 WHIRLPOOL 51bf0af3505b9669fbe561b31f399f91ff6b3b6bbaccdbe7e3e544d84a120933fa116ed798eebebe806487549e22cb88331f452e9a7e03ace4a5a994727d40d8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDoi04ACgkQ23laikJhg1R9AgCgg1cFleD4phj7V3PcKRn1elms
-BMsAnj89hffJoSLpKHT2AwWOObdR6bC/
-=x3R7
+iQEcBAEBCAAGBQJQ7A8fAAoJEMbwO6tnXQ0sOv0H/2grDbJ3sklYp4vGz5N2gBdW
+bVOg/0ij3uZZKYR9rfunSUaaAGDaONySdLI+3dJu1mA0TzG/WHrm+WQVYn6Ux/2x
+L8Pp7RU3kx2MNtGy8DmgWkQnZs70TxDekm5n+Pdq0W5GVzaQRXzolZNUOAWm74Hd
+tOOhH1R5bTGunncqrAlWN0j9LRgtd2sbz+FOBvDAF6fG/743rA03oxRJgD89mopi
+ooM0uNWrFBV+YUxwaKGbVLU7fx6l/oIjhc5dArExhbAwVdv2FK+YXh2QQTnpgLV/
+Evo2SwoJV3CW4BfuiDHaCyu3BidRCCxYvgSL4IYJxAOhkz040T8/I1GYeIGZViQ=
+=l/P2
-----END PGP SIGNATURE-----
diff --git a/kde-base/konqueror/files/konqueror-4.9.1-focus.patch b/kde-base/konqueror/files/konqueror-4.9.1-focus.patch
deleted file mode 100644
index 4fdbdb0679cf..000000000000
--- a/kde-base/konqueror/files/konqueror-4.9.1-focus.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 5fa3dbc49f8cac8253e198298948832ca7d38674
-Author: Dawit Alemayehu <adawit@kde.org>
-Date: Wed Sep 5 03:14:52 2012 -0400
-
- Fix commit a2ae8003352442efdb5731b3fd3de3107b0c1e99. :(
-
- Do not attempt to change focus when the active view is not the current one.
- Fixes location bar address being changed when opening URLs in a background tab.
-
-diff --git a/konqueror/src/konqview.cpp b/konqueror/src/konqview.cpp
-index 0130292..2ee9896 100644
---- a/konqueror/src/konqview.cpp
-+++ b/konqueror/src/konqview.cpp
-@@ -518,19 +518,20 @@ void KonqView::slotRequestFocus( KParts::ReadOnlyPart * )
- void KonqView::setLoading( bool loading, bool hasPending /*= false*/)
- {
- //kDebug() << "loading=" << loading << "hasPending=" << hasPending;
-- if (loading) {
-+ m_bLoading = loading;
-+ m_bPendingRedirection = hasPending;
-+ if ( m_pMainWindow->currentView() == this ) {
-+ m_pMainWindow->updateToolBarActions( hasPending );
- // Make sure the focus is restored on the part's widget and not the combo
- // box if it starts loading a request. See #304933.
-- QWidget* partWidget = (m_pPart ? m_pPart->widget() : 0);
-- if (partWidget && !partWidget->hasFocus()) {
-- //kDebug() << "SET FOCUS on the widget";
-- partWidget->setFocus();
-+ if (loading) {
-+ QWidget* partWidget = (m_pPart ? m_pPart->widget() : 0);
-+ if (partWidget && !partWidget->hasFocus()) {
-+ //kDebug() << "SET FOCUS on the widget";
-+ partWidget->setFocus();
-+ }
- }
- }
-- m_bLoading = loading;
-- m_bPendingRedirection = hasPending;
-- if ( m_pMainWindow->currentView() == this )
-- m_pMainWindow->updateToolBarActions( hasPending );
-
- m_pMainWindow->viewManager()->setLoading( this, loading || hasPending );
- }