From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 19 Dec 2019 09:44:54 +0000 (+0100)
Subject: kde-frameworks/kio: Fix HTTP proxy settings
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df7bb09fcfce8b75127b6c5178c650f48d516cd6;p=gentoo.git

kde-frameworks/kio: Fix HTTP proxy settings

Upstream commit c0ae03d14b0e58f2d3a23680b7b63c9fe46bdce6

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=414346
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch
new file mode 100644
index 000000000000..2bde0a85d680
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch
@@ -0,0 +1,43 @@
+From c0ae03d14b0e58f2d3a23680b7b63c9fe46bdce6 Mon Sep 17 00:00:00 2001
+From: Alexander Trufanov <trufanovan@gmail.com>
+Date: Thu, 21 Nov 2019 14:25:02 +0300
+Subject: Fix HTTP proxy settings
+
+Summary:
+After SlaveBase::config() was replaced with SlaveBase::mapConfig()
+the reading of "ProxyUrls" value had beed broken as QVariant with
+type QByteArray can't be directly converted to QStringList.
+It should be converted to QString and splitted.
+
+Reviewers: #frameworks, meven
+
+Reviewed By: meven
+
+Subscribers: meven, kde-frameworks-devel
+
+Tags: #frameworks
+
+BUG: 414346
+FIXED-IN: 5.65
+
+Differential Revision: https://phabricator.kde.org/D25432
+---
+ src/ioslaves/http/http.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
+index 2b9ca9a..aca847b 100644
+--- a/src/ioslaves/http/http.cpp
++++ b/src/ioslaves/http/http.cpp
+@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection()
+ 
+     // Get proxy information...
+     if (m_request.proxyUrls.isEmpty()) {
+-        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList();
++        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
+         qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls;
+     }
+ 
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kio/kio-5.64.0-r1.ebuild b/kde-frameworks/kio/kio-5.64.0-r1.ebuild
new file mode 100644
index 000000000000..805eb8dac88d
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.64.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	>=kde-frameworks/kauth-${PVCUT}:5
+	>=kde-frameworks/karchive-${PVCUT}:5
+	>=kde-frameworks/kbookmarks-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${PVCUT}:5
+	>=kde-frameworks/kconfig-${PVCUT}:5
+	>=kde-frameworks/kconfigwidgets-${PVCUT}:5
+	>=kde-frameworks/kcoreaddons-${PVCUT}:5
+	>=kde-frameworks/kcrash-${PVCUT}:5
+	>=kde-frameworks/kdbusaddons-${PVCUT}:5
+	>=kde-frameworks/ki18n-${PVCUT}:5
+	>=kde-frameworks/kiconthemes-${PVCUT}:5
+	>=kde-frameworks/kitemviews-${PVCUT}:5
+	>=kde-frameworks/kjobwidgets-${PVCUT}:5
+	>=kde-frameworks/knotifications-${PVCUT}:5
+	>=kde-frameworks/kservice-${PVCUT}:5
+	>=kde-frameworks/ktextwidgets-${PVCUT}:5
+	>=kde-frameworks/kwidgetsaddons-${PVCUT}:5
+	>=kde-frameworks/kwindowsystem-${PVCUT}:5
+	>=kde-frameworks/kxmlgui-${PVCUT}:5
+	>=kde-frameworks/solid-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( >=kde-frameworks/kwallet-${PVCUT}:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-fix-http-proxy-settings.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}