summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kde-base/kdepim-runtime/ChangeLog6
-rw-r--r--kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch22
2 files changed, 5 insertions, 23 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 6c2d094f86e2..1df8de014c18 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdepim-runtime
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.173 2013/12/12 03:36:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.174 2013/12/14 21:59:45 johu Exp $
+
+ 14 Dec 2013; Johannes Huber <johu@gentoo.org>
+ -files/kdepim-runtime-4.10.5-fix-autoconfig.patch:
+ Remove unused patch.
12 Dec 2013; Agostino Sarubbo <ago@gentoo.org>
-kdepim-runtime-4.10.5-r1.ebuild:
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch
deleted file mode 100644
index 3ced22093a23..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit bb58cdc9dd1a166e886b091602483f20f61c3130
-Author: Montel Laurent <montel@kde.org>
-Date: Thu Jul 4 08:31:35 2013 +0200
-
- Fix Bug 321927 - autoconfig support not working properly
-
- FIXED-IN: 4.11
- BUG: 321927
-
-diff --git a/accountwizard/ispdb/ispdb.cpp b/accountwizard/ispdb/ispdb.cpp
-index 0c04cf2..24d274f 100644
---- a/accountwizard/ispdb/ispdb.cpp
-+++ b/accountwizard/ispdb/ispdb.cpp
-@@ -68,7 +68,7 @@ void Ispdb::lookupInDb()
- {
- case IspAutoConfig:
- {
-- url = KUrl( "http://autoconfig." + mAddr.domain.toLower() + "/mail/config-v1.1.xml" );
-+ url = KUrl( "http://autoconfig." + mAddr.domain.toLower() + "/mail/config-v1.1.xml?emailaddress=" + mAddr.asString().toLower() );
- }
- break;
- case IspWellKnow: