diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-01 13:31:47 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-01 13:32:09 +0100 |
commit | 9888c347166f967a3c56aa6d54ee222c4b5e27aa (patch) | |
tree | 7cb2b503b6a9a58142ba88d0a96b158d9aa81731 /kde-frameworks/kio | |
parent | www-misc/vdradmin-am: moved to acct user/group handling (diff) | |
download | gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.tar.gz gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.tar.bz2 gentoo-9888c347166f967a3c56aa6d54ee222c4b5e27aa.zip |
kde-frameworks: Drop KDE Frameworks 5.64
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio')
5 files changed, 0 insertions, 210 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 0d2a62d115ba..684fdb8e20eb 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,2 +1 @@ -DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652 DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04 SHA512 baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72 diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch deleted file mode 100644 index 17968ff6cdb8..000000000000 --- a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com> -Date: Fri, 22 Nov 2019 12:39:48 +0100 -Subject: Ftp ioslave: Fix ProxyUrls parameter passing - -Summary: -QVariant stored in mapConfig always contain QByteArray values. -So QVariant needs to be converted string before splitting to StringList - -Relates to D25432 - -Reviewers: trufanov, #frameworks - -Reviewed By: trufanov - -Subscribers: kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D25438 ---- - src/ioslaves/ftp/ftp.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp -index 8cd58c9..4266a6c 100644 ---- a/src/ioslaves/ftp/ftp.cpp -+++ b/src/ioslaves/ftp/ftp.cpp -@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u - qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; - - m_proxyURL.clear(); -- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList(); -+ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); - qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; - - if (m_host != _host || m_port != _port || --- -cgit v1.1 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 deleted file mode 100644 index 2bde0a85d680..000000000000 --- a/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/files/kio-5.64.0-fix-no-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch deleted file mode 100644 index 54f9755092f2..000000000000 --- a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sat, 23 Nov 2019 20:11:21 +0100 -Subject: Repair FTP/HTTP proxy querying for the case of no proxy - ---- - src/ioslaves/ftp/ftp.cpp | 2 +- - src/ioslaves/http/http.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp -index 4266a6c..f310871 100644 ---- a/src/ioslaves/ftp/ftp.cpp -+++ b/src/ioslaves/ftp/ftp.cpp -@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u - qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; - - m_proxyURL.clear(); -- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); -+ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); - qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; - - if (m_host != _host || m_port != _port || -diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp -index aca847b..5f9cd7c 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"), QString()).toString().split(QLatin1Char(',')); -+ m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); - qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls; - } - --- -cgit v1.1 diff --git a/kde-frameworks/kio/kio-5.64.0-r2.ebuild b/kde-frameworks/kio/kio-5.64.0-r2.ebuild deleted file mode 100644 index e400a929c18b..000000000000 --- a/kde-frameworks/kio/kio-5.64.0-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 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" - "${FILESDIR}/${P}-fix-ftp-proxy-settings.patch" - "${FILESDIR}/${P}-fix-no-proxy-settings.patch" -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) - $(cmake_use_find_package kerberos GSSAPI) - $(cmake_use_find_package kwallet KF5Wallet) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} |