summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2010-10-21 15:04:21 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2010-10-21 15:04:21 +0000
commit24e3516ab621c32960c789ba5b26513939f1ce78 (patch)
treeb0b79d227d370cc5df95b73498817bca71c41de3 /kde-base
parentPin glib/gtk dependency to slot 2, re-add libunique and libcanberra-gtk to RD... (diff)
downloadhistorical-24e3516ab621c32960c789ba5b26513939f1ce78.tar.gz
historical-24e3516ab621c32960c789ba5b26513939f1ce78.tar.bz2
historical-24e3516ab621c32960c789ba5b26513939f1ce78.zip
Fix https urls being actually shown instead of getting downloaded, patch backported from upstream 4.5 branch, fixes bug 340257 kde bug 253294
Package-Manager: portage-2.2_rc94/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog7
-rw-r--r--kde-base/kdelibs/Manifest5
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch10
-rw-r--r--kde-base/kdelibs/kdelibs-4.5.2.ebuild3
4 files changed, 21 insertions, 4 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e239d1dade63..06ffcc957a28 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.705 2010/10/06 09:17:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.706 2010/10/21 15:04:21 tampakrap Exp $
+
+ 21 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+ kdelibs-4.5.2.ebuild, +files/kdelibs-4.5.2-open-https.patch:
+ Fix https urls being actually shown instead of getting downloaded, patch
+ backported from upstream 4.5 branch, fixes bug 340257 kde bug 253294
*kdelibs-4.5.2 (05 Oct 2010)
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 5bf914e944fa..45b57414de4b 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -12,9 +12,10 @@ AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925
AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d
AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d
AUX kdelibs-4.4.90-xslt.patch 553 RMD160 b667c3330a2721ab0de237f50af81ec830954c0f SHA1 24faa51f5d3645858ca55c744b9b76952eb383c6 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b
+AUX kdelibs-4.5.2-open-https.patch 436 RMD160 4c4e45df7758d04f93e38071f3fc9839d4205693 SHA1 152353fbf9df9345788da4d58714e1481fdea07c SHA256 849a8e4480062e00255f5a8e0885bf47e8d3741cb1d68ebbdeef495ed1220cb0
DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
DIST kdelibs-4.5.2.tar.bz2 13868855 RMD160 9d8830a0f9b9062ead1d18918da0ce25d24f5cbe SHA1 e5b3c643aa10275571be6a637333e8791ed013b6 SHA256 09e08cd91da0d9b84dad98e919a52000ea92b6cf34ec0c15b43a68cfd9c6b4c3
EBUILD kdelibs-4.4.5.ebuild 9306 RMD160 a28e36dc41ca15c7246fc23654198ef50bfed98d SHA1 646d831c40529d7dab0ec914bc6a54dd2921dc7f SHA256 870d7fd624e4aa75874e11de6f38e552f392191a7f5077c30aebf9a05d3f51b4
-EBUILD kdelibs-4.5.2.ebuild 9353 RMD160 611a3d9834ebc6452dc088bd1bad6246f749bdb0 SHA1 4f93c02601e4091d76e2fa4deddef1902904652d SHA256 5c5291e6b0ea5b55dddfa9f6caa4690ad9e874b5dbf674a4af8967aa47eefaac
-MISC ChangeLog 117319 RMD160 84368c74e4ed8aaf8e06737d48c731d32c816cde SHA1 a2fb4e5137ba383ed63c56f6f4147b456abe1d77 SHA256 84552698d4c47bcccaefdd5a2ac2d51b87ba17efd8bb7aa80488c7898e8ae1ff
+EBUILD kdelibs-4.5.2.ebuild 9393 RMD160 21727bdd74fa6a6ab11cb91452f823d62b1b359f SHA1 944b18bf94a7ebebf5e3fae28aea2e1cd871cd92 SHA256 3d99f77616cf6a8203003627edab1cef9343d1d76332595380f8a3a82a3fc1ac
+MISC ChangeLog 117588 RMD160 6e3303e3bf110a5ae4ca47d10b53917393a551b3 SHA1 aa1823f3ceaedd77294506db8a337d908f39e305 SHA256 c7015a4df909b24b507ca382bc033126bbafb18f8da44ba0a433079a2a7f99e9
MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch b/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch
new file mode 100644
index 000000000000..cbce1f4d0966
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch
@@ -0,0 +1,10 @@
+--- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/06 22:28:05 1183316
++++ branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/06 22:33:23 1183317
+@@ -375,6 +375,7 @@
+ }
+ else { // if no KDE app, be a bit over-generic
+ supportedProtocols.append("http");
++ supportedProtocols.append("https"); // #253294
+ supportedProtocols.append("ftp");
+ }
+ }
diff --git a/kde-base/kdelibs/kdelibs-4.5.2.ebuild b/kde-base/kdelibs/kdelibs-4.5.2.ebuild
index 33b870296695..774ee9e596d7 100644
--- a/kde-base/kdelibs/kdelibs-4.5.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.5.2.ebuild,v 1.1 2010/10/06 09:17:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.5.2.ebuild,v 1.2 2010/10/21 15:04:21 tampakrap Exp $
EAPI="3"
@@ -126,6 +126,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
"${FILESDIR}/${PN}-4.4.3-mimetypes.patch"
"${FILESDIR}/${PN}-4.4.90-xslt.patch"
+ "${FILESDIR}/${P}-open-https.patch"
)
src_prepare() {