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

2023-12-25 Thread Andreas Sturmlechner
commit: 00ade3e9be009dbb28f04b6cb1fac0f86cb24746
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 25 19:23:45 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 25 19:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ade3e9

kde-frameworks/kio: Fix Properties dialog crash over malformed Exec

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=465290

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kio-5.113.0-fix-crash-malformed-exec.patch | 41 ++
 kde-frameworks/kio/kio-5.113.0-r1.ebuild   |  5 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git 
a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch 
b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch
new file mode 100644
index ..3688fa4af276
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch
@@ -0,0 +1,41 @@
+From ebad60218b9d9e6901ae48c3dec9b90da963809c Mon Sep 17 00:00:00 2001
+From: Harald Sitter 
+Date: Wed, 13 Dec 2023 07:44:01 +0100
+Subject: [PATCH] kpropertiesdialog: don't trip over malformed Exec
+
+when the user incorrectly put env vars into the Program field the
+resulting desktop file will be somewhat malformed and literally contain
+
+> Exec='FOO=1 Bar'
+
+this then needs careful handling when parsing so we don't accidentally
+drain the execline list. when this scenario appears we'll need to assume
+the last item in the list is the program as we can't really tell if it
+is a program that looks like an env var or an env var without program
+
+BUG: 465290
+(cherry picked from commit 78d4364677fbe658c6e05d19bb158f895403ccc9)
+---
+ src/widgets/kpropertiesdialog.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp 
b/src/widgets/kpropertiesdialog.cpp
+index 93ec0759cf..25061825af 100644
+--- a/src/widgets/kpropertiesdialog.cpp
 b/src/widgets/kpropertiesdialog.cpp
