summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schiffbauer <mschiff@gentoo.org>2013-07-04 10:08:41 +0200
committerMarc Schiffbauer <mschiff@gentoo.org>2013-07-04 10:08:41 +0200
commitadab3175647da026b250c97518bf0b82fa5eda1c (patch)
tree9a342db364c93ed693fd333703fc839a1c944285
parentb0aeca5f7bb672980e01c18b8cebce6079884e29 (diff)
downloadkde-adab3175647da026b250c97518bf0b82fa5eda1c.tar.gz
kde-adab3175647da026b250c97518bf0b82fa5eda1c.tar.bz2
kde-adab3175647da026b250c97518bf0b82fa5eda1c.zip
[kde-base/kdepim-runtime] Backport fix for autoconfig feature
Package-Manager: portage-2.2.0_alpha186
-rw-r--r--kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch22
-rw-r--r--kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild1
2 files changed, 23 insertions, 0 deletions
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
new file mode 100644
index 00000000000..3ced22093a2
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch
@@ -0,0 +1,22 @@
+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:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
index 41f26c22548..1511c3b69dd 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.10.49.9999.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}
"
src_configure() {
+ epatch "${FILESDIR}/${PN}-4.10.5-fix-autoconfig.patch"
local mycmakeargs=(
$(cmake-utils_use_find_package google LibKGAPI)
$(cmake-utils_use_find_package kolab Libkolab)