[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     f446e2750787860b4b559ccbcc36a3db0bf5de35
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 12:32:36 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 12:34:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f446e275

kde-frameworks/kio: Fix testtrash with >=Qt-5.9.3

Incorporating Qt-5.7.1 buildfix from upstream commit a208dc70.

See also: https://phabricator.kde.org/D8837

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch  | 40 +++++++++++
 kde-frameworks/kio/kio-5.40.0-r3.ebuild            | 84 ++++++++++++++++++++++
 2 files changed, 124 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
new file mode 100644
index 00000000000..f3e1112720d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
@@ -0,0 +1,40 @@
+From 05938a167dd4190014d800bb02446e2779a9b3b2 Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Thu, 16 Nov 2017 12:06:41 +0100
+Subject: Fix testtrash with qtbase 5.10 beta 4
+
+Summary:
+Same fix as in D8836, this time for testtrash.
+
+Test Plan:
+Run testtrash.
+
+Reviewed By: dfaure
+
+Differential Revision: https://phabricator.kde.org/D8837
+
+*asturm: Fix build with Qt-5.7.1
+---
+ src/core/listjob.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp
+index 4b7b510..54a422a 100644
+--- a/src/core/listjob.cpp
++++ b/src/core/listjob.cpp
+@@ -117,7 +117,11 @@ void ListJobPrivate::slotListEntries(const KIO::UDSEntryList &list)
+                 itemURL = q->url();
+                 filename = entry.stringValue(KIO::UDSEntry::UDS_NAME);
+                 Q_ASSERT(!filename.isEmpty()); // we'll recurse forever otherwise :)
+-                itemURL.setPath(itemURL.path() + '/' + filename);
++                if (itemURL.path() == QLatin1String("/")) {
++                    itemURL.setPath(itemURL.path() + filename);
++                } else {
++                    itemURL.setPath(itemURL.path() + '/' + filename);
++                }
+             }
+ 
+             if (entry.isDir() && !entry.isLink()) {
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/kio/kio-5.40.0-r3.ebuild b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
new file mode 100644
index 00000000000..8429d9c0378
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-mkpath-qt-5.9.3.patch"
+	"${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch"
+	"${FILESDIR}/${P}-testtrash-qt-5.9.3.patch"
+)
+
+# tests hang
+RESTRICT+=" test"
+
+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)
+	)
+
+	kde5_src_configure
+}