+@@ -3379,6 +3379,12 @@ 
KDesktopPropsPlugin::KDesktopPropsPlugin(KPropertiesDialog *_props)
+ execLine.pop_front();
+ }
+ for (auto env : execLine) {
++if (execLine.length() <= 1) {
++// Don't empty out the list. If the last element contains an 
equal sign we have to treat it as part of the
++// program name lest we have no program
++// https://bugs.kde.org/show_bug.cgi?id=465290
++break;
++}
+ if (!env.contains(QLatin1String("="))) {
+ break;
+ }
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.113.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.113.0-r1.ebuild
index 1d6824b359b1..b2f3e4451367 100644
--- a/kde-frameworks/kio/kio-5.113.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.113.0-r1.ebuild
@@ -70,7 +70,10 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}/${P}-fix-crash-while-copying.patch" ) # KDE-bug 448532
+PATCHES=(
+   "${FILESDIR}/${P}-fix-crash-while-copying.patch" # KDE-bug 448532
+   "${FILESDIR}/${P}-fix-crash-malformed-exec.patch" # KDE-bug 465290
+)
 
 src_configure() {
local mycmakeargs=(



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

2023-12-25 Thread Andreas Sturmlechner
commit: 0613524c927b0e15a323dbf0c42e44a3cec7c502
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 25 19:19:34 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 25 19:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0613524c

kde-frameworks/kio: Fix dolphin crash while copying

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=448532

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kio-5.113.0-fix-crash-while-copying.patch  | 184 +
 kde-frameworks/kio/kio-5.113.0-r1.ebuild   |  96 +++
 2 files changed, 280 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch 
b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch
new file mode 100644
index ..845e6bc64339
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch
@@ -0,0 +1,184 @@
+From 6bea074739d5a75920d5540bc266549df5642511 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen 
+Date: Fri, 1 Dec 2023 11:27:26 +
+Subject: [PATCH] WidgetsAskUserActionHandler: Use QPointer to check the
+ validity of parent widgets
+
+If Dolphin is closed during the copying process,
+and the overwrite/skip dialog appears,
+this crashes the copying process since the
+parent shows to faulty location.
+
+Use QPointer to check that the parent widgets are still
+valid. If not, we just use nullptr, and the dialogs
+will still open.
+
+This also cleans some repetition in code.
+
+BUG:448532
+(cherry picked from commit bdef648edd54e146c30e881d8eb95990a59c5bbc)
+---
+ src/widgets/widgetsaskuseractionhandler.cpp | 90 +
+ 1 file changed, 39 insertions(+), 51 deletions(-)
+
+diff --git a/src/widgets/widgetsaskuseractionhandler.cpp 
b/src/widgets/widgetsaskuseractionhandler.cpp
+index fe2975d0ce..9cbaaec99f 100644
+--- a/src/widgets/widgetsaskuseractionhandler.cpp
 b/src/widgets/widgetsaskuseractionhandler.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+@@ -40,7 +41,10 @@
+ void 
savePersistentUserReply(KIO::AskUserActionInterface::MessageDialogType type, 
KConfigGroup , const QString , int result);
+ 
+ WidgetsAskUserActionHandler *const q;
+-QWidget *m_parentWidget = nullptr;
++QPointer m_parentWidget = nullptr;
++
++QWidget *getParentWidget(KJob *job);
++QWidget *getParentWidget(QWidget *widget);
+ };
+ 
+ bool 
KIO::WidgetsAskUserActionHandlerPrivate::gotPersistentUserReply(KIO::AskUserActionInterface::MessageDialogType
 type,
+@@ -106,6 +110,36 @@
+ }
+ }
+ 
++QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(KJob *job)
++{
++// This needs to be in qpointer, otherwise copying process
++// will crash if done in background and dolphin is closed
++QPointer parentWidget = nullptr;
++
++if (job) {
++parentWidget = KJobWidgets::window(job);
++}
++
++return getParentWidget(parentWidget);
++}
++
++QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(QWidget 
*widget)
++{
++// This needs to be in qpointer, otherwise copying process
++// will crash if done in background and dolphin is closed
++QPointer parentWidget = widget;
++
++if (!parentWidget) {
++parentWidget = this->m_parentWidget;
++}
++
++if (!parentWidget) {
++parentWidget = qApp->activeWindow();
++}
++
++return parentWidget;
++}
++
+ KIO::WidgetsAskUserActionHandler::WidgetsAskUserActionHandler(QObject *parent)
+ : KIO::AskUserActionInterface(parent)
+ , d(new WidgetsAskUserActionHandlerPrivate(this))
+@@ -128,22 +162,8 @@
+  const QDateTime 
,
+  const QDateTime 
)
+ {
+-QWidget *parentWidget = nullptr;
+-
+-if (job) {
+-parentWidget = KJobWidgets::window(job);
+-}
+-
+-if (!parentWidget) {
+-parentWidget = d->m_parentWidget;
+-}
+-
+-if (!parentWidget) {
+-parentWidget = qApp->activeWindow();
+-}
+-
+ QMetaObject::invokeMethod(qGuiApp, [=] {
+-auto *dlg = new KIO::RenameDialog(parentWidget, title, src, dest, 
options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest);
++auto *dlg = new KIO::RenameDialog(d->getParentWidget(job), title, 
src, dest, options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, 
mtimeDest);
+ 
+ dlg->setAttribute(Qt::WA_DeleteOnClose);
+ dlg->setWindowModality(Qt::WindowModal);
+@@ -161,22 +181,8 @@
+ 
+ void KIO::WidgetsAskUserActionHandler::askUserSkip(KJob *job, 
KIO::SkipDialog_Options options, const QString )
+ {
+-QWidget *parentWidget = nullptr;
+-
+-if (job) {
+-parentWidget = KJobWidgets::window(job);
+-}
+-
+-if (!parentWidget) {
+-parentWidget = d->m_parentWidget;
+-}
+-
+-if (!parentWidget) {
+-parentWidget = 

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

2023-09-19 Thread Andreas Sturmlechner
commit: 617f3cafac39cc608970df20d9b3281b918a094d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep 18 20:38:29 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 19 10:39:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617f3caf

kde-frameworks/kio: Backport crashfix per upstream request

See also:
https://mail.kde.org/pipermail/distributions/2023-September/001419.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=474451

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/files/kio-5.110.0-crash.patch | 28 +++
 kde-frameworks/kio/kio-5.110.0-r1.ebuild | 94 
 2 files changed, 122 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.110.0-crash.patch 
b/kde-frameworks/kio/files/kio-5.110.0-crash.patch
new file mode 100644
index ..dcda1cfe06f5
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.110.0-crash.patch
@@ -0,0 +1,28 @@
+From 48322f44323a1fc09305d66d9093fe6c3780709e Mon Sep 17 00:00:00 2001
+From: Kevin Ottens 
+Date: Fri, 15 Sep 2023 09:45:58 +0200
+Subject: [PATCH] Don't crash if KMountPoint gives nothing back while checking
+ for CIFS
+
+BUG: 474451
+---
+ src/ioslaves/file/file_unix.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 87c47e7e74..c0bc64354d 100644
+--- a/src/ioslaves/file/file_unix.cpp
 b/src/ioslaves/file/file_unix.cpp
+@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF )
+ static bool isOnCifsMount(const QString )
+ {
+ const auto mount = KMountPoint::currentMountPoints().findByPath(filePath);
++if (!mount) {
++return false;
++}
+ return mount->mountType() == QStringLiteral("cifs") || mount->mountType() 
== QStringLiteral("smb3");
+ }
+ 
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.110.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.110.0-r1.ebuild
new file mode 100644
index ..ccba848a7d91
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.110.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+   >=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
+   =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/kguiaddons-${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[X?]
+   =kde-frameworks/kxmlgui-${PVCUT}*:5
+   =kde-frameworks/solid-${PVCUT}*:5
+   sys-power/switcheroo-control
+   acl? (
+   sys-apps/attr
+   virtual/acl
+   )
+   handbook? (
+   dev-libs/libxml2
+   dev-libs/libxslt
+   =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 )
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=( "${FILESDIR}/${P}-crash.patch" ) # KDE-bug 474451
+
+src_configure() {
+   local mycmakeargs=(
+   -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+   $(cmake_use_find_package acl ACL)
+   $(cmake_use_find_package kerberos GSSAPI)
+   $(cmake_use_find_package kwallet KF5Wallet)
+   -DWITH_X11=$(usex X)
+   )
+
+   ecm_src_configure
+}
+
+pkg_postinst() {
+   ecm_pkg_postinst
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   ecm_pkg_postrm
+   

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

2023-04-22 Thread Andreas Sturmlechner
commit: 93472aaa24a3a7da93683fd33cf9770c7da102f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 22 16:12:55 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 22 16:20:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93472aaa

kde-frameworks/kio: drop 5.102.0-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  1 -
 ...o-5.102.0-add-missing-webdav-copyFromFile.patch | 36 -
 kde-frameworks/kio/kio-5.102.0-r1.ebuild   | 91 --
 3 files changed, 128 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 993d60cde021..0ba9b33851d9 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.102.0.tar.xz 3769416 BLAKE2B 
432acbd7844539e7c2617ea5743449b7da4377235485644ab9066919ee7c4746388deb116ee6664c52bcefa35c54bda3dfcc6f2f58a03a1638fe6173e5a99330
 SHA512 
29f46ace3a902a24c3a266413b291eac43bcfc5da76dfbc927f3d0e36c3902f0abf195b0cd97fd163a62b85a3d0bbb006dc73bc0fc43a88e47f72e7991536dc4
 DIST kio-5.104.0.tar.xz 3770264 BLAKE2B 
5633873828eafbfc1438d898c7eee7cc4234d0612b636d9b086ec273527900a0f9cc5fb3aeac327c2d0a96ec00192377e27f44bb300c6e7209876826b77a9b22
 SHA512 
483edb57a9de8be37248b4bdbd442d55814e126348d6db8316c9bcd59be76620d44145760e31ba685ce3ae606451547c3c386f8049b47df1b7f4ef2f45c276b8
 DIST kio-5.105.0.tar.xz 3770768 BLAKE2B 
1e5dfb96d2a172ec0e0b8b7c4b0f7feec3e1833bd4a98225931aabeb682139b3e366c4387dbcd0308d193dbc3a0a4d337671b5cc1d316c4a0b21051c0f004b0f
 SHA512 
ca16ad5aa58b0d9833cade530fa175f95c3e81baa304c1a14b888a16f070b175c770049437d4239351f9b05ad991456d4c7506271a9ceb41befa5e55fef5f227

diff --git 
a/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch 
b/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch
deleted file mode 100644
index afdca9c1ec5d..
--- a/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fe76c7e7224bde6a93e327de097c8a1e14c7d323 Mon Sep 17 00:00:00 2001
-From: Alberto Mattea 
-Date: Thu, 26 Jan 2023 13:19:27 +0100
-Subject: [PATCH] Add missing copyFromFile entries to http.json for webdav and
- webdavs
-
-copyFromFile support was already implemented but not enabled due to the 
missing entries.
-
-BUG: 464450

- src/kioworkers/http/http.json | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/kioworkers/http/http.json b/src/kioworkers/http/http.json
-index 42e963c8d..f6c2d55a8 100644
 a/src/kioworkers/http/http.json
-+++ b/src/kioworkers/http/http.json
-@@ -35,6 +35,7 @@
- "Class": ":internet", 
- "Icon": "folder-remote", 
- "X-DocPath": "kioslave5/webdav/index.html", 
-+"copyFromFile": true, 
- "defaultMimetype": "application/octet-stream", 
- "deleteRecursive": true, 
- "deleting": true, 
-@@ -62,6 +63,7 @@
- "Icon": "folder-remote", 
- "X-DocPath": "kioslave5/webdav/index.html", 
- "config": "webdav", 
-+"copyFromFile": true, 
- "defaultMimetype": "application/octet-stream", 
- "deleteRecursive": true, 
- "deleting": true, 
--- 
-GitLab
-

diff --git a/kde-frameworks/kio/kio-5.102.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.102.0-r1.ebuild
deleted file mode 100644
index 46408a743238..
--- a/kde-frameworks/kio/kio-5.102.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-   dev-libs/libxml2
-   dev-libs/libxslt
-   >=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
-   =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/kguiaddons-${PVCUT}*:5
-   =kde-frameworks/ki18n-${PVCUT}*:5
-   =kde-frameworks/kiconthemes-${PVCUT}*:5
-   

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

2023-02-18 Thread Andreas Sturmlechner
commit: b53c6dcd8b592a2871a234a650ceab20f6c199c0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb 14 19:20:56 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 22:40:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53c6dcd

kde-frameworks/kio: drop 5.99.0-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  1 -
 .../kio/files/kio-5.99.0-fix-webdav-fileloss.patch | 26 ---
 kde-frameworks/kio/kio-5.99.0-r1.ebuild| 91 --
 3 files changed, 118 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 4572de6774c2..9ec7f9bf58bd 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
 DIST kio-5.102.0.tar.xz 3769416 BLAKE2B 
432acbd7844539e7c2617ea5743449b7da4377235485644ab9066919ee7c4746388deb116ee6664c52bcefa35c54bda3dfcc6f2f58a03a1638fe6173e5a99330
 SHA512 
29f46ace3a902a24c3a266413b291eac43bcfc5da76dfbc927f3d0e36c3902f0abf195b0cd97fd163a62b85a3d0bbb006dc73bc0fc43a88e47f72e7991536dc4
 DIST kio-5.103.0.tar.xz 3769424 BLAKE2B 
9f2d2ab6827d63e628d03d8d81e3dbfd31973bd0cf92e34f63cc345859934e9cb5b2a8e90b56c7dc1cd588a5a0d30435132b2aee8e14c47ffc29ca99485904da
 SHA512 
9a5ffc9cf7bd5b07e449ac5b3e352c389b9f184e49702506bf44fa1c94d8905693cdd237f31735242ae7e8e605d9ee4ceeaa633ba6432d6952cf6a07e6ab17ac
-DIST kio-5.99.0.tar.xz 3407180 BLAKE2B 
2014bb1e2ae020dbe47dd0964e003814fabde5cf14cbb74b05f5703ffc5fea2e6f22f26ae2a9cfc3806043d4618115ed14b9b60ab38bf9d5acb7ca8b2d5c2e06
 SHA512 
b18e6c79913b8da0f800bbf58433069531a6c79d711876c46785d88c79f6a45503d69dcd0fee958f727c7dd394f398c951b660e47f77e8372f3be75367ad9014

diff --git a/kde-frameworks/kio/files/kio-5.99.0-fix-webdav-fileloss.patch 
b/kde-frameworks/kio/files/kio-5.99.0-fix-webdav-fileloss.patch
deleted file mode 100644
index 68190d3d4c17..
--- a/kde-frameworks/kio/files/kio-5.99.0-fix-webdav-fileloss.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 501091059ae9fc2877d621cdbc0fb3c5ece56dae Mon Sep 17 00:00:00 2001
-From: Harald Sitter 
-Date: Thu, 20 Oct 2022 12:47:59 +0200
-Subject: [PATCH] fix dav overwrite
-
-somehow the function call got lost

- 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 ec3c8809f..c54e568d2 100644
 a/src/ioslaves/http/http.cpp
-+++ b/src/ioslaves/http/http.cpp
-@@ -5522,7 +5522,7 @@ bool HTTPProtocol::davDestinationExists()
- m_request.cacheTag.policy = CC_Reload;
- m_request.davData.depth = 0;
- 
--(void)/* handling result via response codes */ (true);
-+(void)/* handling result via response codes 
*/proceedUntilResponseContent(true);
- 
- if (!m_request.isKeepAlive) {
- httpCloseConnection(); // close connection if server requested it.
--- 
-GitLab
-

diff --git a/kde-frameworks/kio/kio-5.99.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.99.0-r1.ebuild
deleted file mode 100644
index e9b2ae663a1b..
--- a/kde-frameworks/kio/kio-5.99.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-   dev-libs/libxml2
-   dev-libs/libxslt
-   >=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
-   =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/kguiaddons-${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[X?]
-   =kde-frameworks/kxmlgui-${PVCUT}*:5
-   

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

2023-01-30 Thread Andreas Sturmlechner
commit: 1b729167bf6d97b0e94b1e7bb72da45f5c1dd6bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 30 21:33:49 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 30 21:35:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b729167

kde-frameworks/kio: Add missing copyFromFile entries for webdav(s)

Backport upstream commit fe76c7e7224bde6a93e327de097c8a1e14c7d323

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=464450

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...o-5.102.0-add-missing-webdav-copyFromFile.patch | 36 +
 kde-frameworks/kio/kio-5.102.0-r1.ebuild   | 91 ++
 2 files changed, 127 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch 
b/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch
new file mode 100644
index ..afdca9c1ec5d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.102.0-add-missing-webdav-copyFromFile.patch
@@ -0,0 +1,36 @@
+From fe76c7e7224bde6a93e327de097c8a1e14c7d323 Mon Sep 17 00:00:00 2001
+From: Alberto Mattea 
+Date: Thu, 26 Jan 2023 13:19:27 +0100
+Subject: [PATCH] Add missing copyFromFile entries to http.json for webdav and
+ webdavs
+
+copyFromFile support was already implemented but not enabled due to the 
missing entries.
+
+BUG: 464450
+---
+ src/kioworkers/http/http.json | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kioworkers/http/http.json b/src/kioworkers/http/http.json
+index 42e963c8d..f6c2d55a8 100644
+--- a/src/kioworkers/http/http.json
 b/src/kioworkers/http/http.json
+@@ -35,6 +35,7 @@
+ "Class": ":internet", 
+ "Icon": "folder-remote", 
+ "X-DocPath": "kioslave5/webdav/index.html", 
++"copyFromFile": true, 
+ "defaultMimetype": "application/octet-stream", 
+ "deleteRecursive": true, 
+ "deleting": true, 
+@@ -62,6 +63,7 @@
+ "Icon": "folder-remote", 
+ "X-DocPath": "kioslave5/webdav/index.html", 
+ "config": "webdav", 
++"copyFromFile": true, 
+ "defaultMimetype": "application/octet-stream", 
+ "deleteRecursive": true, 
+ "deleting": true, 
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.102.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.102.0-r1.ebuild
new file mode 100644
index ..0a3b651f341e
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.102.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=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
+   =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/kguiaddons-${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[X?]
+   =kde-frameworks/kxmlgui-${PVCUT}*:5
+   =kde-frameworks/solid-${PVCUT}*:5
+   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 )
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=( "${FILESDIR}/${P}-add-missing-webdav-copyFromFile.patch" ) # KDE-bug 
464450
+
+src_configure() {
+   local mycmakeargs=(
+   -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ 

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

2022-06-29 Thread Andreas Sturmlechner
commit: 90dcb49e4a26fea8ce4698b7f5a20bc1469157d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 29 19:34:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 29 19:53:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90dcb49e

kde-frameworks/kio: filewidgets: update location text after selected

...files are renamed.

Upstream commit 6d47b5869d4b328614e5e95e97ef66d97009295e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=455327

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...-filewidgets-update-filename-after-rename.patch | 76 +
 kde-frameworks/kio/kio-5.95.0-r1.ebuild| 96 ++
 2 files changed, 172 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch
 
b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch
new file mode 100644
index ..5cf7b9f2fb45
--- /dev/null
+++ 
b/kde-frameworks/kio/files/kio-5.95.0-filewidgets-update-filename-after-rename.patch
@@ -0,0 +1,76 @@
+From 6d47b5869d4b328614e5e95e97ef66d97009295e Mon Sep 17 00:00:00 2001
+From: Fushan Wen 
+Date: Wed, 15 Jun 2022 22:03:27 +0800
+Subject: [PATCH] filewidgets: update location text after selected files are
+ renamed
+
+Before this commit, the location text is not updated after the selected
+files are renamed.
+
+BUG: 455327
+---
+ src/filewidgets/kdiroperator.cpp | 3 ++-
+ src/filewidgets/kdiroperator.h   | 9 +
+ src/filewidgets/kfilewidget.cpp  | 4 
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/filewidgets/kdiroperator.cpp 
b/src/filewidgets/kdiroperator.cpp
+index c7a1c9350..adacfda60 100644
+--- a/src/filewidgets/kdiroperator.cpp
 b/src/filewidgets/kdiroperator.cpp
+@@ -889,8 +889,9 @@ void KDirOperator::renameSelected()
+ }
+ 
+ KIO::RenameFileDialog *dialog = new KIO::RenameFileDialog(items, this);
+-connect(dialog, ::RenameFileDialog::renamingFinished, this, [this]() {
++connect(dialog, ::RenameFileDialog::renamingFinished, this, 
[this](const QList ) {
+ d->assureVisibleSelection();
++Q_EMIT renamingFinished(urls);
+ });
+ 
+ dialog->open();
+diff --git a/src/filewidgets/kdiroperator.h b/src/filewidgets/kdiroperator.h
+index cb9668fb7..a15e90765 100644
+--- a/src/filewidgets/kdiroperator.h
 b/src/filewidgets/kdiroperator.h
+@@ -824,6 +824,7 @@ public Q_SLOTS:
+ /**
+  * Initiates a rename operation on the currently selected 
files/directories,
+  * prompting the user to choose a new name(s) for the currently selected 
items
++ * @see renamingFinished
+  * @since 5.67
+  */
+ void renameSelected();
+@@ -991,6 +992,14 @@ Q_SIGNALS:
+  */
+ void keyEnterReturnPressed();
+ 
++/**
++ * Emitted when renaming selected files has finished.
++ *
++ * @param urls URL list of the renamed files
++ * @since 5.96
++ */
++void renamingFinished(const QList );
++
+ private:
+ friend class KDirOperatorPrivate;
+ std::unique_ptr d;
+diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp
+index 943c0cd93..d0825dfaa 100644
+--- a/src/filewidgets/kfilewidget.cpp
 b/src/filewidgets/kfilewidget.cpp
+@@ -1185,6 +1185,10 @@ void KFileWidgetPrivate::initDirOpWidgets()
+ q->connect(m_ops, ::keyEnterReturnPressed, q, [this]() {
+ slotViewKeyEnterReturnPressed();
+ });
++q->connect(m_ops, ::renamingFinished, q, [this](const 
QList ) {
++// Update file names in location text field after renaming selected 
files
++q->setSelectedUrls(urls);
++});
+ 
+ m_ops->dirLister()->setAutoErrorHandlingEnabled(false);
+ q->connect(m_ops->dirLister(), ::jobError, q, [this](KIO::Job 
*job) {
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.95.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
new file mode 100644
index ..8b7697b65a88
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=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
+   =kde-frameworks/kauth-${PVCUT}*:5
+   

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

2022-02-10 Thread Andreas Sturmlechner
commit: e369c2c53ce31624c7d741664e33d4557baf5d12
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 10 08:20:45 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 10 09:10:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e369c2c5

kde-frameworks/kio: drop 5.88.0*

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  1 -
 .../kio-5.88.0-fix-KRun-open-URLs-twice.patch  | 87 ---
 .../kio-5.88.0-fix-copy-between-filesystems.patch  | 28 --
 kde-frameworks/kio/kio-5.88.0-r2.ebuild| 99 --
 4 files changed, 215 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 6595f5bde265..a34f2e8dd917 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1 @@
-DIST kio-5.88.0.tar.xz 3247924 BLAKE2B 
3687e97b3c936c93e7ee87f314340f8e9889e2afae584d360eb44414994406a34678ea304fff081a65beb03fa98ec1f22870f3a3f86e124352bc96f51c142c1f
 SHA512 
3d79bc90c2f6aa54080824c15da282f54d18530362ffd144f36754f1751f58c0c48c9fd12ffece49f0b455c524b8585ba6c2baa684b0992471b7ec0636350c19
 DIST kio-5.90.0.tar.xz 3264964 BLAKE2B 
d6925472295eacce1f08458f5d184edec7828475d8561d574180a043421c453f46daeb10b76636b9246aaa630a0f50f71f5379c36520b607bd23f75be237c002
 SHA512 
944d12155beb424e9359ae93dea8db2847658eafbde595c54dc193bcddaca61000be9f2141ee31c535b126eeef5a4d8ae09b079896b5a807c3d72fbea98d66b3

diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch 
b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
deleted file mode 100644
index 0d3bf2aeca3a..
--- a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 25f3a6937a80f2748790265b9b688d64126e43d0 Mon Sep 17 00:00:00 2001
-From: Aleix Pol 
-Date: Tue, 30 Nov 2021 17:33:18 +0100
-Subject: [PATCH] Fix KRun::runApplication when xdg activation is involved
-
-Has waitForStarted account for xdg activation token request.
-
-BUG: 446272

- src/gui/kprocessrunner.cpp | 13 ++---
- src/gui/kprocessrunner_p.h |  1 +
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index 130dade75..82c959afe 100644
 a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- #ifdef Q_OS_WIN
-@@ -259,7 +260,6 @@ void KProcessRunner::init(const KService::Ptr ,
- Q_UNUSED(iconName);
- #endif
- 
--bool waitingForXdgToken = false;
- if (KWindowSystem::isPlatformWayland()) {
- if (!asn.isEmpty()) {
- m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), 
QString::fromUtf8(asn));
-@@ -274,7 +274,7 @@ void KProcessRunner::init(const KService::Ptr ,
- }
- if (window) {
- const int launchedSerial = 
KWindowSystem::lastInputSerial(window);
--waitingForXdgToken = true;
-+m_waitingForXdgToken = true;
- connect(this, ::xdgActivationTokenArrived, 
m_process.get(), [this] {
- startProcess();
- });
-@@ -285,6 +285,7 @@ void KProcessRunner::init(const KService::Ptr ,
- if (tokenSerial == launchedSerial) {
- 
m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), token);
- Q_EMIT xdgActivationTokenArrived();
-+m_waitingForXdgToken = false;
- }
- });
- KWindowSystem::requestXdgActivationToken(window, 
launchedSerial, QFileInfo(m_serviceEntryPath).completeBaseName());
-@@ -316,7 +317,7 @@ void KProcessRunner::init(const KService::Ptr ,
- m_description = userVisibleName;
- }
- 
--if (!waitingForXdgToken) {
-+if (!m_waitingForXdgToken) {
- startProcess();
- }
- }
-@@ -331,6 +332,12 @@ void ForkingProcessRunner::startProcess()
- 
- bool ForkingProcessRunner::waitForStarted(int timeout)
- {
-+if (m_process->state() == QProcess::NotRunning && m_waitingForXdgToken) {
-+QEventLoop loop;
-+QObject::connect(m_process.get(), ::stateChanged, , 
::quit);
-+QTimer::singleShot(timeout, , ::quit);
-+loop.exec();
-+}
- return m_process->waitForStarted(timeout);
- }
- 
-diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
-index 1f94df7a2..df6f08f64 100644
 a/src/gui/kprocessrunner_p.h
-+++ b/src/gui/kprocessrunner_p.h
-@@ -140,6 +140,7 @@ protected:
- qint64 m_pid = 0;
- KService::Ptr m_service;
- QString m_serviceEntryPath;
-+bool m_waitingForXdgToken = false;
- 
- private:
- void emitDelayedError(const QString );
--- 
-GitLab

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

2021-11-05 Thread Andreas Sturmlechner
commit: ec28b59c42e6c7a7de5c17c4ac2cfe9763192524
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  5 16:22:55 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  5 16:24:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec28b59c

kde-frameworks/kio: KMountPoint: Revert to pre-libblkid parsing

Upstream commit 221a94a66c4d2f6e4f2dc938ee8a63a6ca739477

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=442106
Thanks-to: Norman Back  thebacks.co.uk>
Bug: https://bugs.gentoo.org/821103
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...kio-5.85.0-revert-to-pre-libblkid-parsing.patch | 128 +
 kde-frameworks/kio/kio-5.85.0-r2.ebuild| 100 
 kde-frameworks/kio/kio-5.87.0-r1.ebuild|  98 
 3 files changed, 326 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch 
b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
new file mode 100644
index 000..1f4c7cf0615
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
@@ -0,0 +1,128 @@
+From 221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Wed, 20 Oct 2021 20:01:40 +0200
+Subject: [PATCH] KMountPoint: revert to parsing /dev/disk/by-{uuid,label}/
+ manually
+
+Apparently libblkid is causing some performance issues when resolving
+UUID/LABEL tags from fstab when the device that has that UUID/LABEL isn't
+present.
+
+Parsing /dev/disk/by-* is more basic, since it's a simple check resolving
+some symlinks.
+
+Thanks to the users in the bug report for the investigative work, because
+personally I couldn't reproduce the problem on my machine no matter what I
+tried.
+
+BUG: 442106
+FIXED-IN: 5.88
+---
+ CMakeLists.txt  |  3 +--
+ src/core/CMakeLists.txt |  5 ++---
+ src/core/config-kmountpoint.h.cmake |  2 +-
+ src/core/kmountpoint.cpp| 18 --
+ 4 files changed, 8 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca374a4cb..f1bb1a59b 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL"
+ # Used by KMountPoint
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ find_package(LibMount REQUIRED)
+-find_package(Blkid REQUIRED)
+-set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND})
++set(HAVE_LIB_MOUNT ${LibMount_FOUND})
+ endif()
+ 
+ if (ANDROID)
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index be19e9b62..67a1b1cf7 100644
+--- a/src/core/CMakeLists.txt
 b/src/core/CMakeLists.txt
+@@ -236,9 +236,8 @@ if(ACL_FOUND)
+   target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
+ endif()
+ 
+-if(HAVE_LIBS_MOUNT_AND_BLKID)
+-  # libmount links against blkid anyway
+-  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid)
++if(HAVE_LIB_MOUNT)
++  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount)
+ endif()
+ 
+ # this should be done by cmake, see bug 371721
+diff --git a/src/core/config-kmountpoint.h.cmake 
b/src/core/config-kmountpoint.h.cmake
+index f824d4042..3673eb141 100644
+--- a/src/core/config-kmountpoint.h.cmake
 b/src/core/config-kmountpoint.h.cmake
+@@ -1,7 +1,7 @@
+ #cmakedefine01 HAVE_GETMNTINFO
+ #cmakedefine01 GETMNTINFO_USES_STATVFS
+ 
+-#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID
++#cmakedefine01 HAVE_LIB_MOUNT
+ 
+ #cmakedefine01 HAVE_SYS_MOUNT_H
+ #cmakedefine01 HAVE_FSTAB_H
+diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
+index e2d32055c..f41cff5ee 100644
+--- a/src/core/kmountpoint.cpp
 b/src/core/kmountpoint.cpp
+@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive;
+ #endif
+ 
+ // Linux
+-#if HAVE_LIBS_MOUNT_AND_BLKID
++#if HAVE_LIB_MOUNT
+ #include 
+ #include 
+ #endif
+@@ -176,7 +176,7 @@ KMountPoint::List 
KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
+ #ifdef Q_OS_WIN
+ result = KMountPoint::currentMountPoints(infoNeeded);
+ 
+-#elif HAVE_LIBS_MOUNT_AND_BLKID
++#elif HAVE_LIB_MOUNT
+ if (struct libmnt_table *table = mnt_new_table()) {
+ // By default parses "/etc/fstab"
+ if (mnt_table_parse_fstab(table, nullptr) == 0) {
+@@ -202,23 +202,13 @@ KMountPoint::List 
KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
+ // or some network mount
+ if (const char *source = mnt_fs_get_source(fs)) {
+ mp->d->m_mountedFrom = QFile::decodeName(source);
+-if 
(mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || 
mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) {
+-// Use blkid to resolve UUID/LABEL to the device file
+-if (char *blkSource = 

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

2021-09-14 Thread Andreas Sturmlechner
commit: b7c85ff59071636cb109f0b7229ab9a3f279b8a2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 14 08:06:57 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 14 09:03:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c85ff5

kde-frameworks/kio: drop 5.82.0*

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|   1 -
 .../kio-5.81.0-fix-qtconcurrent-private-link.patch |  46 -
 .../kio-5.82.0-MimeTypeFinderJob-memleak-1.patch   |  69 -
 .../kio-5.82.0-MimeTypeFinderJob-memleak-2.patch   |  61 ---
 .../kio-5.82.0-MimeTypeFinderJob-memleak-3.patch   |  52 --
 .../kio-5.82.0-MimeTypeFinderJob-memleak-4.patch   |  62 
 .../kio-5.82.0-fix-filenamesearch-crashes.patch|  28 --
 .../kio/files/kio-5.82.0-no-cache-kcm.patch|  79 ---
 .../kio/files/kio-5.82.0-no-useragent-kcm.patch| 105 ---
 kde-frameworks/kio/kio-5.82.0-r2.ebuild| 111 -
 10 files changed, 614 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c4bfe59fdca..2e46d8cebbd 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.82.0.tar.xz 3330028 BLAKE2B 
be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0
 SHA512 
a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B 
fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde
 SHA512 
73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
 DIST kio-5.86.0.tar.xz 3251976 BLAKE2B 
5257ad0be8023ec661262fcd96f3f5860357fda73d1a039fbb30e549f4bb0bcab62217ccea70c22ecea63622ecbccfbeae27afe3692470be738f813e466a9142
 SHA512 
64a4ae7b0fff6e4e2c5ee3a25ec6db472c198fbcce5d8a929da2d42f6a881e404151a1935532c53359b645acac2a46ffa129616acb26b871dc7993b91a31fd8e

diff --git 
a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch 
b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
deleted file mode 100644
index 42637cd6e1e..000
--- a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 23 Apr 2021 20:10:31 +0200
-Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from
- KF5KIOConfig.cmake.in
-
-This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can
-see it is only a KIO build time dependency with no Qt5Concurrent header being
-used in KIO headers.
-
-Signed-off-by: Andreas Sturmlechner 

- KF5KIOConfig.cmake.in   | 1 -
- src/core/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
-index 687ec512..749e9b9b 100644
 a/KF5KIOConfig.cmake.in
-+++ b/KF5KIOConfig.cmake.in
-@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
- endif()
- 
- find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
--find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
- find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 76c3061c..fe4be56b 100644
 a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -188,9 +188,9 @@ PUBLIC
-  KF5::CoreAddons   # KJob
-  KF5::Service # TODO KF6 move to PRIVATE
-  Qt5::Network
-- Qt5::Concurrent# QtConcurrentRun in hostinfo.cpp
-  Qt5::DBus
- PRIVATE
-+ Qt5::Concurrent# QtConcurrentRun in hostinfo.cpp
-  Qt5::Xml   # davjob.cpp uses QDom
-  KF5::ConfigCore
-  KF5::I18n
--- 
-2.31.1
-

diff --git 
a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch 
b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
deleted file mode 100644
index 08d72d754d7..000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e79da836c34fce66231e396c7215314d0eba51b4 Mon Sep 17 00:00:00 2001
-From: Jonathan Marten 
-Date: Sat, 8 May 2021 15:20:39 +
-Subject: [PATCH] MimeTypeFinderJob: Resolve symlinks for a local file
-

- autotests/mimetypefinderjobtest.cpp | 18 +-
- src/core/mimetypefinderjob.cpp  |  2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/autotests/mimetypefinderjobtest.cpp 
b/autotests/mimetypefinderjobtest.cpp
-index 72296b9b8..f494ff3b6 100644
 a/autotests/mimetypefinderjobtest.cpp
-+++ 

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

2021-08-15 Thread Andreas Sturmlechner
commit: 30d6ef4fc1cd0fbb61f4cea6f7be0424956a0dad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 15 18:38:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 15 18:56:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d6ef4f

kde-frameworks/kio: Allow editing icons for root-owned desktop files

Upstream commit 2187b62588b060bc27143dd326b5171aec930454

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=429613
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...w-edit-icons-for-root-owned-desktop-files.patch | 32 ++
 kde-frameworks/kio/kio-5.85.0-r1.ebuild|  1 +
 2 files changed, 33 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
 
b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
new file mode 100644
index 000..34a70a827e0
--- /dev/null
+++ 
b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
@@ -0,0 +1,32 @@
+From 2187b62588b060bc27143dd326b5171aec930454 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella 
+Date: Sat, 7 Aug 2021 19:38:43 +
+Subject: [PATCH] [kpropertiesdialog] Allow editing icons for root-owned
+ desktop files
+
+---
+ src/widgets/kpropertiesdialog.cpp | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp 
b/src/widgets/kpropertiesdialog.cpp
+index 76155338e..2288ccc08 100644
+--- a/src/widgets/kpropertiesdialog.cpp
 b/src/widgets/kpropertiesdialog.cpp
+@@ -1206,6 +1206,14 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog 
*_props)
+ bool KFilePropsPlugin::enableIconButton() const
+ {
+ const KFileItem item = properties->item();
++
++// desktop files are special, files in /usr/share/applications can be
++// edited by overlaying them in .local/share/applications
++// https://bugs.kde.org/show_bug.cgi?id=429613
++if (item.isDesktopFile()) {
++return true;
++}
++
+ // If the current item is a directory, check if it's writable,
+ // so we can create/update a .directory
+ // Current item is a file, same thing: check if it is writable
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
index 9522606997f..ed1bd212da3 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
@@ -73,6 +73,7 @@ PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
 PATCHES=(

"${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # 
KDE-bug 440475
+   "${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch 
# KDE-bug 429613
 )
 
 src_configure() {



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

2021-07-11 Thread Andreas Sturmlechner
commit: f6aafb2c8814829263d26757bd420d5fbfe9bac6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 10 16:45:26 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 11 20:46:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6aafb2c

kde-frameworks/kio: 5.84.0 version bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  1 +
 .../kio-5.84.0-fix-qtconcurrent-private-link.patch | 76 +
 kde-frameworks/kio/kio-5.84.0.ebuild   | 99 ++
 3 files changed, 176 insertions(+)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 0cc32fbcb63..4e880781978 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,3 @@
 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B 
be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0
 SHA512 
a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 DIST kio-5.83.0.tar.xz 3187064 BLAKE2B 
2a11566cae3bbe48d57ffc188d6ccd9b98796139fc34c6e68535e7c126e376874364f9d338ebc92f5996e9c32318ba69a2c8743b87183f775ec4c1309813c862
 SHA512 
0b2b9effdf8ceef148176852428256dcdfb49dcb256478f2400130b2bcf091a2a2e4f54a5baeb38c7c74b83d7560fc4e699fd3d8c476c530ae6828e0eef0bfb0
+DIST kio-5.84.0.tar.xz 3191612 BLAKE2B 
1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d
 SHA512 
4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9

diff --git 
a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch 
b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
new file mode 100644
index 000..033b75bb00b
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
@@ -0,0 +1,76 @@
+From fb9bbb6f1fbb4e6232221a851f55ca2dc43b012c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 23 Apr 2021 20:10:31 +0200
+Subject: [PATCH] Introduce KIO_NO_PUBLIC_QTCONCURRENT option
+
+If set, move Qt5Concurrent to private link interface, drop from
+KF5KIOConfig.cmake.in. Originally added in 2f83dde2, but only used
+in the implementation, not the API.
+
+Test-built various revdeps successfully against the patched KIO
+with/without Qt5Concurrent installed, fixing implicit deps while
+at it. KDE Gear packages fixed in >=21.04.2, Plasma in >=5.21.5.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt  | 3 +++
+ KF5KIOConfig.cmake.in   | 2 ++
+ src/core/CMakeLists.txt | 7 ++-
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0063c2c..63aef43c 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -49,6 +49,9 @@ option(KIO_ASSERT_SLAVE_STATES
+ "Used to control whether slave state assertions are enabled. When not 
enabled only warnings are generated."
+ ${ASSERT_SLAVE_STATES_DEFAULT})
+ 
++# TODO KF6: remove
++option(KIO_NO_PUBLIC_QTCONCURRENT "Privatize QtConcurrent linking, so KIO 
does not provide the target to revdeps.")
++
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt 
Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. 
Qt Assistant, Qt Creator & KDevelop)")
+ 
+diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
+index 687ec512..69564b3d 100644
+--- a/KF5KIOConfig.cmake.in
 b/KF5KIOConfig.cmake.in
+@@ -21,7 +21,9 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
+ endif()
+ 
+ find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
++if (NOT @KIO_NO_PUBLIC_QTCONCURRENT@)
+ find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
++endif()
+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index c09d408a..f6efee23 100644
+--- a/src/core/CMakeLists.txt
 b/src/core/CMakeLists.txt
+@@ -201,7 +201,6 @@ PUBLIC
+  KF5::CoreAddons   # KJob
+  KF5::Service # TODO KF6 move to PRIVATE
+  Qt5::Network
+- Qt5::Concurrent# QtConcurrentRun in hostinfo.cpp # TODO KF6 move 
to PRIVATE
+  Qt5::DBus
+ PRIVATE
+  Qt5::Xml   # davjob.cpp uses QDom
+@@ -211,6 +210,12 @@ PRIVATE
+  KF5::DBusAddons# KDEInitInterface
+ )
+ 
++if(KIO_NO_PUBLIC_QTCONCURRENT)
++  target_link_libraries(KF5KIOCore PRIVATE Qt5::Concurrent) # QtConcurrentRun 
in hostinfo.cpp
++else()
++  target_link_libraries(KF5KIOCore PUBLIC Qt5::Concurrent) # TODO KF6: remove
++endif()
++
+ if (UNIX)
+   target_link_libraries(KF5KIOCore PRIVATE KF5::AuthCore)   #SlaveBase uses 
KAuth::Action
+ endif()
+-- 
+2.32.0
+

diff --git 

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

2021-04-04 Thread Andreas Sturmlechner
commit: 0b516e21dc8b9f6bf5422dca5df4bc9077b0412a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  4 11:50:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  4 13:19:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b516e21

kde-frameworks/kio: Fix create files on ftp shares

Upstream commit 71c7420e4b33b4bace8ed6d4fa45fa5e281d38bd

See also: https://invent.kde.org/frameworks/kio/-/merge_requests/380
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=429541
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kio-5.80.1-fix-create-files-on-ftp.patch |  26 ++
 kde-frameworks/kio/kio-5.80.1-r2.ebuild| 100 +
 2 files changed, 126 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch 
b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
new file mode 100644
index 000..cece0096529
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch
@@ -0,0 +1,26 @@
+From 71c7420e4b33b4bace8ed6d4fa45fa5e281d38bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= 
+Date: Sat, 27 Mar 2021 11:00:07 +0100
+Subject: [PATCH] KNewFileMenu: use destination side to stat destination
+
+BUG: 429541
+---
+ src/filewidgets/knewfilemenu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/filewidgets/knewfilemenu.cpp 
b/src/filewidgets/knewfilemenu.cpp
+index 64c4b1c2e..48fdf8622 100644
+--- a/src/filewidgets/knewfilemenu.cpp
 b/src/filewidgets/knewfilemenu.cpp
+@@ -1242,7 +1242,7 @@ void KNewFileMenuPrivate::_k_slotTextChanged(const 
QString )
+ } else {
+ url = QUrl(m_baseUrl.toString() + QLatin1Char('/') + text);
+ }
+-KIO::StatJob *job = KIO::statDetails(url, 
KIO::StatJob::StatSide::SourceSide, KIO::StatDetail::StatBasic);
++KIO::StatJob *job = KIO::statDetails(url, 
KIO::StatJob::StatSide::DestinationSide, KIO::StatDetail::StatBasic);
+ QObject::connect(job, ::result, q, [this](KJob *job) {
+ _k_slotStatResult(job);
+ });
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.80.1-r2.ebuild 
b/kde-frameworks/kio/kio-5.80.1-r2.ebuild
new file mode 100644
index 000..59bdb0d13ea
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.80.1-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 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.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=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
+   =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
+   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
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-MimeTypeFinderJob-file.so.patch # KDE-Bug 434455
+   "${FILESDIR}"/${P}-gcc11-include-order.patch # bug 766480
+   "${FILESDIR}"/${P}-fix-create-files-on-ftp.patch # KDE-Bug 429541
+)
+

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

2021-02-03 Thread Andreas Sturmlechner
commit: ffb79726a4d361406005a2417a519ffb4c7e7030
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  3 21:10:44 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  3 22:33:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb79726

kde-frameworks/kio: CopyJob: fix crash with skip/retry

Upstream commit a183dd0d1ee0659e5341c7cb4117df27edd6f125

See also: https://mail.kde.org/pipermail/distributions/2021-February/000938.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431731
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kio/files/kio-5.78.0-copyjob-crash.patch   | 32 +++
 kde-frameworks/kio/kio-5.78.0-r1.ebuild| 99 ++
 2 files changed, 131 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch 
b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch
new file mode 100644
index 000..a4b87821e20
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch
@@ -0,0 +1,32 @@
+From a183dd0d1ee0659e5341c7cb4117df27edd6f125 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Tue, 2 Feb 2021 11:31:40 +0200
+Subject: [PATCH] CopyJob: fix crash with skip/retry
+
+The crash was happening because I was disconnecting the wrong signal in
+the lambda connected to KIO::AskUserActionInterface::askUserSkipResult...
+
+BUG: 431731
+FIXED-IN: 5.79
+---
+ src/core/copyjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
+index cee40a62..cb16010f 100644
+--- a/src/core/copyjob.cpp
 b/src/core/copyjob.cpp
+@@ -1578,8 +1578,8 @@ void CopyJobPrivate::slotResultErrorCopyingFiles(KJob 
*job)
+ QObject::connect(askUserActionInterface, 
::AskUserActionInterface::askUserSkipResult,
+  q, [=](SkipDialog_Result result, KJob 
*parentJob) {
+ Q_ASSERT(parentJob == q);
+-// Only receive askUserRenameResult once per rename dialog
+-QObject::disconnect(askUserActionInterface, 
::AskUserActionInterface::askUserRenameResult,
++// Only receive askUserSkipResult once per skip dialog
++QObject::disconnect(askUserActionInterface, 
::AskUserActionInterface::askUserSkipResult,
+ q, nullptr);
+ processFileRenameDialogResult(it, result, QUrl() /* no new 
url in skip */, QDateTime{});
+ });
+-- 
+GitLab
+

diff --git a/kde-frameworks/kio/kio-5.78.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.78.0-r1.ebuild
new file mode 100644
index 000..d84b138ad1a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.78.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 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.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=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
+   =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
+   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
+   

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

2020-10-15 Thread Andreas Sturmlechner
commit: 832c3dcb83419e97aa34f7cd2b48f0d23e785b15
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct 15 18:44:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 15 18:48:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832c3dcb

kde-frameworks/kio: Fix regression on selecting files with `#`

See also: https://mail.kde.org/pipermail/distributions/2020-October/000873.html

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...io-5.75.0-fix-special-char-file-selection.patch | 201 +
 kde-frameworks/kio/kio-5.75.0-r1.ebuild|  96 ++
 2 files changed, 297 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.75.0-fix-special-char-file-selection.patch 
b/kde-frameworks/kio/files/kio-5.75.0-fix-special-char-file-selection.patch
new file mode 100644
index 000..74ffc55207d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.75.0-fix-special-char-file-selection.patch
@@ -0,0 +1,201 @@
+From 4321b8ff8ac7a8ffdea1068d8bbc734a0a34c0d0 Mon Sep 17 00:00:00 2001
+From: Andreas Bontozoglou 
+Date: Wed, 14 Oct 2020 15:01:02 +0100
+Subject: [PATCH] [BUG] Fixing regression on selecting files that contain `#`
+
+Introduced in tokenize() in 
https://invent.kde.org/frameworks/kio/-/merge_requests/89.
+Fixing by using setPath and adding test-case for parsing such filenames.
+---
+ autotests/kfilewidgettest.cpp   | 37 +++--
+ src/filewidgets/kfilewidget.cpp | 31 +++
+ 2 files changed, 39 insertions(+), 29 deletions(-)
+
+diff --git a/autotests/kfilewidgettest.cpp b/autotests/kfilewidgettest.cpp
+index 859ea958..ac34e387 100644
+--- a/autotests/kfilewidgettest.cpp
 b/autotests/kfilewidgettest.cpp
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -530,58 +531,62 @@ private Q_SLOTS:
+ }
+ 
+ void testTokenize_data()
+-{   
+-// Real filename (as in how they are stored in the fs) 
+-QTest::addColumn>("fileNames");
++{
++// Real filename (as in how they are stored in the fs)
++QTest::addColumn("fileNames");
+ // Escaped value of the text-box in the dialog
+ QTest::addColumn("expectedCurrentText");
+ 
+-QTest::newRow("simple") << QList{"test2"} << 
QString("test2");
++QTest::newRow("simple") << QStringList{"test2"} << QString("test2");
+ 
+ // When a single file with space is selected, it is _not_ quoted ...
+-QTest::newRow("space-single-file") 
+-<< QList{"test space"} 
++QTest::newRow("space-single-file")
++<< QStringList{"test space"}
+ << QString("test space");
+ 
+ // However, when multiple files are selected, they are quoted
+ QTest::newRow("space-multi-file")
+-<< QList{"test space", "test2"} 
++<< QStringList{"test space", "test2"}
+ << QString("\"test space\" \"test2\"");
+ 
+ // All quotes in names should be escaped, however since this is a 
single
+ // file, the whole name will not be escaped.
+ QTest::newRow("quote-single-file")
+-<< QList{"test\"quote"} 
++<< QStringList{"test\"quote"}
+ << QString("test\\\"quote");
+-
++
+ // Escape multiple files. Files should also be wrapped in ""
+ // Note that we are also testing quote at the end of the name
+ QTest::newRow("quote-multi-file")
+-<< QList{"test\"quote", "test2-quote\"", "test"} 
++<< QStringList{"test\"quote", "test2-quote\"", "test"}
+ << QString("\"test\\\"quote\" \"test2-quote\\\"\" \"test\"");
+ 
+ // Ok, enough with quotes... lets do some backslashes
+ // Backslash literals in file names - Unix only case
+ QTest::newRow("backslash-single-file")
+-<< QList{"test\\backslash"} 
++<< QStringList{"test\\backslash"}
+ << QString("testbackslash");
+ 
+ QTest::newRow("backslash-multi-file")
+-<< QList{"test\\back\\slash", "test"} 
++<< QStringList{"test\\back\\slash", "test"}
+ << QString("\"testbackslash\" \"test\"");
+ 
+ QTest::newRow("double-backslash-multi-file")
+-<< QList{"testback\\slash", "test"} 
++<< QStringList{"testback\\slash", "test"}
+ << QString("\"testbackslash\" \"test\"");
+ 
+ QTest::newRow("double-backslash-end")
+-<< QList{"test"} 
++<< QStringList{"test"}
+ << QString("test");
+ 
+ QTest::newRow("single-backslash-end")
+-<< QList{"some thing", "test\\"} 
++<< QStringList{"some thing", "test\\"}
+ << QString("\"some thing\" \"test\"");
+ 
++QTest::newRow("sharp")

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

2020-09-29 Thread Andreas Sturmlechner
commit: 79bc863dc74675a14f4818e979cab9e62557c369
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep 28 22:41:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 29 12:46:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bc863d

kde-frameworks/kio: OpenUrlJob: handle all text scripts consistently

Upstream commit fdd7c47c85d5d6dbf21e05e7a0d6afcf383f1d24

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=425829
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...o-5.74.1-handle-shell-scripts-consistenty.patch | 310 +
 kde-frameworks/kio/kio-5.74.1-r1.ebuild|   5 +-
 2 files changed, 314 insertions(+), 1 deletion(-)

diff --git 
a/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch 
b/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch
new file mode 100644
index 000..f5e17f338fd
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch
@@ -0,0 +1,310 @@
+From fdd7c47c85d5d6dbf21e05e7a0d6afcf383f1d24 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir 
+Date: Tue, 15 Sep 2020 20:06:49 +0200
+Subject: [PATCH] OpenUrlJob: handle all text scripts consistently
+
+Previously we only handled application/x-shellscript, but there are other
+scripts; a script is technically a file that inherits both text/plain and
+application/x-executable, e.g. .sh, .csh, .py, perl scripts ...etc. Treat
+all those mime types the way we handled shell scripts:
+  - if it's not a local url, or isn't executable we open it in the preferred
+text editor
+  - if it's executable either show the OpenOrExecute dialog or execute
+directly depending on how the job is configured
+
+The mimetype world is a confusing one:
+  - Executables, this includes .exe files (MS Windows); and 
"application/x-executable"
+and "application/x-sharedlib", this depends on various parameters (e.g.
+stripped executables are x-sharedlib, the same executable if not stripped
+is x-executable...)
+  - Scripts: shell, python, perl... etc scripts, which are text files that
+can be executed or opened as text.
+
+Adjust the unit test.
+
+BUG: 425829
+BUG: 425177
+FIXED-IN: 5.75
+---
+ autotests/openurljobtest.cpp | 56 +++
+ autotests/openurljobtest.h   |  2 ++
+ src/gui/openurljob.cpp   | 65 ++--
+ 3 files changed, 85 insertions(+), 38 deletions(-)
+
+diff --git a/autotests/openurljobtest.cpp b/autotests/openurljobtest.cpp
+index 2f2ef8ad..ed2211a8 100644
+--- a/autotests/openurljobtest.cpp
 b/autotests/openurljobtest.cpp
+@@ -103,14 +103,13 @@ void OpenUrlJobTest::initTestCase()
+ KConfigGroup grp = mimeAppsCfg.group("Default Applications");
+ grp.writeEntry("text/plain", s_tempServiceName);
+ grp.writeEntry("text/html", s_tempServiceName);
+-grp.writeEntry("application/x-shellscript", s_tempServiceName);
+ grp.sync();
+ 
+-for (const char *mimeType : {"text/plain", "application/x-shellscript"}) {
+-KService::Ptr preferredTextEditor = 
KApplicationTrader::preferredService(QString::fromLatin1(mimeType));
+-QVERIFY(preferredTextEditor);
+-QCOMPARE(preferredTextEditor->entryPath(), m_fakeService);
+-}
++
++// "text/plain" encompasses all scripts (shell, python, perl)
++KService::Ptr preferredTextEditor = 
KApplicationTrader::preferredService(QStringLiteral("text/plain"));
++QVERIFY(preferredTextEditor);
++QCOMPARE(preferredTextEditor->entryPath(), m_fakeService);
+ 
+ // As used for preferredService
+ QVERIFY(KService::serviceByDesktopName("openurljobtest_service"));
+@@ -230,17 +229,38 @@ void OpenUrlJobTest::invalidUrl()
+ QCOMPARE(job2->errorString(), QStringLiteral("Malformed URL\n/pathonly"));
+ }
+ 
++void OpenUrlJobTest::refuseRunningNativeExecutables_data()
++{
++QTest::addColumn("mimeType");
++
++// Executables under e.g. /usr/bin/ can be either of these two mimetypes
++// see https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11
++QTest::newRow("x-sharedlib") << "application/x-sharedlib";
++QTest::newRow("x-executable") << "application/x-executable";
++}
++
+ void OpenUrlJobTest::refuseRunningNativeExecutables()
+ {
+-   KIO::OpenUrlJob *job = new 
KIO::OpenUrlJob(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()), 
QStringLiteral("application/x-executable"), this);
++   QFETCH(QString, mimeType);
++
++   KIO::OpenUrlJob *job = new 
KIO::OpenUrlJob(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()), 
mimeType, this);
+QVERIFY(!job->exec());
+QCOMPARE(job->error(), KJob::UserDefinedError);
+QVERIFY2(job->errorString().contains("For security reasons, launching 
executables is not allowed in this context."), qPrintable(job->errorString()));
+ }
+ 
++void 

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

2020-05-16 Thread Andreas Sturmlechner
commit: 3b0b1117d4dae8c28dd3e0913e188841784b5e42
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 16 09:06:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 16 09:08:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0b1117

kde-frameworks/kio: Drop 5.70.0-r1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  1 -
 .../kio/files/kio-5.70.0-fix-run-in-terminal.patch | 89 
 kde-frameworks/kio/kio-5.70.0-r1.ebuild| 96 --
 3 files changed, 186 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c9a070ae5bc..ee406225294 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
 DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 
297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04
 SHA512 
baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72
-DIST kio-5.70.0.tar.xz 3200704 BLAKE2B 
23540865ab0310fb3564cfcc445602aab46c8cdbc3b1d40e9428e13a46f9e3795a1fca853028226cb9e3313ef3d22a5347a9cfc9b058e1959bf4dbf861b0792f
 SHA512 
80e8e8bcd49c09228c9a439f97aecca784880b852eeb82c84ec44868de44d2b0c5a63a4d220e6c2f2c264b7e87fe0d5b639f652b1f50c9fe1b1b941b366d929a
 DIST kio-5.70.1.tar.xz 3200752 BLAKE2B 
cc56ee412cb647c8921a36c3e47747640d557630f70887401c69ca1a367205adf4d7cd45b721abd103efcb1265c956654fce2dfc5b3fe6241413c51f1b88
 SHA512 
12287f330e8e7b9ac9c0ff24c1f8f980fbd338ce3f341d8005d6dc6e3acdf96da07adeea693b3361909819d8814192503e8d2c93ca9b9958d985f0d09f202661

diff --git a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch 
b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
deleted file mode 100644
index 4b9b8bf5817..000
--- a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 6452a34cf01d03d3167b38bc28a2fe8e13569021 Mon Sep 17 00:00:00 2001
-From: Jonathan Marten 
-Date: Thu, 14 May 2020 19:17:54 +0100
-Subject: Fix service file specifying 'Run in terminal' giving an error code
- 100
-
-Happens because KIO::DesktopExecParser::resultingArguments() prepends
-the terminal application to the command line.  If this is a relative path,
-as it is most likely to be (and will be in the default 'konsole' case),
-the "realExecutable" check in KProcessRunner::KProcessRunner() is triggered
-and the job aborts with an error.
-
-Expand the specified terminal executable into a full path in 
resultingArguments(),
-and return an error immediately if it cannot be found.  This full terminal path
-is not relative for the KProcessRunner::KProcessRunner() check and does not 
fail.
-
-Check that resultingArguments() is not empty (an error return) before accessing
-the first word of the command, so that it does not assert if the list is empty.
-Also only call resultingArguments() once.
-
-BUG: 421374
-FIXED-IN: 5.71
-
-Differential Revision: https://phabricator.kde.org/D29738

- src/core/desktopexecparser.cpp | 10 +-
- src/gui/kprocessrunner.cpp | 17 +
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/src/core/desktopexecparser.cpp b/src/core/desktopexecparser.cpp
-index a3b5219..fcf83d9 100644
 a/src/core/desktopexecparser.cpp
-+++ b/src/core/desktopexecparser.cpp
-@@ -421,7 +421,15 @@ QStringList KIO::DesktopExecParser::resultingArguments() 
const
- if (d->service.terminal()) {
- KConfigGroup cg(KSharedConfig::openConfig(), "General");
- QString terminal = cg.readPathEntry("TerminalApplication", 
QStringLiteral("konsole"));
--if (terminal == QLatin1String("konsole")) {
-+const bool isKonsole = (terminal == QLatin1String("konsole"));
-+
-+QString terminalPath = QStandardPaths::findExecutable(terminal);
-+if (terminalPath.isEmpty()) {
-+qCWarning(KIO_CORE) << "Terminal" << terminal << "not found, 
service" << d->service.name();
-+return QStringList();
-+}
-+terminal = terminalPath;
-+if (isKonsole) {
- if (!d->service.workingDirectory().isEmpty()) {
- terminal += QLatin1String(" --workdir ") + 
KShell::quoteArg(d->service.workingDirectory());
- }
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index a4701a7..cc57b54 100644
 a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -88,9 +88,17 @@ KProcessRunner::KProcessRunner(const KService::Ptr 
, const QList &
- emitDelayedError(i18n("The desktop entry file\n%1\nis not valid.", 
service->entryPath()));
- return;
- }
-+
- KIO::DesktopExecParser execParser(*service, urls);
-+execParser.setUrlsAreTempFiles(flags & 

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

2020-05-15 Thread Andreas Sturmlechner
commit: f3898bd789b95b92f0ce7c3842b04ccd430d5c65
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 15 08:12:29 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 15 08:16:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3898bd7

kde-frameworks/kio: Fix service file specifying 'Run in terminal'

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=421374
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kio/files/kio-5.70.0-fix-run-in-terminal.patch | 89 
 kde-frameworks/kio/kio-5.70.0-r1.ebuild| 96 ++
 2 files changed, 185 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch 
b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
new file mode 100644
index 000..4b9b8bf5817
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.70.0-fix-run-in-terminal.patch
@@ -0,0 +1,89 @@
+From 6452a34cf01d03d3167b38bc28a2fe8e13569021 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten 
+Date: Thu, 14 May 2020 19:17:54 +0100
+Subject: Fix service file specifying 'Run in terminal' giving an error code
+ 100
+
+Happens because KIO::DesktopExecParser::resultingArguments() prepends
+the terminal application to the command line.  If this is a relative path,
+as it is most likely to be (and will be in the default 'konsole' case),
+the "realExecutable" check in KProcessRunner::KProcessRunner() is triggered
+and the job aborts with an error.
+
+Expand the specified terminal executable into a full path in 
resultingArguments(),
+and return an error immediately if it cannot be found.  This full terminal path
+is not relative for the KProcessRunner::KProcessRunner() check and does not 
fail.
+
+Check that resultingArguments() is not empty (an error return) before accessing
+the first word of the command, so that it does not assert if the list is empty.
+Also only call resultingArguments() once.
+
+BUG: 421374
+FIXED-IN: 5.71
+
+Differential Revision: https://phabricator.kde.org/D29738
+---
+ src/core/desktopexecparser.cpp | 10 +-
+ src/gui/kprocessrunner.cpp | 17 +
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/desktopexecparser.cpp b/src/core/desktopexecparser.cpp
+index a3b5219..fcf83d9 100644
+--- a/src/core/desktopexecparser.cpp
 b/src/core/desktopexecparser.cpp
+@@ -421,7 +421,15 @@ QStringList KIO::DesktopExecParser::resultingArguments() 
const
+ if (d->service.terminal()) {
+ KConfigGroup cg(KSharedConfig::openConfig(), "General");
+ QString terminal = cg.readPathEntry("TerminalApplication", 
QStringLiteral("konsole"));
+-if (terminal == QLatin1String("konsole")) {
++const bool isKonsole = (terminal == QLatin1String("konsole"));
++
++QString terminalPath = QStandardPaths::findExecutable(terminal);
++if (terminalPath.isEmpty()) {
++qCWarning(KIO_CORE) << "Terminal" << terminal << "not found, 
service" << d->service.name();
++return QStringList();
++}
++terminal = terminalPath;
++if (isKonsole) {
+ if (!d->service.workingDirectory().isEmpty()) {
+ terminal += QLatin1String(" --workdir ") + 
KShell::quoteArg(d->service.workingDirectory());
+ }
+diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
+index a4701a7..cc57b54 100644
+--- a/src/gui/kprocessrunner.cpp
 b/src/gui/kprocessrunner.cpp
+@@ -88,9 +88,17 @@ KProcessRunner::KProcessRunner(const KService::Ptr 
, const QList &
+ emitDelayedError(i18n("The desktop entry file\n%1\nis not valid.", 
service->entryPath()));
+ return;
+ }
++
+ KIO::DesktopExecParser execParser(*service, urls);
++execParser.setUrlsAreTempFiles(flags & 
KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
++execParser.setSuggestedFileName(suggestedFileName);
++const QStringList args = execParser.resultingArguments();
++if (args.isEmpty()) {
++emitDelayedError(i18n("Error processing Exec field in %1", 
service->entryPath()));
++return;
++}
+ 
+-const QString realExecutable = execParser.resultingArguments().at(0);
++const QString realExecutable = args.at(0);
+ // realExecutable is a full path if DesktopExecParser was able to locate 
it. Otherwise it's still relative, which is a bad sign.
+ if (QDir::isRelativePath(realExecutable) || 
!QFileInfo(realExecutable).isExecutable()) {
+ // Does it really not exist, or is it non-executable? (bug #415567)
+@@ -103,13 +111,6 @@ KProcessRunner::KProcessRunner(const KService::Ptr 
, const QList &
+ return;
+ }
+ 
+-execParser.setUrlsAreTempFiles(flags & 
KIO::ApplicationLauncherJob::DeleteTemporaryFiles);
+-execParser.setSuggestedFileName(suggestedFileName);
+-const QStringList args = execParser.resultingArguments();
+-

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

2020-02-09 Thread Andreas Sturmlechner
commit: 8dba7f7eba3b961468d2477f4e35da63419298f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  9 20:20:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  9 22:27:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dba7f7e

kde-frameworks/kio: Fix memory leak in KUrlNavigatorPlacesSelector

Reported-by: David Korth  gerbilsoft.com>
Closes: https://bugs.gentoo.org/708876
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/files/kio-5.67.0-memleak.patch | 43 +++
 kde-frameworks/kio/kio-5.67.0-r1.ebuild   | 88 +++
 2 files changed, 131 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.67.0-memleak.patch 
b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
new file mode 100644
index 000..cf168b79183
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
@@ -0,0 +1,43 @@
+From 213ed50634c02d8ec4aa91f0c307cfdd6f78170d Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Wed, 29 Jan 2020 19:50:33 +0100
+Subject: Fix memory leak in KUrlNavigatorPlacesSelector::updateMenu
+
+Summary:
+This method gets called each time solid notices a change, which can in some
+setups be very frequent. It leaked memory as the submenus and their actions
+were not deallocated properly.
+
+Test Plan: Builds. User feedback: "so far so good, 160 MB Memory usage". It 
was ~7GiB before this patch.
+
+Reviewers: #frameworks, davidedmundson, meven
+
+Reviewed By: davidedmundson, meven
+
+Subscribers: anthonyfieroni, meven, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D27002
+---
+ src/filewidgets/kurlnavigatorplacesselector.cpp | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/filewidgets/kurlnavigatorplacesselector.cpp 
b/src/filewidgets/kurlnavigatorplacesselector.cpp
+index 7d33930..103a5fc 100644
+--- a/src/filewidgets/kurlnavigatorplacesselector.cpp
 b/src/filewidgets/kurlnavigatorplacesselector.cpp
+@@ -71,6 +71,11 @@ void KUrlNavigatorPlacesSelector::updateMenu()
+ {
+ m_placesMenu->clear();
+ 
++// Submenus have to be deleted explicitly (QTBUG-11070)
++for(QObject *obj : QObjectList(m_placesMenu->children())) {
++delete qobject_cast(obj); // Noop for nullptr
++}
++
+ updateSelection(m_selectedUrl);
+ 
+ QString previousGroup;
+-- 
+cgit v1.1

diff --git a/kde-frameworks/kio/kio-5.67.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
new file mode 100644
index 000..3bd5e746e87
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
@@ -0,0 +1,88 @@
+# 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 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
+RDEPEND="
+   dev-libs/libxml2
+   dev-libs/libxslt
+   >=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
+   =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
+   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="
+   

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

2019-12-22 Thread Andreas Sturmlechner
commit: 9f00f8c78bb8ff523fb21e2aa4e580ae115fb7d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 22 22:29:57 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 22 22:48:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f00f8c7

kde-frameworks/kio: Fix FTP as well as HTTP no-proxy settings

Reported-by: Andreas Thalhammer  linux.com>
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kio-5.64.0-fix-ftp-proxy-settings.patch  | 39 ++
 .../files/kio-5.64.0-fix-no-proxy-settings.patch   | 38 +
 kde-frameworks/kio/kio-5.64.0-r2.ebuild| 89 ++
 3 files changed, 166 insertions(+)

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
new file mode 100644
index 000..17968ff6cdb
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
@@ -0,0 +1,39 @@
+From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= 
+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-no-proxy-settings.patch 
b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
new file mode 100644
index 000..54f9755092f
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
@@ -0,0 +1,38 @@
+From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001
+From: David Faure 
+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
new file mode 100644
index 000..9fb1a18b075
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
@@ -0,0 +1,89 @@
+# 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 

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

2019-12-19 Thread Andreas Sturmlechner
commit: df7bb09fcfce8b75127b6c5178c650f48d516cd6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 19 09:44:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 19 09:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7bb09f

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  gentoo.org>

 .../files/kio-5.64.0-fix-http-proxy-settings.patch | 43 +++
 kde-frameworks/kio/kio-5.64.0-r1.ebuild| 85 ++
 2 files changed, 128 insertions(+)

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 000..2bde0a85d68
--- /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 
+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 000..805eb8dac88
--- /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=( 

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

2019-01-12 Thread Andreas Sturmlechner
commit: 9a23deced58f2f084a8979f4ebf522ae1c72f47b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 12 13:27:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 12 14:35:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a23dece

kde-frameworks/kio: Tarball respun, add kio core crashfix

1) See also:
https://mail.kde.org/pipermail/release-team/2019-January/011202.html
https://bugs.kde.org/show_bug.cgi?id=403100

2) See also:
https://bugs.kde.org/show_bug.cgi?id=402665

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/Manifest|  2 +-
 .../kio/files/kio-5.54.0-elapsedtime.patch | 38 ++
 kde-frameworks/kio/kio-5.54.0.ebuild   |  2 ++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 77df753c9f1..b6ccab1d596 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,3 @@
 DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 
4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc
 SHA512 
b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36
 DIST kio-5.53.0.tar.xz 3143732 BLAKE2B 
89be51cf5270b978fe4e8f28a590b1ad2b39fcb50843d51b99ced22dc5d3b91958975a48110b38a9138ef77f7b618deb6f9f769f403dbee2d31dec1d89717b3c
 SHA512 
121e87c1a0fe17c4b3f1102af34ef65e867efba5e352549da830f874420e8f2b4ee30f27281cbd844617f3d9bf15fa6dfc3548ae86366c70b8ea4e083bee103d
-DIST kio-5.54.0.tar.xz 3150608 BLAKE2B 
cdf34296a8c05a9e9e1e9ff34407f4a995104fd87b4dd1c290033621447c9620024f59997e97c7f5891f6719abfc62b18966df4c29dfda839ea35a94921f3d31
 SHA512 
d957b48ee7fe8490cb9bf854016ad5fe8ce922207036cdc3b3a97c9b8f68487cf87f6215cf18f91e911577d4a26e24c87f9f7c4ed3933f820cdb7ca309f82060
+DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 
0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476
 SHA512 
163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d

diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch 
b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
new file mode 100644
index 000..d18347fb63d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
@@ -0,0 +1,38 @@
+From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Thu, 10 Jan 2019 16:03:06 +
+Subject: Fix elapsed time check
+
+Summary:
+To match the code it was refactored from it should be checking the code
+since the last time we checked calcSpeed, not since the job started.
+
+CCBUG: 402665
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D18158
+---
+ src/core/slaveinterface.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp
+index 6eb2b08..d79b498 100644
+--- a/src/core/slaveinterface.cpp
 b/src/core/slaveinterface.cpp
+@@ -103,7 +103,9 @@ void SlaveInterface::calcSpeed()
+ // using first and last item from the list.
+ 
+ const qint64 elapsed_time = d->elapsed_timer.elapsed();
+-if (elapsed_time >= 900) {
++const qint64 last_time = d->transfer_details.isEmpty() ? 0 : 
d->transfer_details.last().time;
++
++if (elapsed_time - last_time >= 900) {
+ if (d->transfer_details.count() == max_count) {
+ d->transfer_details.removeFirst();
+ }
+-- 
+cgit v1.1
+

diff --git a/kde-frameworks/kio/kio-5.54.0.ebuild 
b/kde-frameworks/kio/kio-5.54.0.ebuild
index e10f37ff9d3..3256957d5aa 100644
--- a/kde-frameworks/kio/kio-5.54.0.ebuild
+++ b/kde-frameworks/kio/kio-5.54.0.ebuild
@@ -68,6 +68,8 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package acl ACL)



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

2018-11-26 Thread Andreas Sturmlechner
commit: 8314b692cec95b14220ce96cf8f02f0e7b58c736
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 26 22:13:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 27 07:48:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8314b692

kde-frameworks/kio: Restore sendfile support

Backport from 5.53.0, fixes KF5-porting regression.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-frameworks/kio/files/kio-5.52.0-sendfile.patch | 109 +
 kde-frameworks/kio/kio-5.52.0-r1.ebuild|  82 
 2 files changed, 191 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.52.0-sendfile.patch 
b/kde-frameworks/kio/files/kio-5.52.0-sendfile.patch
new file mode 100644
index 000..d02b8f50b19
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.52.0-sendfile.patch
@@ -0,0 +1,109 @@
+From 31980ecd1cacac9bd75ce35e3048946e1c27e1a0 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Wed, 21 Nov 2018 15:30:48 +
+Subject: Restore sendfile support
+
+Summary:
+Somehow in the kdelibs -> framework port the cmake checks for
+HAVE_SENDFILE got lost.
+
+That re-enables a massive optimisation in the file kioslave that has all the 
code existing and used in kdelibs4 that we're currently missing.
+
+Test Plan:
+Put a compilation fail inside the #ifdef, before it wasn't triggered, now it 
is.
+
+Ran unit tests
+Moved a file in dolphin
+
+Reviewers: dfaure
+
+Reviewed By: dfaure
+
+Subscribers: ngraham, apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17048
+---
+ src/ioslaves/file/ConfigureChecks.cmake| 1 +
+ src/ioslaves/file/config-kioslave-file.h.cmake | 2 ++
+ src/ioslaves/file/file_unix.cpp| 2 +-
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/ConfigureChecks.cmake 
b/src/ioslaves/file/ConfigureChecks.cmake
+index 5a83d1b..39fcd6f 100644
+--- a/src/ioslaves/file/ConfigureChecks.cmake
 b/src/ioslaves/file/ConfigureChecks.cmake
+@@ -7,6 +7,7 @@ include(CheckStructHasMember)
+ check_include_files(sys/time.hHAVE_SYS_TIME_H)
+ check_include_files(string.h  HAVE_STRING_H)
+ check_include_files(limits.h  HAVE_LIMITS_H)
++check_function_exists(sendfileHAVE_SENDFILE)
+ 
+ check_function_exists(posix_fadviseHAVE_FADVISE)  # 
kioslave
+ 
+diff --git a/src/ioslaves/file/config-kioslave-file.h.cmake 
b/src/ioslaves/file/config-kioslave-file.h.cmake
+index e47fdb2..3df7ebd 100644
+--- a/src/ioslaves/file/config-kioslave-file.h.cmake
 b/src/ioslaves/file/config-kioslave-file.h.cmake
+@@ -13,3 +13,5 @@
+ /* Defined if system has extended file attributes support. */
+ #cmakedefine01 HAVE_SYS_XATTR_H
+ 
++/* Defined if system has the sendfile function. */
++#cmakedefine01 HAVE_SENDFILE
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 817cce8..34422e5 100644
+--- a/src/ioslaves/file/file_unix.cpp
 b/src/ioslaves/file/file_unix.cpp
+@@ -49,7 +49,7 @@
+ #include "fdreceiver.h"
+ 
+ //sendfile has different semantics in different platforms
+-#if defined HAVE_SENDFILE && defined Q_OS_LINUX
++#if HAVE_SENDFILE && defined Q_OS_LINUX
+ #define USE_SENDFILE 1
+ #endif
+ 
+-- 
+cgit v0.11.2
+From 8f926e4596221b11e62c7ac80bb5864d3d8cf4f6 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Wed, 21 Nov 2018 15:30:53 +
+Subject: Use correct variable type for returned value from read/sendfile
+
+Summary:
+n stores the read/transferred bytes. This returns a ssize_t.
+We were casting to an int, which theoretically is a loss of data.
+
+In practice it isn't an issue as we only read a max of MAX_IPC_SIZE at a
+time, which would fit in an int.
+
+Reviewers: apol
+
+Reviewed By: apol
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D17051
+---
+ src/ioslaves/file/file_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 34422e5..7ed0ae8 100644
+--- a/src/ioslaves/file/file_unix.cpp
 b/src/ioslaves/file/file_unix.cpp
+@@ -251,7 +251,7 @@ void FileProtocol::copy(const QUrl , const QUrl 
,
+ 
+ KIO::filesize_t processed_size = 0;
+ char buffer[ MAX_IPC_SIZE ];
+-int n;
++ssize_t n = 0;
+ #ifdef USE_SENDFILE
+ bool use_sendfile = buff_src.st_size < 0x7FFF;
+ #endif
+-- 
+cgit v0.11.2

diff --git a/kde-frameworks/kio/kio-5.52.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.52.0-r1.ebuild
new file mode 100644
index 000..7a9357c5fed
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.52.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+

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

2017-11-29 Thread Andreas Sturmlechner
commit: 97d55e9f2677dbc82a438cfede01b01b85138a49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 29 16:38:11 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 29 16:40:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d55e9f

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

See also:
https://mail.kde.org/pipermail/kde-distro-packagers/2017-November/000298.html

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch  | 80 +
 kde-frameworks/kio/kio-5.40.0-r2.ebuild| 83 ++
 2 files changed, 163 insertions(+)

diff --git 
a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 
b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
new file mode 100644
index 000..9645620d04d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
@@ -0,0 +1,80 @@
+From 298c0e734efdd8a7b66a531959e3fb5357a6495d Mon Sep 17 00:00:00 2001
+From: Eike Hein 
+Date: Tue, 28 Nov 2017 19:42:46 +0900
+Subject: Fix creating a directory via KNewFileMenu+KIO::mkpath on Qt 5.9.3+
+
+Summary:
+f62768d04652 in qtbase.git introduced a behavior change in QUrl
+causing it to reject URLs with a path of "//foo" (note the double
+slash) as invalid.
+
+Both KNewFileMenu and KIO::mkpath contained code following this
+pattern:
+
+  url.path() + '/' + name
+
+This is a bad mix with forwarding slaves like kio_desktop, which
+translate a top-level path of / to some other URL:
+
+  (desktop:)/ + / + foo = //foo
+
+This patch addresses the two instances of this by wrapping the
+string building in QDir::cleanPath, which I think is the shortest
+and most readable way to go.
+
+2353119aae8f in kio.git (D8836) was another commit fixing fallout
+from this Qt change. Is unlikely this patch will be the last one.
+I suspect many other variations of this problem lurk about the
+codebase.
+
+BUG:387073
+
+Reviewers: dfaure, thiago, elvisangelaccio
+
+Subscribers: #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D9029
+---
+ src/core/mkpathjob.cpp   | 3 ++-
+ src/filewidgets/knewfilemenu.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index c77a9fe..f67a489 100644
+--- a/src/core/mkpathjob.cpp
 b/src/core/mkpathjob.cpp
+@@ -25,6 +25,7 @@
+ #include "mkdirjob.h"
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ using namespace KIO;
+@@ -123,7 +124,7 @@ void MkpathJobPrivate::slotStart()
+ }
+ 
+ if (m_pathIterator != m_pathComponents.constEnd()) {
+-m_url.setPath(m_url.path() + '/' + *m_pathIterator);
++m_url.setPath(QDir::cleanPath(m_url.path() + '/' + *m_pathIterator));
+ KIO::Job* job = KIO::mkdir(m_url);
+ q->addSubjob(job);
+ q->setProcessedAmount(KJob::Directories, 
q->processedAmount(KJob::Directories) + 1);
+diff --git a/src/filewidgets/knewfilemenu.cpp 
b/src/filewidgets/knewfilemenu.cpp
+index 023eebd..98c9852 100644
+--- a/src/filewidgets/knewfilemenu.cpp
 b/src/filewidgets/knewfilemenu.cpp
+@@ -855,7 +855,7 @@ void KNewFileMenuPrivate::_k_slotCreateDirectory(bool 
writeHiddenDir)
+ }
+ }
+ url = baseUrl;
+-url.setPath(url.path() + '/' + name);
++url.setPath(QDir::cleanPath(url.path() + '/' + name));
+ }
+ }
+ 
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/kio/kio-5.40.0-r2.ebuild 
b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
new file mode 100644
index 000..b0b6cd7af7e
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
@@ -0,0 +1,83 @@
+# 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)
+   

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

2017-11-26 Thread Andreas Sturmlechner
commit: 2dcff392b8f28d8eaa874c352873065ef70a9946
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 26 18:51:54 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 26 18:56:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcff392

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

See also:
https://mail.kde.org/pipermail/kde-distro-packagers/2017-November/000297.html

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 kde-frameworks/kio/Manifest|  2 +-
 .../kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch | 65 ++
 kde-frameworks/kio/kio-5.40.0-r1.ebuild| 80 ++
 3 files changed, 146 insertions(+), 1 deletion(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 6cdc8304cb1..20bed421afa 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,2 @@
 DIST kio-5.37.0.tar.xz 3084204 SHA256 
49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 
42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64
 WHIRLPOOL 
649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
-DIST kio-5.40.0.tar.xz 3100424 SHA256 
30ea0b231b995faaf4283b9c9ecfaffb589268f5d7b5b805f69ed95601ac389b SHA512 
e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
 WHIRLPOOL 
cfae3b3dc85f1398217c934943829dc28d2b7bfefe6d8adb5a082593f66127b313652b34278e6e4d612b266f7df8b03462a5ae8ac71af5685ad9641c08181b3a
+DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 
27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc
 SHA512 
e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed

diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch 
b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
new file mode 100644
index 000..d9cf7402741
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
@@ -0,0 +1,65 @@
+From 2353119aae8f03565bc7779ed1d597d266f5afda Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio 
+Date: Thu, 16 Nov 2017 10:41:19 +0100
+Subject: Fix KIO::mkpath with qtbase 5.10 beta 4
+
+Summary:
+The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests,
+since `url.setPath("//foo")` will now result in an invalid (empty) QUrl.
+
+This patch fixes the KIO::mkpath() case.
+
+[1]: 
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7
+
+Test Plan:
+
+* I can now create folders from dolphin and plasma.
+* fileundomanagertest and mkpathjobtest no longer fail
+
+Reviewers: #frameworks, dfaure
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D8836
+---
+ src/core/mkpathjob.cpp | 17 ++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index bff46ca..a177805 100644
+--- a/src/core/mkpathjob.cpp
 b/src/core/mkpathjob.cpp
+@@ -43,8 +43,13 @@ public:
+ m_url.setPath(QStringLiteral("/"));
+ int i = 0;
+ for (; i < basePathComponents.count() && i < 
m_pathComponents.count(); ++i) {
+-if (m_pathComponents.at(i) == basePathComponents.at(i)) {
+-m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
++const QString pathComponent = m_pathComponents.at(i);
++if (pathComponent == basePathComponents.at(i)) {
++if (m_url.path() == QLatin1Char('/')) {
++m_url.setPath(m_url.path() + pathComponent);
++} else {
++m_url.setPath(m_url.path() + '/' + pathComponent);
++}
+ } else {
+ break;
+ }
+@@ -57,7 +62,13 @@ public:
+ if (m_url.isLocalFile()) {
+ i = 0;
+ for (; i < m_pathComponents.count(); ++i) {
+-QString testDir = m_url.toLocalFile() + '/' + 
m_pathComponents.at(i);
++const QString localFile = m_url.toLocalFile();
++QString testDir;
++if (localFile == QLatin1Char('/')) {
++testDir = localFile + m_pathComponents.at(i);
++} else {
++testDir = localFile + '/' + m_pathComponents.at(i);
++}
+ if (QFileInfo(testDir).isDir()) {
+ m_url.setPath(testDir);
+ } else {
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/kio/kio-5.40.0-r1.ebuild 
b/kde-frameworks/kio/kio-5.40.0-r1.ebuild
new file mode 100644
index 000..014388b9935
--- /dev/null
+++ 

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

2017-05-29 Thread Andreas Sturmlechner
commit: 5a15b9b4cdb4ace6be8597189bab3859bbfacc69
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 22:57:36 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 22:58:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a15b9b4

kde-frameworks/kio: Fix kioclient5 exec with PIE binaries

See also: https://bugs.kde.org/show_bug.cgi?id=350018

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-frameworks/kio/files/kio-5.34.0-pie.patch | 62 
 kde-frameworks/kio/kio-5.34.0-r2.ebuild   | 84 +++
 2 files changed, 146 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.34.0-pie.patch 
b/kde-frameworks/kio/files/kio-5.34.0-pie.patch
new file mode 100644
index 000..973f9550447
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.34.0-pie.patch
@@ -0,0 +1,62 @@
+commit 4122b52fee540f6b7cdd8fde2f55e2f7c2673b1a
+Author: Fabian Vogt 
+Date:   Sun May 28 14:49:03 2017 +0200
+
+Identify PIE binaries (application/x-sharedlib) as executable files
+
+Summary:
+x86_64 binaries compiled with PIE are just shared objects with the
+executable bit set. Without this patch, kio does not know that they
+can be executed as well, causing "kioclient5 exec" to ask for an
+application that can handle application/x-sharedlib.
+
+BUG: 350018
+
+Test Plan: Can run applications fine again.
+
+Reviewers: dfaure, aacid
+
+Reviewed By: dfaure
+
+Subscribers: asturmlechner, #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D6002
+
+diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
+index 399ca975..2a9b563a 100644
+--- a/src/widgets/krun.cpp
 b/src/widgets/krun.cpp
+@@ -139,7 +139,8 @@ bool KRun::isExecutableFile(const QUrl , const QString 
)
+ #ifdef Q_OS_WIN
+ 
mimeType.inherits(QLatin1String("application/x-ms-dos-executable")) ||
+ #endif
+-
mimeType.inherits(QStringLiteral("application/x-executable-script"))
++
mimeType.inherits(QStringLiteral("application/x-executable-script")) ||
++mimeType.inherits(QStringLiteral("application/x-sharedlib"))
+) {
+ return true;
+ }
+@@ -1438,6 +1439,8 @@ bool KRun::isExecutable(const QString )
+ {
+ return (serviceType == QLatin1String("application/x-desktop") ||
+ serviceType == QLatin1String("application/x-executable") ||
++/* See https://bugs.freedesktop.org/show_bug.cgi?id=97226 */
++serviceType == QLatin1String("application/x-sharedlib") ||
+ serviceType == QLatin1String("application/x-ms-dos-executable") ||
+ serviceType == QLatin1String("application/x-shellscript"));
+ }
+diff --git a/src/widgets/krun.h b/src/widgets/krun.h
+index 2d167fc8..1012fb2b 100644
+--- a/src/widgets/krun.h
 b/src/widgets/krun.h
+@@ -436,7 +436,7 @@ public:
+  * To be executable the file must pass the following rules:
+  * -# Must reside on the local filesystem.
+  * -# Must be marked as executable for the user by the filesystem.
+- * -# The mime type must inherit application/x-executable or 
application/x-executable-script.
++ * -# The mime type must inherit application/x-executable, 
application/x-executable-script or application/x-sharedlib.
+  * To allow a script to run when the above rules are satisfied add the 
entry
+  * @code
+  * X-KDE-IsAlso=application/x-executable-script

diff --git a/kde-frameworks/kio/kio-5.34.0-r2.ebuild 
b/kde-frameworks/kio/kio-5.34.0-r2.ebuild
new file mode 100644
index 000..3fa22fb33b0
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.34.0-r2.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-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+COMMON_DEPEND="
+   $(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)
+   

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

2016-09-29 Thread Michael Palimaka
commit: 9e03422ea373c87e67f7ad2920681a9283c1ebfc
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Sep 28 20:11:02 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 29 11:39:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e03422e

kde-frameworks/kio: Fix ABI break and limitation to TLS 1.0

Package-Manager: portage-2.3.0

 .../kio/files/kio-5.26.0-fix-abi-break.patch   | 64 
 .../kio/files/kio-5.26.0-secureprotocols.patch | 26 +++
 kde-frameworks/kio/kio-5.26.0-r2.ebuild| 86 ++
 3 files changed, 176 insertions(+)

diff --git a/kde-frameworks/kio/files/kio-5.26.0-fix-abi-break.patch 
b/kde-frameworks/kio/files/kio-5.26.0-fix-abi-break.patch
new file mode 100644
index ..0cbe72e
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.26.0-fix-abi-break.patch
@@ -0,0 +1,64 @@
+From: José Manuel Santamaría Lema 
+Date: Wed, 28 Sep 2016 07:53:08 +
+Subject: Fix ABI break in kio
+X-Git-Url: 
http://quickgit.kde.org/?p=kio.git=commitdiff=89f8bcf00fc2fc17527d7bb4e0e2aea51f8776cb
+---
+Fix ABI break in kio
+
+From the binary compatibility page "Do's and Don'ts":
+https://community.kde.org/Policies/Binary_Compatibility_Issues_With_C%2B%2B#The_Do.27s_and_Don.27ts
+You cannot...
+[...]
+For existing functions of any type:
+[...]
+inline it (this includes moving a member function's body to the class 
definition, even without the inline keyword).
+
+REVIEW: 129032
+---
+
+
+--- a/src/widgets/kpropertiesdialog.cpp
 b/src/widgets/kpropertiesdialog.cpp
+@@ -500,6 +500,11 @@
+ KPreviewPropsPlugin::supports( _items )*/;
+ }
+ 
++void KPropertiesDialog::slotOk()
++{
++accept();
++}
++
+ void KPropertiesDialog::accept()
+ {
+ QList::const_iterator pageListIt;
+@@ -541,6 +546,11 @@
+ deleteLater(); // somewhat like Qt::WA_DeleteOnClose would do.
+ KPageDialog::accept();
+ } // else, keep dialog open for user to fix the problem.
++}
++
++void KPropertiesDialog::slotCancel()
++{
++reject();
+ }
+ 
+ void KPropertiesDialog::reject()
+
+--- a/src/widgets/kpropertiesdialog.h
 b/src/widgets/kpropertiesdialog.h
+@@ -341,12 +341,12 @@
+  * Called when the user presses 'Ok'.
+  * @deprecated since 5.25, use accept()
+  */
+-KIOWIDGETS_DEPRECATED virtual void slotOk() { accept(); }
++KIOWIDGETS_DEPRECATED virtual void slotOk();
+ /**
+  * Called when the user presses 'Cancel'.
+  * @deprecated since 5.25, use reject()
+  */
+-KIOWIDGETS_DEPRECATED virtual void slotCancel() { reject(); }
++KIOWIDGETS_DEPRECATED virtual void slotCancel();
+ 
+ /**
+  * Called when the user presses 'Ok'.
+

diff --git a/kde-frameworks/kio/files/kio-5.26.0-secureprotocols.patch 
b/kde-frameworks/kio/files/kio-5.26.0-secureprotocols.patch
new file mode 100644
index ..d7b4284
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.26.0-secureprotocols.patch
@@ -0,0 +1,26 @@
+From: Andrius Štikonas 
+Date: Mon, 26 Sep 2016 17:15:02 +
+Subject: Fix kio using only tls1.0.
+X-Git-Url: 
http://quickgit.kde.org/?p=kio.git=commitdiff=8196a735bebc6fd5eaf9d293bd565c00ef98516b
+---
+Fix kio using only tls1.0.
+
+Now kio should use QSsl::SslProtocol::SecureProtocols which will deprecate
+unsafe TLS versions when they are no longer safe.
+
+REVIEW: 129031
+---
+
+
+--- a/src/core/tcpslavebase.cpp
 b/src/core/tcpslavebase.cpp
+@@ -492,7 +492,7 @@
+ if (d->usingSSL) {
+ return false;
+ }
+-return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk;
++return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk;
+ }
+ 
+ TCPSlaveBase::SslResult 
TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal(KTcpSocket::SslVersion 
version,
+

diff --git a/kde-frameworks/kio/kio-5.26.0-r2.ebuild 
b/kde-frameworks/kio/kio-5.26.0-r2.ebuild
new file mode 100644
index ..90abbd0
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.26.0-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+COMMON_DEPEND="
+   $(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)
+