* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2017-02-28 21:02 Johannes Huber
0 siblings, 0 replies; 39+ messages in thread
From: Johannes Huber @ 2017-02-28 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 7a00da32661a8ba729193fa8cc1c483f3a6dddec
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 21:01:11 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 21:01:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a00da32
kde-frameworks/kio: Fix information leak
Revision bump backports upstream patch to fix a information leak when accessing
https when using a malicious PAC file.
https://www.kde.org/info/security/advisory-20170228-1.txt
Gentoo-bug: 611256
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kio/files/kio-5.29.0-sanitize-url.patch | 38 ++++++++++
kde-frameworks/kio/kio-5.29.0-r1.ebuild | 81 ++++++++++++++++++++++
kde-frameworks/kio/kio-5.31.0-r1.ebuild | 81 ++++++++++++++++++++++
3 files changed, 200 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.29.0-sanitize-url.patch b/kde-frameworks/kio/files/kio-5.29.0-sanitize-url.patch
new file mode 100644
index 00000000000..f9f398652d9
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.29.0-sanitize-url.patch
@@ -0,0 +1,38 @@
+commit f9d0cb47cf94e209f6171ac0e8d774e68156a6e4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 28 19:00:48 2017 +0100
+
+ Sanitize URLs before passing them to FindProxyForURL
+
+ Remove user/password information
+ For https: remove path and query
+
+ Thanks to safebreach.com for reporting the problem
+
+ CCMAIL: yoni.fridburg@safebreach.com
+ CCMAIL: amit.klein@safebreach.com
+ CCMAIL: itzik.kotler@safebreach.com
+
+diff --git a/src/kpac/script.cpp b/src/kpac/script.cpp
+index a0235f73..2485c54d 100644
+--- a/src/kpac/script.cpp
++++ b/src/kpac/script.cpp
+@@ -754,9 +754,16 @@ QString Script::evaluate(const QUrl &url)
+ }
+ }
+
++ QUrl cleanUrl = url;
++ cleanUrl.setUserInfo(QString());
++ if (cleanUrl.scheme() == QLatin1String("https")) {
++ cleanUrl.setPath(QString());
++ cleanUrl.setQuery(QString());
++ }
++
+ QScriptValueList args;
+- args << url.url();
+- args << url.host();
++ args << cleanUrl.url();
++ args << cleanUrl.host();
+
+ QScriptValue result = func.call(QScriptValue(), args);
+ if (result.isError()) {
diff --git a/kde-frameworks/kio/kio-5.29.0-r1.ebuild b/kde-frameworks/kio/kio-5.29.0-r1.ebuild
new file mode 100644
index 00000000000..3e102a99165
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.29.0-r1.ebuild
@@ -0,0 +1,81 @@
+# 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 ~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)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-sanitize-url.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kio/kio-5.31.0-r1.ebuild b/kde-frameworks/kio/kio-5.31.0-r1.ebuild
new file mode 100644
index 00000000000..b634e48d89c
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.31.0-r1.ebuild
@@ -0,0 +1,81 @@
+# 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)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.29.0-sanitize-url.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2017-05-17 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2017-05-17 22:08 UTC (permalink / raw
To: gentoo-commits
commit: f1bce2a565cb22376963d4a63d8b566a748c7559
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 16:05:02 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 22:07:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bce2a5
kde-frameworks/kio: Fix major PreviewJob bugs
- Cleanup temp files of failed get()
- Skip remote directories
See also KDE Bug: https://bugs.kde.org/show_bug.cgi?id=208625
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../kio/files/kio-5.34.0-previewjob1.patch | 64 +++++++++++++++++
.../kio/files/kio-5.34.0-previewjob2.patch | 35 ++++++++++
kde-frameworks/kio/kio-5.34.0-r1.ebuild | 81 ++++++++++++++++++++++
3 files changed, 180 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch b/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch
new file mode 100644
index 00000000000..87ba27d807f
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.34.0-previewjob1.patch
@@ -0,0 +1,64 @@
+From 78c45a1ea0e28a98f34c6d113c807f14700b22d4 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 14 May 2017 15:40:02 +0200
+Subject: [PATCH 1/2] PreviewJob: clean up empty temp file when get() fails.
+
+(e.g. because it's a directory)
+
+CCBUG: 208625
+---
+ src/widgets/previewjob.cpp | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index 9eae3469..e836f7da 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -143,6 +143,7 @@ public:
+ void getOrCreateThumbnail();
+ bool statResultThumbnail();
+ void createThumbnail(const QString &);
++ void cleanupTempFile();
+ void determineNextFile();
+ void emitPreview(const QImage &thumb);
+
+@@ -409,6 +410,16 @@ void PreviewJob::setIgnoreMaximumSize(bool ignoreSize)
+ d_func()->ignoreMaximumSize = ignoreSize;
+ }
+
++void PreviewJobPrivate::cleanupTempFile()
++{
++ if (!tempName.isEmpty()) {
++ Q_ASSERT(!QFileInfo(tempName).isDir());
++ Q_ASSERT(QFileInfo(tempName).isFile());
++ QFile::remove(tempName);
++ tempName.clear();
++ }
++}
++
+ void PreviewJobPrivate::determineNextFile()
+ {
+ Q_Q(PreviewJob);
+@@ -491,6 +502,7 @@ void PreviewJob::slotResult(KJob *job)
+ }
+ case PreviewJobPrivate::STATE_GETORIG: {
+ if (job->error()) {
++ d->cleanupTempFile();
+ d->determineNextFile();
+ return;
+ }
+@@ -499,10 +511,7 @@ void PreviewJob::slotResult(KJob *job)
+ return;
+ }
+ case PreviewJobPrivate::STATE_CREATETHUMB: {
+- if (!d->tempName.isEmpty()) {
+- QFile::remove(d->tempName);
+- d->tempName.clear();
+- }
++ d->cleanupTempFile();
+ d->determineNextFile();
+ return;
+ }
+--
+2.13.0
+
diff --git a/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch b/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch
new file mode 100644
index 00000000000..fab4d8825f4
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.34.0-previewjob2.patch
@@ -0,0 +1,35 @@
+From 1620032772465be475ae0746aff63a566ef2a546 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 14 May 2017 15:48:33 +0200
+Subject: [PATCH 2/2] PreviewJob: skip remote directories. Too expensive to
+ preview.
+
+For some protocols, file_copy() would end up copying the whole
+directory locally!
+
+FIXED-IN: 5.35
+BUG: 208625
+---
+ src/widgets/previewjob.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index e836f7da..da50b219 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -599,6 +599,12 @@ void PreviewJobPrivate::getOrCreateThumbnail()
+ createThumbnail(fileUrl.toString());
+ return;
+ }
++ if (item.isDir()) {
++ // Skip remote dirs (bug 208625)
++ cleanupTempFile();
++ determineNextFile();
++ return;
++ }
+ // No plugin support access to this remote content, copy the file
+ // to the local machine, then create the thumbnail
+ state = PreviewJobPrivate::STATE_GETORIG;
+--
+2.13.0
+
diff --git a/kde-frameworks/kio/kio-5.34.0-r1.ebuild b/kde-frameworks/kio/kio-5.34.0-r1.ebuild
new file mode 100644
index 00000000000..da2f973163c
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.34.0-r1.ebuild
@@ -0,0 +1,81 @@
+# 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)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-previewjob{1,2}.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2017-09-30 20:34 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2017-09-30 20:34 UTC (permalink / raw
To: gentoo-commits
commit: abf5278fd06f3e1d88dd3e936c3cc1bc4136b455
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 09:45:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 20:33:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf5278f
kde-frameworks/kio: Fix huge 'file has changed' annoyance
Package-Manager: Portage-2.3.10, Repoman-2.3.3
kde-frameworks/kio/files/kio-5.38.0-kioexec.patch | 87 +++++++++++++++++++++++
kde-frameworks/kio/kio-5.38.0-r1.ebuild | 80 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch b/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
new file mode 100644
index 00000000000..1cf2a1bfb83
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
@@ -0,0 +1,87 @@
+From c76c1486ec79e8a16329207e9b293eed1244adfb Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Mon, 25 Sep 2017 08:56:04 +0100
+Subject: kioexec: Watch the file when it has finished copying
+
+To eliminate a spurious "The file has changed, do you want to upload
+it?" dialogue.
+
+BUG:384500
+
+Differential Revision: https://phabricator.kde.org/D7841
+---
+ src/kioexec/main.cpp | 49 +++++++++++++++++++++++++++----------------------
+ 1 file changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/src/kioexec/main.cpp b/src/kioexec/main.cpp
+index 6b0ec1d..615dfbf 100644
+--- a/src/kioexec/main.cpp
++++ b/src/kioexec/main.cpp
+@@ -118,11 +118,6 @@ KIOExec::KIOExec(const QStringList &args, bool tempFiles, const QString &suggest
+ KIO::Job *job = KIO::file_copy(url, dest);
+ jobList.append(job);
+
+- // Tell kioexecd to watch the file for changes.
+- OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
+- kioexecd.watch(file.path, file.url.toString());
+- mUseDaemon = !kioexecd.lastError().isValid();
+-
+ connect(job, &KJob::result, this, &KIOExec::slotResult);
+ }
+ }
+@@ -141,25 +136,35 @@ KIOExec::KIOExec(const QStringList &args, bool tempFiles, const QString &suggest
+
+ void KIOExec::slotResult(KJob *job)
+ {
+- if (job && job->error()) {
+- // That error dialog would be queued, i.e. not immediate...
+- //job->showErrorDialog();
+- if ((job->error() != KIO::ERR_USER_CANCELED))
+- KMessageBox::error(nullptr, job->errorString());
+-
+- QString path = static_cast<KIO::FileCopyJob*>(job)->destUrl().path();
+-
+- QList<FileInfo>::Iterator it = fileList.begin();
+- for (; it != fileList.end(); ++it) {
+- if (it->path == path) {
+- break;
++ if (job) {
++ KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob *>(job);
++ const QString path = copyJob->destUrl().path();
++
++ if (job->error()) {
++ // That error dialog would be queued, i.e. not immediate...
++ //job->showErrorDialog();
++ if ((job->error() != KIO::ERR_USER_CANCELED))
++ KMessageBox::error(nullptr, job->errorString());
++
++ auto it = std::find_if(fileList.begin(), fileList.end(),
++ [&path](const FileInfo &i) { return (i.path == path); });
++ if (it != fileList.end()) {
++ fileList.erase(it);
++ } else {
++ qDebug() << path << " not found in list";
+ }
+ }
+-
+- if (it != fileList.end()) {
+- fileList.erase(it);
+- } else {
+- qDebug() << path << " not found in list";
++ else
++ {
++ // Tell kioexecd to watch the file for changes.
++ const QString dest = copyJob->srcUrl().toString();
++ qDebug() << "Telling kioexecd to watch path" << path << "dest" << dest;
++ OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
++ kioexecd.watch(path, dest);
++ mUseDaemon = !kioexecd.lastError().isValid();
++ if (!mUseDaemon) {
++ qDebug() << "Not using kioexecd";
++ }
+ }
+ }
+
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/kio/kio-5.38.0-r1.ebuild b/kde-frameworks/kio/kio-5.38.0-r1.ebuild
new file mode 100644
index 00000000000..d20326004df
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.38.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-kioexec.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2017-12-03 12:34 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2017-12-03 12:34 UTC (permalink / raw
To: gentoo-commits
commit: f446e2750787860b4b559ccbcc36a3db0bf5de35
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 12:32:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 12:34:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f446e275
kde-frameworks/kio: Fix testtrash with >=Qt-5.9.3
Incorporating Qt-5.7.1 buildfix from upstream commit a208dc70.
See also: https://phabricator.kde.org/D8837
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch | 40 +++++++++++
kde-frameworks/kio/kio-5.40.0-r3.ebuild | 84 ++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
new file mode 100644
index 00000000000..f3e1112720d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
@@ -0,0 +1,40 @@
+From 05938a167dd4190014d800bb02446e2779a9b3b2 Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Thu, 16 Nov 2017 12:06:41 +0100
+Subject: Fix testtrash with qtbase 5.10 beta 4
+
+Summary:
+Same fix as in D8836, this time for testtrash.
+
+Test Plan:
+Run testtrash.
+
+Reviewed By: dfaure
+
+Differential Revision: https://phabricator.kde.org/D8837
+
+*asturm: Fix build with Qt-5.7.1
+---
+ src/core/listjob.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp
+index 4b7b510..54a422a 100644
+--- a/src/core/listjob.cpp
++++ b/src/core/listjob.cpp
+@@ -117,7 +117,11 @@ void ListJobPrivate::slotListEntries(const KIO::UDSEntryList &list)
+ itemURL = q->url();
+ filename = entry.stringValue(KIO::UDSEntry::UDS_NAME);
+ Q_ASSERT(!filename.isEmpty()); // we'll recurse forever otherwise :)
+- itemURL.setPath(itemURL.path() + '/' + filename);
++ if (itemURL.path() == QLatin1String("/")) {
++ itemURL.setPath(itemURL.path() + filename);
++ } else {
++ itemURL.setPath(itemURL.path() + '/' + filename);
++ }
+ }
+
+ if (entry.isDir() && !entry.isLink()) {
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/kio/kio-5.40.0-r3.ebuild b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
new file mode 100644
index 00000000000..8429d9c0378
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.40.0-r3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+ $(add_qt_dep qtconcurrent)
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-mkpath-qt-5.9.3.patch"
+ "${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch"
+ "${FILESDIR}/${P}-testtrash-qt-5.9.3.patch"
+)
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2018-07-21 16:51 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2018-07-21 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 744ce06a14601c888a2e9f4cd2a3049c69a98153
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 16:14:04 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 16:35:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744ce06a
kde-frameworks/kio: Fix memleak in slave jobs
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=396651
Package-Manager: Portage-2.3.43, Repoman-2.3.10
kde-frameworks/kio/files/kio-5.48.0-memleak.patch | 65 ++++++++++++++++++
kde-frameworks/kio/kio-5.48.0-r1.ebuild | 81 +++++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.48.0-memleak.patch b/kde-frameworks/kio/files/kio-5.48.0-memleak.patch
new file mode 100644
index 00000000000..2245c976b8a
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.48.0-memleak.patch
@@ -0,0 +1,65 @@
+From 021daba60fafdf304b1079a705de900c431bb579 Mon Sep 17 00:00:00 2001
+From: Jaime Torres <jtamate@gmail.com>
+Date: Sat, 21 Jul 2018 13:43:35 +0200
+Subject: avoid memory leak in slave jobs
+
+Summary:
+Making ~SlaveInterface virtual, the connection created in Slave constructor is now deleted. (thanks @dfaure).
+Changed to new connect syntax.
+
+BUG: 396651
+
+Test Plan:
+The leaks of the bug report are gone.
+
+Reviewers: dfaure, #frameworks, ngraham
+
+Reviewed By: dfaure
+
+Subscribers: anthonyfieroni, apol, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D14253
+---
+ src/core/slave.cpp | 4 ++--
+ src/core/slaveinterface_p.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/slave.cpp b/src/core/slave.cpp
+index 9402b44..7823d73 100644
+--- a/src/core/slave.cpp
++++ b/src/core/slave.cpp
+@@ -171,7 +171,7 @@ void Slave::accept()
+ d->slaveconnserver->deleteLater();
+ d->slaveconnserver = nullptr;
+
+- connect(d->connection, SIGNAL(readyRead()), SLOT(gotInput()));
++ connect(d->connection, &Connection::readyRead, this, &Slave::gotInput);
+ }
+
+ void Slave::timeout()
+@@ -218,7 +218,7 @@ Slave::Slave(const QString &protocol, QObject *parent)
+ Q_D(Slave);
+ d->slaveconnserver->setParent(this);
+ d->connection = new Connection(this);
+- connect(d->slaveconnserver, SIGNAL(newConnection()), SLOT(accept()));
++ connect(d->slaveconnserver, &ConnectionServer::newConnection, this, &Slave::accept);
+ }
+
+ Slave::~Slave()
+diff --git a/src/core/slaveinterface_p.h b/src/core/slaveinterface_p.h
+index 4ed1f36..a4cb5d3 100644
+--- a/src/core/slaveinterface_p.h
++++ b/src/core/slaveinterface_p.h
+@@ -42,7 +42,7 @@ public:
+ nums(0), slave_calcs_speed(false)
+ {
+ }
+- ~SlaveInterfacePrivate()
++ virtual ~SlaveInterfacePrivate()
+ {
+ delete connection;
+ }
+--
+cgit v0.11.2
diff --git a/kde-frameworks/kio/kio-5.48.0-r1.ebuild b/kde-frameworks/kio/kio-5.48.0-r1.ebuild
new file mode 100644
index 00000000000..43bb9151a5a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.48.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 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 kauth)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork 'ssl')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? ( $(add_frameworks_dep kdoctools) )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( $(add_frameworks_dep kwallet) )
+ X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+ $(add_qt_dep qtconcurrent)
+ test? ( sys-libs/zlib )
+ X? (
+ x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXrender
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+
+PATCHES=( "${FILESDIR}/${P}-memleak.patch" )
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl ACL)
+ $(cmake-utils_use_find_package handbook KF5DocTools)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2019-01-16 12:50 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 12:50 UTC (permalink / raw
To: gentoo-commits
commit: dae24feb79e12d8279f940ed5131077bbd0c05f5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 12:49:50 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 12:49:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae24feb
kde-frameworks/kio: Drop 5.54.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
kde-frameworks/kio/Manifest | 1 -
.../kio/files/kio-5.54.0-elapsedtime.patch | 38 ----------
kde-frameworks/kio/kio-5.54.0.ebuild | 83 ----------------------
3 files changed, 122 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index e372e00cd8c..2e609215b01 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc SHA512 b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36
-DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d
DIST kio-5.54.1.tar.xz 3150348 BLAKE2B c72f2e798f50605ac18778204615181013bfba8f33960f5cb78991a8df0e3b1484e6d7b94c74cea088318f7ace00950222ef70e5c854c35b60475f18c7d6d9b7 SHA512 750508355265f1ec68049a36c6b6fba0afcd55f2d787a6fb199d6b0fd933da6db420218fa8504a66fbe90cbf29be78c5a3d22d1771eb5aaa284d0c9120ebb059
diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
deleted file mode 100644
index d18347fb63d..00000000000
--- a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 10 Jan 2019 16:03:06 +0000
-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
deleted file mode 100644
index 3256957d5aa..00000000000
--- a/kde-frameworks/kio/kio-5.54.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-
-# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0
-RDEPEND="
- $(add_frameworks_dep kauth)
- $(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 kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork 'ssl' '' '5=')
- $(add_qt_dep qtscript)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/libxml2
- dev-libs/libxslt
- acl? (
- sys-apps/attr
- virtual/acl
- )
- handbook? ( $(add_frameworks_dep kdoctools) )
- kerberos? ( virtual/krb5 )
- kwallet? ( $(add_frameworks_dep kwallet) )
- X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
- $(add_qt_dep qtconcurrent)
- test? ( sys-libs/zlib )
- X? (
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND="
- $(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package acl ACL)
- $(cmake-utils_use_find_package handbook KF5DocTools)
- $(cmake-utils_use_find_package kerberos GSSAPI)
- $(cmake-utils_use_find_package kwallet KF5Wallet)
- $(cmake-utils_use_find_package X X11)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2020-05-16 22:38 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2020-05-16 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 4af12cb992b4157ac9178fdf2d719f2793ba890e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 20:13:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 16 22:38:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af12cb9
kde-frameworks/kio: Re-add 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 <asturm <AT> gentoo.org>
.../kio/files/kio-5.70.0-fix-run-in-terminal.patch | 89 ++++++++++++++++++++++
.../{kio-5.70.1.ebuild => kio-5.70.1-r1.ebuild} | 2 +
2 files changed, 91 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 00000000000..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 <jjm@keelhaul.me.uk>
+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 &service, const QList<QUrl> &
+ 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 &service, const QList<QUrl> &
+ return;
+ }
+
+- 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;
+- }
+ //qDebug() << "KProcess args=" << args;
+ *m_process << args;
+
+--
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.70.1.ebuild b/kde-frameworks/kio/kio-5.70.1-r1.ebuild
similarity index 97%
rename from kde-frameworks/kio/kio-5.70.1.ebuild
rename to kde-frameworks/kio/kio-5.70.1-r1.ebuild
index 52bbb2edc06..3d318fa6d30 100644
--- a/kde-frameworks/kio/kio-5.70.1.ebuild
+++ b/kde-frameworks/kio/kio-5.70.1-r1.ebuild
@@ -71,6 +71,8 @@ PDEPEND="
# tests hang
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${PN}-5.70.0-fix-run-in-terminal.patch )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package acl ACL)
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2020-09-29 12:49 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 017d20b8f56c2cc9279558f3363d35816fd5c7d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 22:38:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 12:46:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017d20b8
kde-frameworks/kio: kio_trash: remove too strict permission check
Fixes an upstream Gentoo user report from 2004.
Upstream commit 03bcb3d3ff89074a68839b6ebeb8030ef0ee4fd1
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=76380
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...o-5.74.1-kio_trash-too-strict-perms-check.patch | 67 +++++++++++++++
kde-frameworks/kio/kio-5.74.1-r1.ebuild | 96 ++++++++++++++++++++++
2 files changed, 163 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch b/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
new file mode 100644
index 00000000000..d0b0ca0769c
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
@@ -0,0 +1,67 @@
+From 03bcb3d3ff89074a68839b6ebeb8030ef0ee4fd1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 11 Sep 2020 11:54:09 +0200
+Subject: [PATCH] kio_trash: remove unnecessarily strict permission check
+
+Tested with `chmod 0770 /d/.Trash-1000` (where /d is a mount point),
+kio_trash complained about security checks before this commit,
+and works with it.
+
+Also tested with a USB key which ends up mounted as
+type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=100,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks2). After kio_trash creates .Trash-1000
+it complained about a "strange filesystem", and while this is still true :),
+the removal of the code in TrashImpl::initTrashDirectory makes
+the trash dir on the USB key usable.
+
+BUG: 76380
+FIXED-IN: 5.74
+---
+ src/ioslaves/trash/trashimpl.cpp | 25 ++++---------------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/src/ioslaves/trash/trashimpl.cpp b/src/ioslaves/trash/trashimpl.cpp
+index b1ba87a4..9ec7cc7a 100644
+--- a/src/ioslaves/trash/trashimpl.cpp
++++ b/src/ioslaves/trash/trashimpl.cpp
+@@ -1210,9 +1210,9 @@ QString TrashImpl::trashForMountPoint(const QString &topdir, bool createIfNeeded
+ const QByteArray trashDir_c = QFile::encodeName(trashDir);
+ if (QT_LSTAT(trashDir_c.constData(), &buff) == 0) {
+ if ((buff.st_uid == uid) // must be owned by user
+- && (S_ISDIR(buff.st_mode)) // must be a dir
+- && (!S_ISLNK(buff.st_mode)) // not a symlink
+- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, ------ for group and others
++ && S_ISDIR(buff.st_mode) // must be a dir
++ && !S_ISLNK(buff.st_mode) // not a symlink
++ && ((buff.st_mode & 0700) == 0700)) { // and we need write access to it
+
+ if (checkTrashSubdirs(trashDir_c)) {
+ return trashDir;
+@@ -1248,24 +1248,7 @@ bool TrashImpl::initTrashDirectory(const QByteArray &trashDir_c) const
+ return false;
+ }
+ //qCDebug(KIO_TRASH);
+- // This trash dir will be useable only if the directory is owned by user.
+- // In theory this is the case, but not on e.g. USB keys...
+- uid_t uid = getuid();
+- QT_STATBUF buff;
+- if (QT_LSTAT(trashDir_c.constData(), &buff) != 0) {
+- return false; // huh?
+- }
+- if ((buff.st_uid == uid) // must be owned by user
+- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, --- for group and others
+-
+- return checkTrashSubdirs(trashDir_c);
+-
+- } else {
+- qCWarning(KIO_TRASH) << trashDir_c << "just created, by it doesn't have the right permissions, probably some strange unsupported filesystem";
+- ::rmdir(trashDir_c.constData());
+- return false;
+- }
+- return true;
++ return checkTrashSubdirs(trashDir_c);
+ }
+
+ bool TrashImpl::checkTrashSubdirs(const QByteArray &trashDir_c) const
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.74.1-r1.ebuild b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
new file mode 100644
index 00000000000..8ba617db566
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
@@ -0,0 +1,96 @@
+# 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.14.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"
+
+# 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="
+ >=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-kio_trash-too-strict-perms-check.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2020-11-16 23:41 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2020-11-16 23:41 UTC (permalink / raw
To: gentoo-commits
commit: 9ec8e2b3e611fbb2a32e28c634b01711c89d114a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 23:18:08 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 23:40:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec8e2b3
kde-frameworks/kio: drop 5.75.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
...io-5.75.0-fix-special-char-file-selection.patch | 201 ---------------------
kde-frameworks/kio/kio-5.75.0-r1.ebuild | 96 ----------
3 files changed, 298 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 056646dc0b3..9316ae4d377 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.74.1.tar.xz 3281248 BLAKE2B 584fde1483477b70ee7892bf0de37aedb62672c2ada57d85c9646894606f10b6a03750030e1926441707b12b18ece167fa3a0dbbb75a8155bddfd35342d372f8 SHA512 a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2
-DIST kio-5.75.0.tar.xz 3277424 BLAKE2B ac7d4dafb00ca2c16ddbb6a45d0a5e07d61f5d0a9c2d2b26a8347dee7ff23fabdec2184437e7ad14f02c1def3af5778b599d64e0eff3780ae93aca0a9b43896c SHA512 028e4de5897fb61fda7bf80b0d2ccb022bb7df936648ba3429623708b108df8081bf1b0f416097c3658d1cd4b1a96757010d32ab5a9b382195b6915040ed5a06
DIST kio-5.76.0.tar.xz 3301808 BLAKE2B 4bb2c7c1d2867155ca35bf9c3b80cef7e96e8ca651adb2fc46d5e7beca44c80e440a7ee2f6caf1f1cacfec15e9c4997f86fa66dc6efed45d99804f8c285de6a9 SHA512 3b7167b7452629ef6f43bf52cf1e1d11daae36dd9a7a0f22844ea08f362e1e40f14ea1983fcf7e10bf12c40fdfcfee9f3eef66b73bd2f34a83d9dd37de23f869
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
deleted file mode 100644
index 74ffc55207d..00000000000
--- a/kde-frameworks/kio/files/kio-5.75.0-fix-special-char-file-selection.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 4321b8ff8ac7a8ffdea1068d8bbc734a0a34c0d0 Mon Sep 17 00:00:00 2001
-From: Andreas Bontozoglou <a.bontozoglou@gmail.com>
-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 <QAbstractItemView>
- #include <QDropEvent>
- #include <QMimeData>
-+#include <QStringList>
- #include <QStringLiteral>
- #include <QList>
- #include <QUrl>
-@@ -530,58 +531,62 @@ private Q_SLOTS:
- }
-
- void testTokenize_data()
-- {
-- // Real filename (as in how they are stored in the fs)
-- QTest::addColumn<QList<QString>>("fileNames");
-+ {
-+ // Real filename (as in how they are stored in the fs)
-+ QTest::addColumn<QStringList>("fileNames");
- // Escaped value of the text-box in the dialog
- QTest::addColumn<QString>("expectedCurrentText");
-
-- QTest::newRow("simple") << QList<QString>{"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<QString>{"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<QString>{"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<QString>{"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<QString>{"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<QString>{"test\\backslash"}
-+ << QStringList{"test\\backslash"}
- << QString("test\\\\backslash");
-
- QTest::newRow("backslash-multi-file")
-- << QList<QString>{"test\\back\\slash", "test"}
-+ << QStringList{"test\\back\\slash", "test"}
- << QString("\"test\\\\back\\\\slash\" \"test\"");
-
- QTest::newRow("double-backslash-multi-file")
-- << QList<QString>{"test\\\\back\\slash", "test"}
-+ << QStringList{"test\\\\back\\slash", "test"}
- << QString("\"test\\\\\\\\back\\\\slash\" \"test\"");
-
- QTest::newRow("double-backslash-end")
-- << QList<QString>{"test\\\\"}
-+ << QStringList{"test\\\\"}
- << QString("test\\\\\\\\");
-
- QTest::newRow("single-backslash-end")
-- << QList<QString>{"some thing", "test\\"}
-+ << QStringList{"some thing", "test\\"}
- << QString("\"some thing\" \"test\\\\\"");
-
-+ QTest::newRow("sharp")
-+ << QStringList{"some#thing"}
-+ << QString("some#thing");
-+
- }
-
- void testTokenize()
-@@ -589,7 +594,7 @@ private Q_SLOTS:
- // We will use setSelectedUrls([QUrl]) here in order to check correct
- // filename escaping. Afterwards we will accept() the dialog to confirm
- // correct result
-- QFETCH(QList<QString>, fileNames);
-+ QFETCH(QStringList, fileNames);
- QFETCH(QString, expectedCurrentText);
-
- QTemporaryDir tempDir;
-diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp
-index 1bbf3e58..32ca0617 100644
---- a/src/filewidgets/kfilewidget.cpp
-+++ b/src/filewidgets/kfilewidget.cpp
-@@ -789,8 +789,8 @@ static QString relativePathOrUrl(const QUrl &baseUrl, const QUrl &url);
- /**
- * Escape the given Url so that is fit for use in the selected list of file. This
- * mainly handles double quote (") characters. These are used to separate entries
-- * in the list, however, if `"` appears in the filename (or path), this will be
-- * escaped as `\"`. Later, the tokenizer is able to understand the difference
-+ * in the list, however, if `"` appears in the filename (or path), this will be
-+ * escaped as `\"`. Later, the tokenizer is able to understand the difference
- * and do the right thing
- */
- static QString escapeDoubleQuotes(QString && path);
-@@ -1623,7 +1623,7 @@ void KFileWidget::setSelectedUrl(const QUrl &url)
- }
-
- void KFileWidget::setSelectedUrls(const QList<QUrl> &urls)
--{
-+{
- if (urls.isEmpty()) {
- return;
- }
-@@ -1717,7 +1717,7 @@ QList<QUrl> KFileWidget::selectedUrls() const
-
- QList<QUrl> KFileWidgetPrivate::tokenize(const QString &line) const
- {
-- qCDebug(KIO_KFILEWIDGETS_FW) << "Tokenizing:" << line;
-+ qCDebug(KIO_KFILEWIDGETS_FW) << "Tokenizing:" << line;
-
- QList<QUrl> urls;
- QUrl u(ops->url().adjusted(QUrl::RemoveFilename));
-@@ -1727,15 +1727,21 @@ QList<QUrl> KFileWidgetPrivate::tokenize(const QString &line) const
-
- // A helper that creates, validates and appends a new url based
- // on the given filename.
-- auto addUrl = [u, &urls](const QString & partial_name)
-- {
-+ auto addUrl = [u, &urls](const QString &partial_name)
-+ {
- if (partial_name.trimmed().isEmpty()) {
- return;
- }
-
-+ // We have to use setPath here, so that something like "test#file"
-+ // isn't interpreted to have path "test" and fragment "file".
-+ QUrl partial_url;
-+ partial_url.setPath(partial_name);
-+
- // This returns QUrl(partial_name) for absolute URLs.
- // Otherwise, returns the concatenated url.
-- QUrl finalUrl = u.resolved(QUrl(partial_name));
-+ const QUrl finalUrl = u.resolved(partial_url);
-+
- if (finalUrl.isValid()) {
- urls.append(finalUrl);
- } else {
-@@ -1758,7 +1764,7 @@ QList<QUrl> KFileWidgetPrivate::tokenize(const QString &line) const
- escape = false;
- continue;
- }
--
-+
- // Handle escape start
- if (ch.toLatin1() == '\\') {
- escape = true;
-@@ -1777,15 +1783,14 @@ QList<QUrl> KFileWidgetPrivate::tokenize(const QString &line) const
- partial_name += ch;
- }
-
-- // Handle the last item which is buffered in
-- // partial_name. This is required for single-file
-- // selection dialogs since the name will not be
-- // wrapped in quotes
-+ // Handle the last item which is buffered in partial_name. This is
-+ // required for single-file selection dialogs since the name will not
-+ // be wrapped in quotes
- if (!partial_name.isEmpty()) {
- addUrl(partial_name);
- partial_name.clear();
- }
--
-+
- return urls;
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.75.0-r1.ebuild b/kde-frameworks/kio/kio-5.75.0-r1.ebuild
deleted file mode 100644
index 310bd84b0a4..00000000000
--- a/kde-frameworks/kio/kio-5.75.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.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"
-
-# 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="
- >=kde-frameworks/kded-${PVCUT}:5
-"
-
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-special-char-file-selection.patch )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2020-12-23 21:32 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2020-12-23 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 4aad45800cd19d30050ebc9eb5c39fe94ca4436c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 21:16:41 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 21:32:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aad4580
kde-frameworks/kio: Crash fix
Upstream commit 9dc9e26b9196111eeacb5609b36957f74f5a14c4
See also: https://mail.kde.org/pipermail/distributions/2020-December/000913.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430374
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/files/kio-5.77.0-crashfix.patch | 29 +++++++
kde-frameworks/kio/kio-5.77.0-r1.ebuild | 96 ++++++++++++++++++++++
2 files changed, 125 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
new file mode 100644
index 00000000000..d24a0d976c0
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
@@ -0,0 +1,29 @@
+From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
+From: Ismael Asensio <isma.af@gmail.com>
+Date: Tue, 22 Dec 2020 22:23:17 +0100
+Subject: [PATCH] RenameDialog: Add missing nullptr initialization
+
+It fixes a crash when pressing `Apply to All` in those cases where
+the action was not present, as the code checks for nullptr
+
+BUG: 430374
+FIXED-IN: 5.78
+---
+ src/widgets/renamedialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
+index ac1d91d2..c3e04753 100644
+--- a/src/widgets/renamedialog.cpp
++++ b/src/widgets/renamedialog.cpp
+@@ -161,6 +161,7 @@ public:
+ bCancel = nullptr;
+ bRename = bSkip = nullptr;
+ bOverwrite = nullptr;
++ bOverwriteWhenOlder = nullptr;
+ bResume = bSuggestNewName = nullptr;
+ bApplyAll = nullptr;
+ m_pLineEdit = nullptr;
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
new file mode 100644
index 00000000000..5089ee6dac2
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
@@ -0,0 +1,96 @@
+# 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.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"
+
+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
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-01-11 12:28 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-01-11 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 6a8a378f224cc8a3150bd44af80ec5ccf8363053
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 09:58:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 12:28:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8a378f
kde-frameworks/kio: Drop 5.74.1-r2
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
...o-5.74.1-handle-shell-scripts-consistenty.patch | 310 ---------------------
...o-5.74.1-kio_trash-too-strict-perms-check.patch | 67 -----
kde-frameworks/kio/kio-5.74.1-r2.ebuild | 98 -------
4 files changed, 476 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 5b113e00c77..2358f4820c7 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.74.1.tar.xz 3281248 BLAKE2B 584fde1483477b70ee7892bf0de37aedb62672c2ada57d85c9646894606f10b6a03750030e1926441707b12b18ece167fa3a0dbbb75a8155bddfd35342d372f8 SHA512 a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2
DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
DIST kio-5.78.0.tar.xz 3308004 BLAKE2B b21cdde13013d7a3df91e821c8562df650b727e521b6552e9875c9aa74a97bb8b8b4a1d8b8cfd8f7d2c2eb68989ba2b7efc0fe77d46e57759e34ac1b39f9999c SHA512 55996a35f77442f3cc2ff98708da6dfd2734b0afffd7b3b90b5b2845c9770f3ec68a1e4e72d21b1c4e41d06778ab376b96ab64d958c89dd4f8b7fad6501a5db7
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
deleted file mode 100644
index f5e17f338fd..00000000000
--- a/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From fdd7c47c85d5d6dbf21e05e7a0d6afcf383f1d24 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-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<QString>("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 OpenUrlJobTest::refuseRunningRemoteNativeExecutables_data()
-+{
-+ QTest::addColumn<QString>("mimeType");
-+ QTest::newRow("x-sharedlib") << "application/x-sharedlib";
-+ QTest::newRow("x-executable") << "application/x-executable";
-+}
-+
- void OpenUrlJobTest::refuseRunningRemoteNativeExecutables()
- {
-- KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl("protocol://host/path/exe"), QStringLiteral("application/x-executable"), this);
-+ QFETCH(QString, mimeType);
-+
-+ KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl("protocol://host/path/exe"), mimeType, this);
- job->setRunExecutables(true); // even with this enabled, an error will occur
- QVERIFY(!job->exec());
- QCOMPARE(job->error(), KJob::UserDefinedError);
-@@ -273,8 +293,11 @@ void OpenUrlJobTest::runScript_data()
- {
- QTest::addColumn<QString>("mimeType");
-
-+ // All text-based scripts inherit text/plain and application/x-executable, no need to test
-+ // all flavours (python, perl, lua, awk ...etc), this sample should be enough
- QTest::newRow("shellscript") << "application/x-shellscript";
-- QTest::newRow("native") << "application/x-executable";
-+ QTest::newRow("pythonscript") << "text/x-python";
-+ QTest::newRow("javascript") << "application/javascript";
- }
-
- void OpenUrlJobTest::runScript()
-@@ -305,16 +328,23 @@ void OpenUrlJobTest::runScript()
-
- void OpenUrlJobTest::runNativeExecutable_data()
- {
-+ QTest::addColumn<QString>("mimeType");
- QTest::addColumn<bool>("withHandler");
- QTest::addColumn<bool>("handlerRetVal");
-
-- QTest::newRow("no_handler") << false << false;
-- QTest::newRow("handler_false") << true << false;
-- QTest::newRow("handler_true") << true << true;
-+ QTest::newRow("no_handler_x-sharedlib") << "application/x-sharedlib" << false << false;
-+ QTest::newRow("handler_false_x-sharedlib") << "application/x-sharedlib" << true << false;
-+ QTest::newRow("handler_true_x-sharedlib") << "application/x-sharedlib" << true << true;
-+
-+ QTest::newRow("no_handler_x-executable") << "application/x-executable" << false << false;
-+ QTest::newRow("handler_false_x-executable") << "application/x-executable" << true << false;
-+ QTest::newRow("handler_true_x-executable") << "application/x-executable" << true << true;
-+
- }
-
- void OpenUrlJobTest::runNativeExecutable()
- {
-+ QFETCH(QString, mimeType);
- QFETCH(bool, withHandler);
- QFETCH(bool, handlerRetVal);
-
-@@ -335,7 +365,7 @@ void OpenUrlJobTest::runNativeExecutable()
- KIO::setDefaultUntrustedProgramHandler(withHandler ? &s_handler : nullptr);
-
- // When using OpenUrlJob to run the executable
-- KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(scriptFile), QStringLiteral("application/x-executable"), this);
-+ KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(scriptFile), mimeType, this);
- job->setRunExecutables(true); // startProcess tests the case where this isn't set
- const bool success = job->exec();
-
-diff --git a/autotests/openurljobtest.h b/autotests/openurljobtest.h
-index e71987d9..f5b9a5be 100644
---- a/autotests/openurljobtest.h
-+++ b/autotests/openurljobtest.h
-@@ -26,7 +26,9 @@ private Q_SLOTS:
-
- void noServiceNoHandler();
- void invalidUrl();
-+ void refuseRunningNativeExecutables_data();
- void refuseRunningNativeExecutables();
-+ void refuseRunningRemoteNativeExecutables_data();
- void refuseRunningRemoteNativeExecutables();
- void notAuthorized();
- void runScript_data();
-diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp
-index 8ac187b4..3e35c95c 100644
---- a/src/gui/openurljob.cpp
-+++ b/src/gui/openurljob.cpp
-@@ -73,9 +73,9 @@ public:
-
- private:
- void executeCommand();
-- void handleExecutables(const QMimeType &mimeType);
-+ void handleBinaries(const QMimeType &mimeType);
- void handleDesktopFiles();
-- void handleShellscripts();
-+ void handleScripts();
- void openInPreferredApp();
- void runLink(const QString &filePath, const QString &urlStr, const QString &optionalServiceName);
-
-@@ -439,14 +439,29 @@ void KIO::OpenUrlJobPrivate::emitAccessDenied()
- q->emitResult();
- }
-
--// was: KRun::isExecutable (minus application/x-desktop and application/x-shellscript mimetypes).
-+// was: KRun::isExecutable (minus application/x-desktop mimetype).
- // Feel free to make public if needed.
--static bool isExecutableMime(const QMimeType &mimeType)
-+static bool isBinary(const QMimeType &mimeType)
- {
-- return (mimeType.inherits(QStringLiteral("application/x-executable")) ||
-- /* e.g. /usr/bin/ls, see https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11 */
-- mimeType.inherits(QStringLiteral("application/x-sharedlib")) ||
-- mimeType.inherits(QStringLiteral("application/x-ms-dos-executable")));
-+ // - Binaries could be e.g.:
-+ // - application/x-executable
-+ // - application/x-sharedlib e.g. /usr/bin/ls, see
-+ // https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11
-+ //
-+ // - Mimetypes that inherit application/x-executable _and_ text/plain are scripts, these are
-+ // handled by handleScripts()
-+
-+ return (mimeType.inherits(QStringLiteral("application/x-executable"))
-+ || mimeType.inherits(QStringLiteral("application/x-sharedlib"))
-+ || mimeType.inherits(QStringLiteral("application/x-ms-dos-executable")));
-+}
-+
-+// Helper function that returns whether a file is a text-based script
-+// e.g. ".sh", ".csh", ".py", ".js"
-+static bool isTextScript(const QMimeType &mimeType)
-+{
-+ return (mimeType.inherits(QStringLiteral("application/x-executable"))
-+ && mimeType.inherits(QStringLiteral("text/plain")));
- }
-
- // Helper function that returns whether a file has the execute bit set or not.
-@@ -456,7 +471,7 @@ static bool hasExecuteBit(const QString &fileName)
- }
-
- // Handle native binaries (.e.g. /usr/bin/*); and .exe files
--void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
-+void KIO::OpenUrlJobPrivate::handleBinaries(const QMimeType &mimeType)
- {
- if (!KAuthorized::authorize(QStringLiteral("shell_access"))) {
- emitAccessDenied();
-@@ -475,11 +490,9 @@ void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
-
- const QString localPath = m_url.toLocalFile();
-
-- // Check whether file is an executable script
--#ifdef Q_OS_WIN
-- const bool isNativeBinary = !mimeType.inherits(QStringLiteral("text/plain"));
--#else
-- const bool isNativeBinary = !mimeType.inherits(QStringLiteral("text/plain")) && !mimeType.inherits(QStringLiteral("application/x-ms-dos-executable"));
-+ bool isNativeBinary = true;
-+#ifndef Q_OS_WIN
-+ isNativeBinary = !mimeType.inherits(QStringLiteral("application/x-ms-dos-executable"));
- #endif
-
- if (m_showOpenOrExecuteDialog) {
-@@ -497,6 +510,8 @@ void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
- }
- };
-
-+ // Ask the user for confirmation before executing this binary (for binaries
-+ // the dialog will only show Execute/Cancel)
- showOpenOrExecuteFileDialog(dialogFinished);
- return;
- }
-@@ -601,15 +616,15 @@ void KIO::OpenUrlJobPrivate::runUrlWithMimeType()
- return;
- }
-
-- // Shell scripts
-- if (mimeType.inherits(QStringLiteral("application/x-shellscript"))) {
-- handleShellscripts();
-+ // Scripts (e.g. .sh, .csh, .py, .js)
-+ if (isTextScript(mimeType)) {
-+ handleScripts();
- return;
- }
-
-- // Binaries (e.g. /usr/bin/konsole) and .exe files
-- if (isExecutableMime(mimeType)) {
-- handleExecutables(mimeType);
-+ // Binaries (e.g. /usr/bin/{konsole,ls}) and .exe files
-+ if (isBinary(mimeType)) {
-+ handleBinaries(mimeType);
- return;
- }
-
-@@ -677,8 +692,9 @@ void KIO::OpenUrlJobPrivate::handleDesktopFiles()
- openInPreferredApp();
- }
-
--void KIO::OpenUrlJobPrivate::handleShellscripts()
-+void KIO::OpenUrlJobPrivate::handleScripts()
- {
-+ // Executable scripts of any type can run arbitrary shell commands
- if (!KAuthorized::authorize(QStringLiteral("shell_access"))) {
- emitAccessDenied();
- return;
-@@ -687,8 +703,7 @@ void KIO::OpenUrlJobPrivate::handleShellscripts()
- const bool isLocal = m_url.isLocalFile();
- const QString localPath = m_url.toLocalFile();
- if (!isLocal || !hasExecuteBit(localPath)) {
-- // Open remote shell scripts or ones without the execute bit, with the
-- // default application
-+ // Open remote scripts or ones without the execute bit, with the default application
- openInPreferredApp();
- return;
- }
-@@ -706,7 +721,7 @@ void KIO::OpenUrlJobPrivate::handleShellscripts()
- return;
- }
-
-- if (m_runExecutables) { // Local executable shell script, proceed
-+ if (m_runExecutables) { // Local executable script, proceed
- executeCommand();
- } else { // Open in the default (text editor) app
- openInPreferredApp();
-@@ -767,7 +782,7 @@ void KIO::OpenUrlJobPrivate::showOpenOrExecuteFileDialog(std::function<void(bool
-
- if (!s_openOrExecuteFileHandler) {
- // No way to ask the user whether to execute or open
-- if (mimeType.inherits(QStringLiteral("application/x-shellscript"))
-+ if (isTextScript(mimeType)
- || mimeType.inherits(QStringLiteral("application/x-desktop"))) { // Open text-based ones in the default app
- openInPreferredApp();
- } else {
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch b/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
deleted file mode 100644
index d0b0ca0769c..00000000000
--- a/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 03bcb3d3ff89074a68839b6ebeb8030ef0ee4fd1 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Fri, 11 Sep 2020 11:54:09 +0200
-Subject: [PATCH] kio_trash: remove unnecessarily strict permission check
-
-Tested with `chmod 0770 /d/.Trash-1000` (where /d is a mount point),
-kio_trash complained about security checks before this commit,
-and works with it.
-
-Also tested with a USB key which ends up mounted as
-type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=100,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks2). After kio_trash creates .Trash-1000
-it complained about a "strange filesystem", and while this is still true :),
-the removal of the code in TrashImpl::initTrashDirectory makes
-the trash dir on the USB key usable.
-
-BUG: 76380
-FIXED-IN: 5.74
----
- src/ioslaves/trash/trashimpl.cpp | 25 ++++---------------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/src/ioslaves/trash/trashimpl.cpp b/src/ioslaves/trash/trashimpl.cpp
-index b1ba87a4..9ec7cc7a 100644
---- a/src/ioslaves/trash/trashimpl.cpp
-+++ b/src/ioslaves/trash/trashimpl.cpp
-@@ -1210,9 +1210,9 @@ QString TrashImpl::trashForMountPoint(const QString &topdir, bool createIfNeeded
- const QByteArray trashDir_c = QFile::encodeName(trashDir);
- if (QT_LSTAT(trashDir_c.constData(), &buff) == 0) {
- if ((buff.st_uid == uid) // must be owned by user
-- && (S_ISDIR(buff.st_mode)) // must be a dir
-- && (!S_ISLNK(buff.st_mode)) // not a symlink
-- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, ------ for group and others
-+ && S_ISDIR(buff.st_mode) // must be a dir
-+ && !S_ISLNK(buff.st_mode) // not a symlink
-+ && ((buff.st_mode & 0700) == 0700)) { // and we need write access to it
-
- if (checkTrashSubdirs(trashDir_c)) {
- return trashDir;
-@@ -1248,24 +1248,7 @@ bool TrashImpl::initTrashDirectory(const QByteArray &trashDir_c) const
- return false;
- }
- //qCDebug(KIO_TRASH);
-- // This trash dir will be useable only if the directory is owned by user.
-- // In theory this is the case, but not on e.g. USB keys...
-- uid_t uid = getuid();
-- QT_STATBUF buff;
-- if (QT_LSTAT(trashDir_c.constData(), &buff) != 0) {
-- return false; // huh?
-- }
-- if ((buff.st_uid == uid) // must be owned by user
-- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, --- for group and others
--
-- return checkTrashSubdirs(trashDir_c);
--
-- } else {
-- qCWarning(KIO_TRASH) << trashDir_c << "just created, by it doesn't have the right permissions, probably some strange unsupported filesystem";
-- ::rmdir(trashDir_c.constData());
-- return false;
-- }
-- return true;
-+ return checkTrashSubdirs(trashDir_c);
- }
-
- bool TrashImpl::checkTrashSubdirs(const QByteArray &trashDir_c) const
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.74.1-r2.ebuild b/kde-frameworks/kio/kio-5.74.1-r2.ebuild
deleted file mode 100644
index e332fd74357..00000000000
--- a/kde-frameworks/kio/kio-5.74.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.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"
-
-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
-"
-
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-kio_trash-too-strict-perms-check.patch
- "${FILESDIR}"/${P}-handle-shell-scripts-consistenty.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-01-24 13:02 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-01-24 13:02 UTC (permalink / raw
To: gentoo-commits
commit: beabe660dec13ac95cf9c5d06a43a2a10065836b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 09:23:19 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 12:57:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beabe660
kde-frameworks/kio: Fix build with GCC-11
Upstream commit 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092
Thanks-to: Geoff Leach <gl <AT> cs.rmit.edu.au>
Closes: https://bugs.gentoo.org/766480
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/files/kio-5.77.0-gcc11.patch | 32 +++++++++++++++++++++++++
kde-frameworks/kio/kio-5.77.0-r1.ebuild | 11 +++++----
kde-frameworks/kio/kio-5.78.0.ebuild | 6 +++--
3 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
new file mode 100644
index 00000000000..7432364a986
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
@@ -0,0 +1,32 @@
+From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sun, 24 Jan 2021 11:10:27 +0200
+Subject: [PATCH] Fix build with gcc11
+
+Apparently now we need to #include <limit>.
+
+Patch by Geoff Leach:
+https://bugs.gentoo.org/766480
+https://invent.kde.org/frameworks/kio/-/issues/3
+
+NO_CHANGELOG
+---
+ src/kntlm/des.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
+index 18d85bfd..65c86f06 100644
+--- a/src/kntlm/des.cpp
++++ b/src/kntlm/des.cpp
+@@ -29,6 +29,8 @@
+ #include <string.h>
+ #include <qendian.h>
+
++#include <limits>
++
+ static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void perminit_ip(DES_KEY *key);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
index 6b8abe7e5b5..7219074c623 100644
--- a/kde-frameworks/kio/kio-5.77.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
@@ -16,6 +16,9 @@ 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
@@ -68,10 +71,10 @@ PDEPEND="
>=kde-frameworks/kded-${PVCUT}:5
"
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-gcc11.patch" # bug 766480
+)
src_configure() {
local mycmakeargs=(
diff --git a/kde-frameworks/kio/kio-5.78.0.ebuild b/kde-frameworks/kio/kio-5.78.0.ebuild
index 04866eaeffa..4b22f628f1f 100644
--- a/kde-frameworks/kio/kio-5.78.0.ebuild
+++ b/kde-frameworks/kio/kio-5.78.0.ebuild
@@ -16,6 +16,9 @@ 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
@@ -68,8 +71,7 @@ PDEPEND="
>=kde-frameworks/kded-${PVCUT}:5
"
-# tests hang
-RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.77.0-gcc11.patch" ) # bug 766480
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-02-12 21:48 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-02-12 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 76fbe81975afdff600e155569bca6a5b522c915b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 21:47:18 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 21:48:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76fbe819
kde-frameworks/kio: Fix default codec being set to US-ASCII in apps
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=432406
Reported-by: Stefan Radermacher <gentoo <AT> zaister.de>
Closes: https://bugs.gentoo.org/765430
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...io-5.77.0-fix-default-codec-not-usascii-1.patch | 36 ++++++++
...io-5.77.0-fix-default-codec-not-usascii-2.patch | 100 +++++++++++++++++++++
kde-frameworks/kio/kio-5.77.0-r2.ebuild | 100 +++++++++++++++++++++
kde-frameworks/kio/kio-5.78.0-r2.ebuild | 100 +++++++++++++++++++++
4 files changed, 336 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
new file mode 100644
index 00000000000..8f589b796aa
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
@@ -0,0 +1,36 @@
+From 0a13e0a3e830be2b2b2e5c2c6cf8cef25bd68bd8 Mon Sep 17 00:00:00 2001
+From: Tusooa Zhu <tusooa@vista.aero>
+Date: Thu, 4 Feb 2021 08:36:26 -0500
+Subject: [PATCH] Fix default codec being set to "US-ASCII" in KIO apps
+
+From https://doc.qt.io/qt-5/qloggingcategory.html#Q_LOGGING_CATEGORY-1 :
+"The implicitly-defined QLoggingCategory object is created on first use,
+in a thread-safe manner."
+
+The original way to explicitly define a static QLoggingCategory will lead
+to a call to ucnv_getDefaultName() before QApplication constructor (where
+setlocale() is called), thus making QTextCodec::codecForLocale() misbehave.
+Here we replace the explicit definition with the Q_LOGGING_CATEGORY macro,
+and thus avoid this problem.
+
+BUG: 432406
+---
+ src/widgets/kdirmodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp
+index a48ab462..aa049e3d 100644
+--- a/src/widgets/kdirmodel.cpp
++++ b/src/widgets/kdirmodel.cpp
+@@ -36,7 +36,7 @@
+ #include <qt_windows.h>
+ #endif
+
+-static QLoggingCategory category("kf.kio.widgets.kdirmodel", QtInfoMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.widgets.kdirmodel", QtInfoMsg)
+
+ class KDirModelNode;
+ class KDirModelDirNode;
+--
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
new file mode 100644
index 00000000000..90f4bb5b0a9
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
@@ -0,0 +1,100 @@
+From 423bea37e4bb06b9c04a62a9a91b720ec5d5e3d5 Mon Sep 17 00:00:00 2001
+From: Tusooa Zhu <tusooa@vista.aero>
+Date: Thu, 4 Feb 2021 18:06:23 -0500
+Subject: [PATCH] Use Q_LOGGING_CATEGORY macro instead of explicit
+ QLoggingCategory
+
+Explicitly defining a QLoggingCategory will make QTextCodec::codecForLocale()
+misbehave, so we change it to Q_LOGGING_CATEGORY macro.
+
+CCBUG: 432406
+---
+ src/kpasswdserver/kpasswdserver.cpp | 2 +-
+ src/urifilters/ikws/kuriikwsfilter.cpp | 2 +-
+ src/urifilters/ikws/kuriikwsfiltereng.cpp | 2 +-
+ src/urifilters/ikws/kurisearchfilter.cpp | 2 +-
+ src/urifilters/localdomain/localdomainurifilter.cpp | 2 +-
+ src/urifilters/shorturi/kshorturifilter.cpp | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/kpasswdserver/kpasswdserver.cpp b/src/kpasswdserver/kpasswdserver.cpp
+index 4ed73085..a832a0ab 100644
+--- a/src/kpasswdserver/kpasswdserver.cpp
++++ b/src/kpasswdserver/kpasswdserver.cpp
+@@ -28,7 +28,7 @@
+ #include <QTimer>
+ #include <ctime>
+
+-static QLoggingCategory category("kf.kio.kpasswdserver", QtInfoMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.kpasswdserver", QtInfoMsg)
+
+ #define AUTHINFO_EXTRAFIELD_DOMAIN QStringLiteral("domain")
+ #define AUTHINFO_EXTRAFIELD_ANONYMOUS QStringLiteral("anonymous")
+diff --git a/src/urifilters/ikws/kuriikwsfilter.cpp b/src/urifilters/ikws/kuriikwsfilter.cpp
+index 3a516fd8..bbc17678 100644
+--- a/src/urifilters/ikws/kuriikwsfilter.cpp
++++ b/src/urifilters/ikws/kuriikwsfilter.cpp
+@@ -22,7 +22,7 @@
+ #define QL1C(x) QLatin1Char(x)
+
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+
+ /**
+diff --git a/src/urifilters/ikws/kuriikwsfiltereng.cpp b/src/urifilters/ikws/kuriikwsfiltereng.cpp
+index 5b1bbc48..29647e3e 100644
+--- a/src/urifilters/ikws/kuriikwsfiltereng.cpp
++++ b/src/urifilters/ikws/kuriikwsfiltereng.cpp
+@@ -22,7 +22,7 @@
+ #include <QLoggingCategory>
+
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+
+ #define PDVAR(n, v) qCDebug(category) << n << " = '" << v << "'"
+diff --git a/src/urifilters/ikws/kurisearchfilter.cpp b/src/urifilters/ikws/kurisearchfilter.cpp
+index a12a9f59..669246c1 100644
+--- a/src/urifilters/ikws/kurisearchfilter.cpp
++++ b/src/urifilters/ikws/kurisearchfilter.cpp
+@@ -26,7 +26,7 @@
+ K_PLUGIN_CLASS_WITH_JSON(KUriSearchFilter, "kurisearchfilter.json")
+
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+
+ KUriSearchFilter::KUriSearchFilter(QObject *parent, const QVariantList &)
+diff --git a/src/urifilters/localdomain/localdomainurifilter.cpp b/src/urifilters/localdomain/localdomainurifilter.cpp
+index 862419a7..94a53606 100644
+--- a/src/urifilters/localdomain/localdomainurifilter.cpp
++++ b/src/urifilters/localdomain/localdomainurifilter.cpp
+@@ -20,7 +20,7 @@
+ #define QL1S(x) QLatin1String(x)
+
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.localdomain", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.localdomain", QtWarningMsg)
+ }
+
+ /**
+diff --git a/src/urifilters/shorturi/kshorturifilter.cpp b/src/urifilters/shorturi/kshorturifilter.cpp
+index dc866e6c..62d810c4 100644
+--- a/src/urifilters/shorturi/kshorturifilter.cpp
++++ b/src/urifilters/shorturi/kshorturifilter.cpp
+@@ -27,7 +27,7 @@
+ #include <KUser>
+
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.shorturi", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.shorturi", QtWarningMsg)
+ }
+
+ /**
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.77.0-r2.ebuild b/kde-frameworks/kio/kio-5.77.0-r2.ebuild
new file mode 100644
index 00000000000..641fae6d8a5
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.77.0-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.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
+ x11-libs/libX11
+ x11-libs/libXrender
+ )
+"
+PDEPEND="
+ >=kde-frameworks/kded-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-crashfix.patch
+ "${FILESDIR}"/${P}-gcc11.patch # bug 766480
+ "${FILESDIR}"/${P}-fix-default-codec-not-usascii-{1,2}.patch # bug 765430
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/kio-5.78.0-r2.ebuild b/kde-frameworks/kio/kio-5.78.0-r2.ebuild
new file mode 100644
index 00000000000..c7be32d59f4
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.78.0-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.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
+ x11-libs/libX11
+ x11-libs/libXrender
+ )
+"
+PDEPEND="
+ >=kde-frameworks/kded-${PVCUT}:5
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.77.0-gcc11.patch # bug 766480
+ "${FILESDIR}"/${P}-copyjob-crash.patch # KDE-Bug 431731
+ "${FILESDIR}"/${PN}-5.77.0-fix-default-codec-not-usascii-{1,2}.patch # bug 765430
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-02-13 20:49 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-02-13 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 771ca19049644879292252dc765b599aee3901cd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 13:09:18 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 20:48:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771ca190
kde-frameworks/kio: drop 5.78.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
.../kio/files/kio-5.78.0-copyjob-crash.patch | 32 -------
kde-frameworks/kio/kio-5.78.0-r2.ebuild | 100 ---------------------
3 files changed, 133 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 398751cd669..445d94058ca 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
-DIST kio-5.78.0.tar.xz 3308004 BLAKE2B b21cdde13013d7a3df91e821c8562df650b727e521b6552e9875c9aa74a97bb8b8b4a1d8b8cfd8f7d2c2eb68989ba2b7efc0fe77d46e57759e34ac1b39f9999c SHA512 55996a35f77442f3cc2ff98708da6dfd2734b0afffd7b3b90b5b2845c9770f3ec68a1e4e72d21b1c4e41d06778ab376b96ab64d958c89dd4f8b7fad6501a5db7
DIST kio-5.79.0.tar.xz 3309016 BLAKE2B 804989eab7eb80bb40282da92d752f70f41dc9897037a530482f92ee60f9cf339ccd802b1ff59945300e2656153ce203cc928d362170ac7c7e82dd0aa08d4d6e SHA512 7d7588ec61b3c85ec1d89e95ebee5c6d98626dafc4d80525e13baa96840e91a00a7fa6e6fd2e8055c78b22c27d37cdc395da6c23e521a4ae7ccbe4992f1f7c43
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
deleted file mode 100644
index a4b87821e20..00000000000
--- a/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a183dd0d1ee0659e5341c7cb4117df27edd6f125 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-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, &KIO::AskUserActionInterface::askUserSkipResult,
- q, [=](SkipDialog_Result result, KJob *parentJob) {
- Q_ASSERT(parentJob == q);
-- // Only receive askUserRenameResult once per rename dialog
-- QObject::disconnect(askUserActionInterface, &KIO::AskUserActionInterface::askUserRenameResult,
-+ // Only receive askUserSkipResult once per skip dialog
-+ QObject::disconnect(askUserActionInterface, &KIO::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-r2.ebuild b/kde-frameworks/kio/kio-5.78.0-r2.ebuild
deleted file mode 100644
index c7be32d59f4..00000000000
--- a/kde-frameworks/kio/kio-5.78.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND="
- >=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.77.0-gcc11.patch # bug 766480
- "${FILESDIR}"/${P}-copyjob-crash.patch # KDE-Bug 431731
- "${FILESDIR}"/${PN}-5.77.0-fix-default-codec-not-usascii-{1,2}.patch # bug 765430
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-03-25 23:13 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-03-25 23:13 UTC (permalink / raw
To: gentoo-commits
commit: da142c953d5d2df787df3bacfb63856163d445ec
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 22:44:26 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 23:13:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da142c95
kde-frameworks/kio: Fix kinit not terminating file.so, build w/ GCC-11
Upstream commits:
05e1090603ca81eb54a23febe41a8823a0e7d572
493188b3d616f3223ccf3a41327a4c7e69282df8
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=434455
Closes: https://bugs.gentoo.org/766480
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.80.1-MimeTypeFinderJob-file.so.patch | 30 +++++++
.../kio/files/kio-5.80.1-gcc11-include-order.patch | 36 ++++++++
kde-frameworks/kio/kio-5.80.1-r1.ebuild | 99 ++++++++++++++++++++++
3 files changed, 165 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
new file mode 100644
index 00000000000..a25898fb88b
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch
@@ -0,0 +1,30 @@
+From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Mar 2021 00:29:31 +0100
+Subject: [PATCH] MimeTypeFinderJob: don't put job on hold for local files
+
+Fixes: 434455
+---
+ src/core/mimetypefinderjob.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
+index 147f3aa9a..f5e50cdc4 100644
+--- a/src/core/mimetypefinderjob.cpp
++++ b/src/core/mimetypefinderjob.cpp
+@@ -241,8 +241,10 @@ void KIO::MimeTypeFinderJobPrivate::scanFileWithGet()
+ m_suggestedFileName = job->queryMetaData(QStringLiteral("content-disposition-filename"));
+ }
+
+- job->putOnHold();
+- KIO::Scheduler::publishSlaveOnHold();
++ if (!m_url.isLocalFile()) { // #434455
++ job->putOnHold();
++ KIO::Scheduler::publishSlaveOnHold();
++ }
+ q->emitResult();
+ });
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
new file mode 100644
index 00000000000..e3675ce0234
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch
@@ -0,0 +1,36 @@
+From 493188b3d616f3223ccf3a41327a4c7e69282df8 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Mon, 15 Mar 2021 14:29:42 +0200
+Subject: [PATCH] Fix #include's order
+
+According to[1] <limits> needs to be included first when building with
+GCC 11.
+
+[1] https://invent.kde.org/frameworks/kio/-/issues/3
+
+GIT_SILENT
+---
+ src/kntlm/des.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
+index d90e6d21a..78c7a3fd2 100644
+--- a/src/kntlm/des.cpp
++++ b/src/kntlm/des.cpp
+@@ -26,11 +26,11 @@
+
+ #include "des.h"
+
++#include <limits> // This needs to be first with GCC 11
++
+ #include <qendian.h>
+ #include <string.h>
+
+-#include <limits>
+-
+ static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
+ static void perminit_ip(DES_KEY *key);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.80.1-r1.ebuild b/kde-frameworks/kio/kio-5.80.1-r1.ebuild
new file mode 100644
index 00000000000..44f71537990
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.80.1-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.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
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-04-04 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 8b66280500df8b8a4da00c3da550eb8dc989bd33
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 12:23:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:19:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b662805
kde-frameworks/kio: Fix crash in ThumbnailProtocol
Upstream commit a68cb73c4e071ed24b18a95e11fbbbc8d59840b4
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430862
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch | 104 +++++++++++++++++++++
kde-frameworks/kio/kio-5.80.1-r2.ebuild | 1 +
2 files changed, 105 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
new file mode 100644
index 00000000000..059c9f82424
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch
@@ -0,0 +1,104 @@
+From a68cb73c4e071ed24b18a95e11fbbbc8d59840b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com>
+Date: Sun, 21 Mar 2021 05:22:57 +0100
+Subject: [PATCH] PreviewJob: Initialize cachesSize with 0, only pass size > 0
+ to shmget, improve createThumbnail
+
+BUG: 430862
+---
+ src/widgets/previewjob.cpp | 48 +++++++++++++++++++++++---------------
+ 1 file changed, 29 insertions(+), 19 deletions(-)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index 988da16b0..9b6e661e8 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -70,7 +70,7 @@ public:
+ : initialItems(items)
+ , width(size.width())
+ , height(size.height())
+- , cacheSize(-1)
++ , cacheSize(0)
+ , bScale(true)
+ , bSave(true)
+ , ignoreMaximumSize(false)
+@@ -114,8 +114,8 @@ public:
+ // Size of thumbnail
+ int width;
+ int height;
+- // Unscaled size of thumbnail (128 or 256 if cache is enabled)
+- int cacheSize;
++ // Unscaled size of thumbnail (128, 256 or 512 if cache is enabled)
++ ushort cacheSize;
+ // Whether the thumbnail should be scaled
+ bool bScale;
+ // Whether we should save the thumbnail
+@@ -712,39 +712,49 @@ void PreviewJobPrivate::createThumbnail(const QString &pixPath)
+ });
+
+ bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex;
++ int thumb_width = width;
++ int thumb_height = height;
++ int thumb_iconSize = iconSize;
++ if (save) {
++ thumb_width = thumb_height = cacheSize;
++ thumb_iconSize = 64;
++ }
++
+ job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype());
+- job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheSize : width));
+- job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheSize : height));
+- job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize));
+- job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha));
++ job->addMetaData(QStringLiteral("width"), QString::number(thumb_width));
++ job->addMetaData(QStringLiteral("height"), QString::number(thumb_height));
++ job->addMetaData(QStringLiteral("iconSize"), QString::number(thumb_iconSize));
++ job->addMetaData(QStringLiteral("iconAlpha"), QString::number(iconAlpha));
+ job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library());
+ job->addMetaData(QStringLiteral("enabledPlugins"), enabledPlugins.join(QLatin1Char(',')));
+ job->addMetaData(QStringLiteral("devicePixelRatio"), QString::number(devicePixelRatio));
+ if (sequenceIndex) {
+- job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex));
++ job->addMetaData(QStringLiteral("sequence-index"), QString::number(sequenceIndex));
+ }
+
+ #if WITH_SHM
+ if (shmid == -1) {
+ if (shmaddr) {
++ // clean previous shared memory segment
+ shmdt((char *)shmaddr);
+ shmctl(shmid, IPC_RMID, nullptr);
++ shmaddr = nullptr;
+ }
+- auto size = std::max(cacheSize * cacheSize, width * height);
+- shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
+- if (shmid != -1) {
+- shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
+- if (shmaddr == (uchar *)-1) {
+- shmctl(shmid, IPC_RMID, nullptr);
+- shmaddr = nullptr;
+- shmid = -1;
++ auto size = thumb_width * thumb_height;
++ if (size > 0) {
++ shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600);
++ if (shmid != -1) {
++ shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY));
++ if (shmaddr == (uchar *)-1) {
++ shmctl(shmid, IPC_RMID, nullptr);
++ shmaddr = nullptr;
++ shmid = -1;
++ }
+ }
+- } else {
+- shmaddr = nullptr;
+ }
+ }
+ if (shmid != -1) {
+- job->addMetaData(QStringLiteral("shmid"), QString().setNum(shmid));
++ job->addMetaData(QStringLiteral("shmid"), QString::number(shmid));
+ }
+ #endif
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.80.1-r2.ebuild b/kde-frameworks/kio/kio-5.80.1-r2.ebuild
index 59bdb0d13ea..ee0dc3c8892 100644
--- a/kde-frameworks/kio/kio-5.80.1-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.80.1-r2.ebuild
@@ -75,6 +75,7 @@ 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
+ "${FILESDIR}"/${P}-fix-crash-in-ThumbnailProtocol.patch # KDE-Bug 430862
)
src_configure() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-04-11 14:23 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-04-11 14:23 UTC (permalink / raw
To: gentoo-commits
commit: 81610521de144cef8396511ce080bc5fa0490cdc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 12:14:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 14:23:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81610521
kde-frameworks/kio: drop 5.77.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
kde-frameworks/kio/files/kio-5.77.0-crashfix.patch | 29 ------
...io-5.77.0-fix-default-codec-not-usascii-1.patch | 36 --------
...io-5.77.0-fix-default-codec-not-usascii-2.patch | 100 ---------------------
kde-frameworks/kio/files/kio-5.77.0-gcc11.patch | 32 -------
kde-frameworks/kio/kio-5.77.0-r2.ebuild | 100 ---------------------
6 files changed, 298 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index a11c641fb33..1c3ff9164cb 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213
DIST kio-5.81.0.tar.xz 3319696 BLAKE2B 9ce742ecc5f00223b6dd2b4adc2a8591796c0553f027414112c5bf2bc67c4a93708d2710c822697fbe38eb17b2a154a026bcb05a8914fb7bdd33f7479268544b SHA512 e2466412eb6360dc93eace9f44c161c7ac44ce1339688e4b64cba8f716733552610374627dd3e99205aeea735f0144beb0468f429f238a6be05f91827ff9ee3b
diff --git a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
deleted file mode 100644
index d24a0d976c0..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Tue, 22 Dec 2020 22:23:17 +0100
-Subject: [PATCH] RenameDialog: Add missing nullptr initialization
-
-It fixes a crash when pressing `Apply to All` in those cases where
-the action was not present, as the code checks for nullptr
-
-BUG: 430374
-FIXED-IN: 5.78
----
- src/widgets/renamedialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
-index ac1d91d2..c3e04753 100644
---- a/src/widgets/renamedialog.cpp
-+++ b/src/widgets/renamedialog.cpp
-@@ -161,6 +161,7 @@ public:
- bCancel = nullptr;
- bRename = bSkip = nullptr;
- bOverwrite = nullptr;
-+ bOverwriteWhenOlder = nullptr;
- bResume = bSuggestNewName = nullptr;
- bApplyAll = nullptr;
- m_pLineEdit = nullptr;
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
deleted file mode 100644
index 8f589b796aa..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0a13e0a3e830be2b2b2e5c2c6cf8cef25bd68bd8 Mon Sep 17 00:00:00 2001
-From: Tusooa Zhu <tusooa@vista.aero>
-Date: Thu, 4 Feb 2021 08:36:26 -0500
-Subject: [PATCH] Fix default codec being set to "US-ASCII" in KIO apps
-
-From https://doc.qt.io/qt-5/qloggingcategory.html#Q_LOGGING_CATEGORY-1 :
-"The implicitly-defined QLoggingCategory object is created on first use,
-in a thread-safe manner."
-
-The original way to explicitly define a static QLoggingCategory will lead
-to a call to ucnv_getDefaultName() before QApplication constructor (where
-setlocale() is called), thus making QTextCodec::codecForLocale() misbehave.
-Here we replace the explicit definition with the Q_LOGGING_CATEGORY macro,
-and thus avoid this problem.
-
-BUG: 432406
----
- src/widgets/kdirmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp
-index a48ab462..aa049e3d 100644
---- a/src/widgets/kdirmodel.cpp
-+++ b/src/widgets/kdirmodel.cpp
-@@ -36,7 +36,7 @@
- #include <qt_windows.h>
- #endif
-
--static QLoggingCategory category("kf.kio.widgets.kdirmodel", QtInfoMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.widgets.kdirmodel", QtInfoMsg)
-
- class KDirModelNode;
- class KDirModelDirNode;
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
deleted file mode 100644
index 90f4bb5b0a9..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 423bea37e4bb06b9c04a62a9a91b720ec5d5e3d5 Mon Sep 17 00:00:00 2001
-From: Tusooa Zhu <tusooa@vista.aero>
-Date: Thu, 4 Feb 2021 18:06:23 -0500
-Subject: [PATCH] Use Q_LOGGING_CATEGORY macro instead of explicit
- QLoggingCategory
-
-Explicitly defining a QLoggingCategory will make QTextCodec::codecForLocale()
-misbehave, so we change it to Q_LOGGING_CATEGORY macro.
-
-CCBUG: 432406
----
- src/kpasswdserver/kpasswdserver.cpp | 2 +-
- src/urifilters/ikws/kuriikwsfilter.cpp | 2 +-
- src/urifilters/ikws/kuriikwsfiltereng.cpp | 2 +-
- src/urifilters/ikws/kurisearchfilter.cpp | 2 +-
- src/urifilters/localdomain/localdomainurifilter.cpp | 2 +-
- src/urifilters/shorturi/kshorturifilter.cpp | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/kpasswdserver/kpasswdserver.cpp b/src/kpasswdserver/kpasswdserver.cpp
-index 4ed73085..a832a0ab 100644
---- a/src/kpasswdserver/kpasswdserver.cpp
-+++ b/src/kpasswdserver/kpasswdserver.cpp
-@@ -28,7 +28,7 @@
- #include <QTimer>
- #include <ctime>
-
--static QLoggingCategory category("kf.kio.kpasswdserver", QtInfoMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.kpasswdserver", QtInfoMsg)
-
- #define AUTHINFO_EXTRAFIELD_DOMAIN QStringLiteral("domain")
- #define AUTHINFO_EXTRAFIELD_ANONYMOUS QStringLiteral("anonymous")
-diff --git a/src/urifilters/ikws/kuriikwsfilter.cpp b/src/urifilters/ikws/kuriikwsfilter.cpp
-index 3a516fd8..bbc17678 100644
---- a/src/urifilters/ikws/kuriikwsfilter.cpp
-+++ b/src/urifilters/ikws/kuriikwsfilter.cpp
-@@ -22,7 +22,7 @@
- #define QL1C(x) QLatin1Char(x)
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- /**
-diff --git a/src/urifilters/ikws/kuriikwsfiltereng.cpp b/src/urifilters/ikws/kuriikwsfiltereng.cpp
-index 5b1bbc48..29647e3e 100644
---- a/src/urifilters/ikws/kuriikwsfiltereng.cpp
-+++ b/src/urifilters/ikws/kuriikwsfiltereng.cpp
-@@ -22,7 +22,7 @@
- #include <QLoggingCategory>
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- #define PDVAR(n, v) qCDebug(category) << n << " = '" << v << "'"
-diff --git a/src/urifilters/ikws/kurisearchfilter.cpp b/src/urifilters/ikws/kurisearchfilter.cpp
-index a12a9f59..669246c1 100644
---- a/src/urifilters/ikws/kurisearchfilter.cpp
-+++ b/src/urifilters/ikws/kurisearchfilter.cpp
-@@ -26,7 +26,7 @@
- K_PLUGIN_CLASS_WITH_JSON(KUriSearchFilter, "kurisearchfilter.json")
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
- }
-
- KUriSearchFilter::KUriSearchFilter(QObject *parent, const QVariantList &)
-diff --git a/src/urifilters/localdomain/localdomainurifilter.cpp b/src/urifilters/localdomain/localdomainurifilter.cpp
-index 862419a7..94a53606 100644
---- a/src/urifilters/localdomain/localdomainurifilter.cpp
-+++ b/src/urifilters/localdomain/localdomainurifilter.cpp
-@@ -20,7 +20,7 @@
- #define QL1S(x) QLatin1String(x)
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.localdomain", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.localdomain", QtWarningMsg)
- }
-
- /**
-diff --git a/src/urifilters/shorturi/kshorturifilter.cpp b/src/urifilters/shorturi/kshorturifilter.cpp
-index dc866e6c..62d810c4 100644
---- a/src/urifilters/shorturi/kshorturifilter.cpp
-+++ b/src/urifilters/shorturi/kshorturifilter.cpp
-@@ -27,7 +27,7 @@
- #include <KUser>
-
- namespace {
--QLoggingCategory category("kf.kio.urifilters.shorturi", QtWarningMsg);
-+Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.shorturi", QtWarningMsg)
- }
-
- /**
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
deleted file mode 100644
index 7432364a986..00000000000
--- a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Sun, 24 Jan 2021 11:10:27 +0200
-Subject: [PATCH] Fix build with gcc11
-
-Apparently now we need to #include <limit>.
-
-Patch by Geoff Leach:
-https://bugs.gentoo.org/766480
-https://invent.kde.org/frameworks/kio/-/issues/3
-
-NO_CHANGELOG
----
- src/kntlm/des.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp
-index 18d85bfd..65c86f06 100644
---- a/src/kntlm/des.cpp
-+++ b/src/kntlm/des.cpp
-@@ -29,6 +29,8 @@
- #include <string.h>
- #include <qendian.h>
-
-+#include <limits>
-+
- static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock);
- static void perminit_ip(DES_KEY *key);
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.77.0-r2.ebuild b/kde-frameworks/kio/kio-5.77.0-r2.ebuild
deleted file mode 100644
index 7c108fb2109..00000000000
--- a/kde-frameworks/kio/kio-5.77.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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
- x11-libs/libX11
- x11-libs/libXrender
- )
-"
-PDEPEND="
- >=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-crashfix.patch
- "${FILESDIR}"/${P}-gcc11.patch # bug 766480
- "${FILESDIR}"/${P}-fix-default-codec-not-usascii-{1,2}.patch # bug 765430
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-05-15 10:49 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-05-15 10:49 UTC (permalink / raw
To: gentoo-commits
commit: aace2cf1177ab92d31ede9aeb02118d409baa700
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 10:46:06 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 15 10:49:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aace2cf1
kde-frameworks/kio: Upstream backport request for memleak fix
See also: https://mail.kde.org/pipermail/distributions/2021-May/000998.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=398908
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../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 ++++++++++++
kde-frameworks/kio/kio-5.82.0-r1.ebuild | 110 +++++++++++++++++++++
5 files changed, 354 insertions(+)
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
new file mode 100644
index 00000000000..08d72d754d7
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
@@ -0,0 +1,69 @@
+From e79da836c34fce66231e396c7215314d0eba51b4 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Sat, 8 May 2021 15:20:39 +0000
+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
++++ b/autotests/mimetypefinderjobtest.cpp
+@@ -48,6 +48,7 @@ void MimeTypeFinderJobTest::determineMimeType_data()
+ QTest::newRow("text_file_no_extension") << "text/plain" << "srcfile";
+ QTest::newRow("desktop_file") << "application/x-desktop" << "foo.desktop";
+ QTest::newRow("script") << "application/x-shellscript" << "srcfile.sh";
++ QTest::newRow("directory") << "inode/directory" << "srcdir";
+ /* clang-format on */
+ }
+
+@@ -60,7 +61,12 @@ void MimeTypeFinderJobTest::determineMimeType()
+ QTemporaryDir tempDir;
+ const QString srcDir = tempDir.path();
+ const QString srcFile = srcDir + QLatin1Char('/') + fileName;
+- createSrcFile(srcFile);
++ if (mimeType == "inode/directory") {
++ QVERIFY(QDir(srcDir).mkdir(fileName));
++ } else {
++ createSrcFile(srcFile);
++ }
++
+ QVERIFY(QFile::exists(srcFile));
+ const QUrl url = QUrl::fromLocalFile(srcFile);
+
+@@ -68,6 +74,16 @@ void MimeTypeFinderJobTest::determineMimeType()
+ KIO::MimeTypeFinderJob *job = new KIO::MimeTypeFinderJob(url, this);
+ QVERIFY2(job->exec(), qPrintable(job->errorString()));
+ QCOMPARE(job->mimeType(), mimeType);
++
++ // Check that the result is the same when accessing the source
++ // file through a symbolic link (bug #436708)
++ const QString srcLink = srcDir + QLatin1String("/link_") + fileName;
++ QVERIFY(QFile::link(srcFile, srcLink));
++ const QUrl linkUrl = QUrl::fromLocalFile(srcLink);
++
++ job = new KIO::MimeTypeFinderJob(linkUrl, this);
++ QVERIFY2(job->exec(), qPrintable(job->errorString()));
++ QCOMPARE(job->mimeType(), mimeType);
+ }
+
+ void MimeTypeFinderJobTest::invalidUrl()
+diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
+index f5e50cdc4..48fc8c289 100644
+--- a/src/core/mimetypefinderjob.cpp
++++ b/src/core/mimetypefinderjob.cpp
+@@ -122,7 +122,7 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+ {
+ Q_ASSERT(m_mimeTypeName.isEmpty());
+
+- KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic, KIO::HideProgressInfo);
++ KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
+ if (!m_authPrompts) {
+ job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
new file mode 100644
index 00000000000..bf3ff50802f
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
@@ -0,0 +1,61 @@
+From c748d6987252fafc296cde9351b289ef734cf861 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 13 May 2021 23:03:57 +0200
+Subject: [PATCH] kio_file: pass the absolute path to
+ QMimeDatabase::mimeTypeForFile()
+
+Otherwise detecting the mime type based on the file content may fail and
+return application/octet-stream.
+
+And pass the whole url to createUDSEntry(), less QFile::decodeName/encodeName()
+in the middle is better and less error prone.
+
+Note that without this change a MimeTypeFinderJob could end up failing to
+find the mime type of a local file based on the file contents.
+---
+ src/ioslaves/file/file_unix.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 99d46c8f1..940e3cbc4 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
+ }
+ #endif
+
+-static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details)
++static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
+ {
+ assert(entry.count() == 0); // by contract :-)
+ int entries = 0;
+@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
+
+ if (details & KIO::StatMimeType) {
+ QMimeDatabase db;
+- entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(filename).name());
++ entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
+ }
+
+ return true;
+@@ -1186,7 +1186,7 @@ void FileProtocol::listDir(const QUrl &url)
+ listEntry(entry);
+
+ } else {
+- if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
++ if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
+ #if HAVE_SYS_XATTR_H
+ if (isNtfsHidden(filename)) {
+ bool ntfsHidden = true;
+@@ -1476,7 +1476,7 @@ void FileProtocol::stat(const QUrl &url)
+ const KIO::StatDetails details = getStatDetails();
+
+ UDSEntry entry;
+- if (!createUDSEntry(url.fileName(), _path, entry, details)) {
++ if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
+ error(KIO::ERR_DOES_NOT_EXIST, path);
+ return;
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
new file mode 100644
index 00000000000..a9c55e1f7f2
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
@@ -0,0 +1,52 @@
+From c19876052ecec18a87a82f5950e8909e22e895ba Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 13 May 2021 17:02:52 +0200
+Subject: [PATCH] MimeTypeFinderJob: the StatJob details should include the
+ mimetype
+
+Apparently we forgot to specify that we want the UDS_MIME_TYPE field in
+the statFile() method (both when it lived in OpenUrlJob and when it was moved
+to MimeTypeFinderJob). And now there is a dedicated StatJob flag, StatMimeType,
+that we can use.
+
+Not passing KIO::StatMimeType when creating the StatJob meant the code always
+used a get job to determine the mime type, which mean that e.g. opening an
+ISO file from Dolphin, which supposedly just needs to launch Ark, had the
+whole file read into memory, which means that opening a couple of ISO's and
+you're out of memory...
+
+Thanks to sitter for doing a big chunk of the investigative work in the bug
+report.
+
+CCBUG: 398908
+---
+ src/core/mimetypefinderjob.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
+index 48fc8c289..baca58695 100644
+--- a/src/core/mimetypefinderjob.cpp
++++ b/src/core/mimetypefinderjob.cpp
+@@ -122,7 +122,9 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+ {
+ Q_ASSERT(m_mimeTypeName.isEmpty());
+
+- KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
++ static constexpr auto statFlags = KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatMimeType;
++
++ KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, statFlags, KIO::HideProgressInfo);
+ if (!m_authPrompts) {
+ job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
+ }
+@@ -147,6 +149,8 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
+
+ const KIO::UDSEntry entry = job->statResult();
+
++ qCDebug(KIO_CORE) << "UDSEntry from StatJob in MimeTypeFinderJob" << entry;
++
+ const QString localPath = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH);
+ if (!localPath.isEmpty()) {
+ m_url = QUrl::fromLocalFile(localPath);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
new file mode 100644
index 00000000000..9e59a0eb16e
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
@@ -0,0 +1,62 @@
+From 71484c97dee0c977a00f141123d8ccd9b93c2e96 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Fri, 14 May 2021 21:19:31 +0200
+Subject: [PATCH] kio_file: fix how createUDSEntry() is called
+
+When calling createUDSEntry() from listDir(), we need to concatenate the full
+path to the item.
+
+This is an addendum to commit c748d6987252f.
+---
+ src/ioslaves/file/file_unix.cpp | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 940e3cbc4..3573c200e 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
+ }
+ #endif
+
+-static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
++static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QString &fullPath)
+ {
+ assert(entry.count() == 0); // by contract :-)
+ int entries = 0;
+@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
+
+ if (details & KIO::StatMimeType) {
+ QMimeDatabase db;
+- entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
++ entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(fullPath).name());
+ }
+
+ return true;
+@@ -1186,7 +1186,13 @@ void FileProtocol::listDir(const QUrl &url)
+ listEntry(entry);
+
+ } else {
+- if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
++ QString fullPath(path);
++ if (!fullPath.endsWith(QLatin1Char('/'))) {
++ fullPath += QLatin1Char('/');
++ }
++ fullPath += filename;
++
++ if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, fullPath)) {
+ #if HAVE_SYS_XATTR_H
+ if (isNtfsHidden(filename)) {
+ bool ntfsHidden = true;
+@@ -1476,7 +1482,7 @@ void FileProtocol::stat(const QUrl &url)
+ const KIO::StatDetails details = getStatDetails();
+
+ UDSEntry entry;
+- if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
++ if (!createUDSEntry(url.fileName(), _path, entry, details, path)) {
+ error(KIO::ERR_DOES_NOT_EXIST, path);
+ return;
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.82.0-r1.ebuild b/kde-frameworks/kio/kio-5.82.0-r1.ebuild
new file mode 100644
index 00000000000..297ae2bbe4a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.82.0-r1.ebuild
@@ -0,0 +1,110 @@
+# 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/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
+ =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=(
+ # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+ # upstream backport request - see also KDE-bug 398908
+ "${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
+ # git master/KIO 5.83:
+ "${FILESDIR}"/${P}-no-useragent-kcm.patch
+ "${FILESDIR}"/${P}-no-cache-kcm.patch
+)
+
+src_prepare() {
+ ecm_src_prepare
+ rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-05-30 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-05-30 15:51 UTC (permalink / raw
To: gentoo-commits
commit: a61d404f0f2f976a648be4bc6a3c872f7a71f1a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 15:38:44 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 30 15:51:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61d404f
kde-frameworks/kio: filenamesearch crashes in KCoreDirLister
Upstream commit a38fcf356de0cbba1ce97c8ef70979ed897a8094
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437153
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.82.0-fix-filenamesearch-crashes.patch | 28 ++++++
kde-frameworks/kio/kio-5.82.0-r2.ebuild | 111 +++++++++++++++++++++
2 files changed, 139 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
new file mode 100644
index 00000000000..b92139a5187
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
@@ -0,0 +1,28 @@
+From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Tue, 18 May 2021 19:54:54 +0200
+Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null
+
+BUG: 437153
+---
+ src/core/kcoredirlister.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp
+index a836f0aa..58d8791c 100644
+--- a/src/core/kcoredirlister.cpp
++++ b/src/core/kcoredirlister.cpp
+@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j)
+ Q_EMIT kdl->jobError(job);
+ if (kdl->d->m_autoErrorHandling && !errorShown) {
+ errorShown = true; // do it only once
+- job->uiDelegate()->showErrorMessage();
++ if (job->uiDelegate()) {
++ job->uiDelegate()->showErrorMessage();
++ }
+ }
+ #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
+ kdl->handleError(job);
+--
+2.31.1
+
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
new file mode 100644
index 00000000000..79d4c76e5a5
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
@@ -0,0 +1,111 @@
+# 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/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
+ =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=(
+ # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
+ # upstream backport request - see also KDE-bug 398908
+ "${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
+ "${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153
+ # git master/KIO 5.83:
+ "${FILESDIR}"/${P}-no-useragent-kcm.patch
+ "${FILESDIR}"/${P}-no-cache-kcm.patch
+)
+
+src_prepare() {
+ ecm_src_prepare
+ rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-07-14 12:41 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-07-14 12:41 UTC (permalink / raw
To: gentoo-commits
commit: ef5ff74686160669fea3f413f70e13f6493e8ca7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 12:36:30 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 12:36:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5ff746
kde-frameworks/kio: Fix build with clang[default-libcxx]
Upstream commit 36f1814b184f4d5ac628fca5db5f6cc1440b4db7
See also: https://mail.kde.org/pipermail/distributions/2021-July/001033.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439780
Reported-by: 12101111 <w12101111 <AT> outlook.com>
Closes: https://bugs.gentoo.org/802030
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio/files/kio-5.84.0-cxx17-std-mem_fn.patch | 31 ++++++++++++++++++++++
kde-frameworks/kio/kio-5.84.0.ebuild | 4 +--
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
new file mode 100644
index 00000000000..26383b788a0
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
@@ -0,0 +1,31 @@
+From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001
+From: Jan Paul Batrina <jpmbatrina01@gmail.com>
+Date: Mon, 12 Jul 2021 22:06:19 +0800
+Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed
+ std::mem_fun
+
+std::mem_fun was deprecated in C++11 and removed from
+the standard in C++17.
+
+BUG: 439780
+NO_CHANGELOG
+---
+ src/widgets/kpropertiesdialog.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+index 3f61e8ea3..1ed8bc7d8 100644
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
+@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions()
+ d->fileSystemSupportsACLs = fileSystemSupportsACL(path);
+ }
+ if (d->fileSystemSupportsACLs) {
+- std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide));
++ std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide));
+ extendedACLs = new KACLEditWidget(&dlg);
+ extendedACLs->setEnabled(d->canChangePermissions);
+ vbox->addWidget(extendedACLs);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.84.0.ebuild b/kde-frameworks/kio/kio-5.84.0.ebuild
index cc327525d7b..ee9c97e0d68 100644
--- a/kde-frameworks/kio/kio-5.84.0.ebuild
+++ b/kde-frameworks/kio/kio-5.84.0.ebuild
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND}
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
PATCHES=(
- # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
- "${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971
+ "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971
+ "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030
)
src_configure() {
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-07-16 15:21 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-07-16 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 798f6de5b40e392c7738342cab9f4b8eb75ebcf3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 15:15:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 15:20:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798f6de5
kde-frameworks/kio: Fix selecting binaries from component chooser KCM
Upstream commit 8ad6921524c92a0cf1b58336b3ce29e159e83b7d
See also: https://mail.kde.org/pipermail/distributions/2021-July/001035.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439477
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kio-5.84.0-fix-open-url-w-binary.patch | 53 +++++++++++
kde-frameworks/kio/kio-5.84.0-r1.ebuild | 100 +++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
new file mode 100644
index 00000000000..cdccada57d9
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
@@ -0,0 +1,53 @@
+From 8ad6921524c92a0cf1b58336b3ce29e159e83b7d Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 14 Jul 2021 17:06:59 +0100
+Subject: [PATCH] Fix selecting binaries from component chooser KCM
+
+In the kcmshell for a component chooser we use the open with dialog to
+select services for various scheme handlers.
+
+If you select a binary instead of a .desktop file a temporary .desktop
+file is created in ~/.local/share/applications
+
+This is in the format
+Exec=someBinary
+MimeType=x-scheme-handler/http
+
+When we then use this application for launching KIO::DesktopExecParser
+then (sort of correctly) determines that that the chosen service cannot
+handle the http scheme because even though it is a scheme handler it
+does not have a "%u" in the exec line.
+
+This leads to us potentially loading websites via kioclient or kio-fuse.
+
+Testing done:
+ - kcmshell5 component chooser
+ - web browser -> other -> type "/usr/bin/firefox"
+ - kde-open5 http://kde.org
+ - Previously this gave a local URL, now it is correct
+---
+ src/widgets/kopenwithdialog.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/widgets/kopenwithdialog.cpp b/src/widgets/kopenwithdialog.cpp
+index 1831878ca..31295044d 100644
+--- a/src/widgets/kopenwithdialog.cpp
++++ b/src/widgets/kopenwithdialog.cpp
+@@ -1088,6 +1088,14 @@ bool KOpenWithDialogPrivate::checkAccept()
+ KConfigGroup cg = desktopFile.desktopGroup();
+ cg.writeEntry("Type", "Application");
+ cg.writeEntry("Name", initialServiceName);
++
++ // if we select a binary for a scheme handler, then it's safe to assume it can handle URLs
++ if (qMimeType.startsWith(QLatin1String("x-scheme-handler/"))) {
++ if (!typedExec.contains(QLatin1String("%u"), Qt::CaseInsensitive) && !typedExec.contains(QLatin1String("%f"), Qt::CaseInsensitive)) {
++ fullExec += QStringLiteral(" %u");
++ }
++ }
++
+ cg.writeEntry("Exec", fullExec);
+ cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
+ if (terminal->isChecked()) {
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.84.0-r1.ebuild b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
new file mode 100644
index 00000000000..e4d40e939fa
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.84.0-r1.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/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
+ =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}-fix-qtconcurrent-private-link.patch # bug 784971
+ "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030
+ "${FILESDIR}"/${P}-fix-open-url-w-binary.patch # KDE-bug 439477
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-08-14 17:09 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-08-14 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 5ad08ed1931d9cf2f12f481c9910ff2586090941
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 16:51:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 17:08:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad08ed1
kde-frameworks/kio: drop 5.84.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
.../kio/files/kio-5.84.0-cxx17-std-mem_fn.patch | 31 -------
.../files/kio-5.84.0-fix-open-url-w-binary.patch | 53 -----------
.../kio-5.84.0-fix-qtconcurrent-private-link.patch | 76 ----------------
kde-frameworks/kio/kio-5.84.0-r1.ebuild | 100 ---------------------
5 files changed, 261 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 2f2f102873a..01f1ec4da31 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.84.0.tar.xz 3191612 BLAKE2B 1d1788f4c731d6802eff504f4cba5569847dfbd506d25685f5c9d2218a88eb8ffca3d01f9290567ef368f0104ed322586015e6536e2ef07120803a2adbba5e2d SHA512 4c041b33171014562469c8ee074f85595edd503c0cb4c66aa5a17bad24937b71094826df2f3734b3d244d93b812e933f6ddc095628f2b25d5fca34c793383af9
DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
diff --git a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
deleted file mode 100644
index 26383b788a0..00000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001
-From: Jan Paul Batrina <jpmbatrina01@gmail.com>
-Date: Mon, 12 Jul 2021 22:06:19 +0800
-Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed
- std::mem_fun
-
-std::mem_fun was deprecated in C++11 and removed from
-the standard in C++17.
-
-BUG: 439780
-NO_CHANGELOG
----
- src/widgets/kpropertiesdialog.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 3f61e8ea3..1ed8bc7d8 100644
---- a/src/widgets/kpropertiesdialog.cpp
-+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions()
- d->fileSystemSupportsACLs = fileSystemSupportsACL(path);
- }
- if (d->fileSystemSupportsACLs) {
-- std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide));
-+ std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide));
- extendedACLs = new KACLEditWidget(&dlg);
- extendedACLs->setEnabled(d->canChangePermissions);
- vbox->addWidget(extendedACLs);
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch b/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
deleted file mode 100644
index cdccada57d9..00000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-fix-open-url-w-binary.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 8ad6921524c92a0cf1b58336b3ce29e159e83b7d Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 14 Jul 2021 17:06:59 +0100
-Subject: [PATCH] Fix selecting binaries from component chooser KCM
-
-In the kcmshell for a component chooser we use the open with dialog to
-select services for various scheme handlers.
-
-If you select a binary instead of a .desktop file a temporary .desktop
-file is created in ~/.local/share/applications
-
-This is in the format
-Exec=someBinary
-MimeType=x-scheme-handler/http
-
-When we then use this application for launching KIO::DesktopExecParser
-then (sort of correctly) determines that that the chosen service cannot
-handle the http scheme because even though it is a scheme handler it
-does not have a "%u" in the exec line.
-
-This leads to us potentially loading websites via kioclient or kio-fuse.
-
-Testing done:
- - kcmshell5 component chooser
- - web browser -> other -> type "/usr/bin/firefox"
- - kde-open5 http://kde.org
- - Previously this gave a local URL, now it is correct
----
- src/widgets/kopenwithdialog.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/widgets/kopenwithdialog.cpp b/src/widgets/kopenwithdialog.cpp
-index 1831878ca..31295044d 100644
---- a/src/widgets/kopenwithdialog.cpp
-+++ b/src/widgets/kopenwithdialog.cpp
-@@ -1088,6 +1088,14 @@ bool KOpenWithDialogPrivate::checkAccept()
- KConfigGroup cg = desktopFile.desktopGroup();
- cg.writeEntry("Type", "Application");
- cg.writeEntry("Name", initialServiceName);
-+
-+ // if we select a binary for a scheme handler, then it's safe to assume it can handle URLs
-+ if (qMimeType.startsWith(QLatin1String("x-scheme-handler/"))) {
-+ if (!typedExec.contains(QLatin1String("%u"), Qt::CaseInsensitive) && !typedExec.contains(QLatin1String("%f"), Qt::CaseInsensitive)) {
-+ fullExec += QStringLiteral(" %u");
-+ }
-+ }
-+
- cg.writeEntry("Exec", fullExec);
- cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
- if (terminal->isChecked()) {
---
-GitLab
-
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
deleted file mode 100644
index 033b75bb00b..00000000000
--- a/kde-frameworks/kio/files/kio-5.84.0-fix-qtconcurrent-private-link.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fb9bbb6f1fbb4e6232221a851f55ca2dc43b012c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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 a/kde-frameworks/kio/kio-5.84.0-r1.ebuild b/kde-frameworks/kio/kio-5.84.0-r1.ebuild
deleted file mode 100644
index e4d40e939fa..00000000000
--- a/kde-frameworks/kio/kio-5.84.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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/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
- =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}-fix-qtconcurrent-private-link.patch # bug 784971
- "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030
- "${FILESDIR}"/${P}-fix-open-url-w-binary.patch # KDE-bug 439477
-)
-
-src_configure() {
- local mycmakeargs=(
- -DKIO_NO_PUBLIC_QTCONCURRENT=ON
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(cmake_use_find_package kerberos GSSAPI)
- $(cmake_use_find_package kwallet KF5Wallet)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-08-15 18:57 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-08-15 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 594dab88cb7f143f75df356cde47f6022e8e1ee2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 15 18:28:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 15 18:56:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594dab88
kde-frameworks/kio: KDirOperator: exp. to url only in detail treeview
Upstream commit 51737430fcd963a04a4eddbb166114ae25430814
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=440475
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...erator-exp-to-url-only-in-detail-treeview.patch | 54 ++++++++++++++++++++++
.../{kio-5.85.0.ebuild => kio-5.85.0-r1.ebuild} | 4 ++
2 files changed, 58 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
new file mode 100644
index 00000000000..54365b694fa
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
@@ -0,0 +1,54 @@
+From 51737430fcd963a04a4eddbb166114ae25430814 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Wed, 4 Aug 2021 23:22:10 +0200
+Subject: [PATCH] KDirOperator: expand to url only in detail tree view
+
+When "allow expansion" is disabled in the menu, the view type is KFile::Tree,
+however when selecting an item from the location (Name:) combobox history,
+the item model would expand to show the file; that should only happen if
+"allow expansion" is enabled, i.e. when the view type is KFile::DetailTree.
+
+BUG: 440475
+FIXED-IN: 5.86
+
+asturm 2021-08-15: fixed by merge with 8039f8b399757001ffa919ef56ede283c287dcd4
+---
+ src/filewidgets/kdiroperator.cpp | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
+index bc80d93fe..7af20a057 100644
+--- a/src/filewidgets/kdiroperator.cpp
++++ b/src/filewidgets/kdiroperator.cpp
+@@ -1870,7 +1870,11 @@ void KDirOperator::setCurrentItem(const QUrl &url)
+ KFileItem item = d->m_dirLister->findByUrl(url);
+ if (d->m_shouldFetchForItems && item.isNull()) {
+ d->m_itemsToBeSetAsCurrent << url;
+- d->m_dirModel->expandToUrl(url);
++
++ if (d->m_viewKind == KFile::DetailTree) {
++ d->m_dirModel->expandToUrl(url);
++ }
++
+ return;
+ }
+
+@@ -1909,9 +1913,14 @@ void KDirOperator::setCurrentItems(const QList<QUrl> &urls)
+ KFileItem item = d->m_dirLister->findByUrl(url);
+ if (d->m_shouldFetchForItems && item.isNull()) {
+ d->m_itemsToBeSetAsCurrent << url;
+- d->m_dirModel->expandToUrl(url);
++
++ if (d->m_viewKind == KFile::DetailTree) {
++ d->m_dirModel->expandToUrl(url);
++ }
++
+ continue;
+ }
++
+ itemList << item;
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.85.0.ebuild b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
similarity index 95%
rename from kde-frameworks/kio/kio-5.85.0.ebuild
rename to kde-frameworks/kio/kio-5.85.0-r1.ebuild
index 2d2d3499281..9522606997f 100644
--- a/kde-frameworks/kio/kio-5.85.0.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+PATCHES=(
+ "${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
+)
+
src_configure() {
local mycmakeargs=(
-DKIO_NO_PUBLIC_QTCONCURRENT=ON
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-11-18 10:38 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-11-18 10:38 UTC (permalink / raw
To: gentoo-commits
commit: b9c841633df4bf635da79a52106df4785bbb7ddb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 10:09:37 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 10:09:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c84163
kde-frameworks/kio: Fix file copy over FS boundaries w/ Linux <5.3
See also:
https://mail.kde.org/pipermail/distributions/2021-November/001096.html
Upstream commit aef544ebbb11e842209f3b071eaa9d1c2f26fa40
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.88.0-fix-copy-between-filesystems.patch | 28 +++++++
kde-frameworks/kio/kio-5.88.0-r1.ebuild | 96 ++++++++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
new file mode 100644
index 000000000000..a6a4877cf0f4
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
@@ -0,0 +1,28 @@
+From aef544ebbb11e842209f3b071eaa9d1c2f26fa40 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 17 Nov 2021 23:45:17 +0100
+Subject: [PATCH] Fix copying between different filesystems on Linux < 5.3
+
+From the copy_file_range manpage
+
+EXDEV The files referred to by fd_in and fd_out are not on the same mounted filesystem (pre Linux 5.3).
+---
+ 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 b4eca2ae9..02b5dc14c 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -813,7 +813,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
+ const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
+
+ if (copiedBytes == -1) {
+- if (errno == EINVAL) {
++ if (errno == EINVAL || errno == EXDEV) {
+ break; // will continue with next copy mechanism
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.88.0-r1.ebuild b/kde-frameworks/kio/kio-5.88.0-r1.ebuild
new file mode 100644
index 000000000000..dcc6a8a9819b
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.88.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 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.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 ~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
+ =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}-fix-copy-between-filesystems.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: f9435f8048d66cf3f4663b8f65d231c3f82388d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 13:01:07 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9435f80
kde-frameworks/kio: Fix KRun opening URLs twice
Upstream commit 25f3a6937a80f2748790265b9b688d64126e43d0
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446272
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.88.0-fix-KRun-open-URLs-twice.patch | 87 +++++++++++++++++++
kde-frameworks/kio/kio-5.88.0-r2.ebuild | 99 ++++++++++++++++++++++
2 files changed, 186 insertions(+)
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
new file mode 100644
index 000000000000..0d3bf2aeca3a
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
@@ -0,0 +1,87 @@
+From 25f3a6937a80f2748790265b9b688d64126e43d0 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+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 <QProcess>
+ #include <QStandardPaths>
+ #include <QString>
++#include <QTimer>
+ #include <QUuid>
+
+ #ifdef Q_OS_WIN
+@@ -259,7 +260,6 @@ void KProcessRunner::init(const KService::Ptr &service,
+ 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 &service,
+ }
+ if (window) {
+ const int launchedSerial = KWindowSystem::lastInputSerial(window);
+- waitingForXdgToken = true;
++ m_waitingForXdgToken = true;
+ connect(this, &KProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
+ startProcess();
+ });
+@@ -285,6 +285,7 @@ void KProcessRunner::init(const KService::Ptr &service,
+ 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 &service,
+ 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(), &QProcess::stateChanged, &loop, &QEventLoop::quit);
++ QTimer::singleShot(timeout, &loop, &QEventLoop::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 &errorMsg);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.88.0-r2.ebuild b/kde-frameworks/kio/kio-5.88.0-r2.ebuild
new file mode 100644
index 000000000000..924efc14421f
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.88.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 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.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 ~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
+ =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}-fix-copy-between-filesystems.patch
+ "${FILESDIR}"/${P}-fix-KRun-open-URLs-twice.patch # KDE-bug 446272
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-06-29 19:53 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-06-29 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 2a200ab7f01daf00e1b5f6a5d00ab85b787b77b5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:47:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:53:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a200ab7
kde-frameworks/kio: KRecentDocuments: Improve indentation
...in recentlyused.xbel
Upstream commit 0dd0e96c10f634974c63f85c2068e44019c27591
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=456046
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.95.0-fix-recent-files-in-gtk-apps.patch | 25 ++++++++++++++++++++++
kde-frameworks/kio/kio-5.95.0-r1.ebuild | 5 ++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch
new file mode 100644
index 000000000000..524fdc871fc8
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.95.0-fix-recent-files-in-gtk-apps.patch
@@ -0,0 +1,25 @@
+From 0dd0e96c10f634974c63f85c2068e44019c27591 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven@kdemail.net>
+Date: Wed, 29 Jun 2022 10:14:50 +0200
+Subject: [PATCH] KRecentDocuments: Improve indentation in recentlyused.xbel
+
+BUG: 456046
+---
+ src/core/krecentdocument.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/krecentdocument.cpp b/src/core/krecentdocument.cpp
+index 23fcbbd09..87d276b06 100644
+--- a/src/core/krecentdocument.cpp
++++ b/src/core/krecentdocument.cpp
+@@ -270,6 +270,7 @@ static bool addToXbel(const QUrl &url, const QString &desktopEntryName, KRecentD
+
+ if (!foundExisting) {
+ // must create new bookmark tag
++ output.writeCharacters(QStringLiteral(" "));
+ output.writeStartElement(bookmarkTag);
+
+ output.writeAttribute(hrefAttribute, newUrl);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.95.0-r1.ebuild b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
index 8b7697b65a88..85dc54c90eef 100644
--- a/kde-frameworks/kio/kio-5.95.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.95.0-r1.ebuild
@@ -70,7 +70,10 @@ DEPEND="${RDEPEND}
"
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-PATCHES=( "${FILESDIR}/${P}-filewidgets-update-filename-after-rename.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-filewidgets-update-filename-after-rename.patch"
+ "${FILESDIR}/${P}-fix-recent-files-in-gtk-apps.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-07-19 13:29 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-07-19 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 35ba1aee75ef4f7aa7cffb17968c1fe46adac58d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 13:26:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 13:29:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ba1aee
kde-frameworks/kio: Fix crash in DropJob
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=454747
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kio-5.96.0-fix-crash-in-dropjob.patch | 45 ++++++++++
kde-frameworks/kio/kio-5.96.0-r1.ebuild | 96 ++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch
new file mode 100644
index 000000000000..638a03f6eb98
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch
@@ -0,0 +1,45 @@
+From 29bdf541aa83c78bc8e9d90487a7e1dd505ef013 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 8 Jul 2022 15:46:11 +0100
+Subject: [PATCH] Fix crash in DropJob
+
+QMimeData is owned by the backend and can be deleted during any event
+processing.
+
+DropJob has a deferred start operation. One path in this is to call
+PasteJob with mimedata. It could be dangling by this point.
+
+Pastejob follows a similar pattern in
+1d668a9fe65c5bc178487fc32e6662ff815147f6 internally but we also need to
+handle this usage before PasteJob.
+
+BUG: 454747
+---
+ src/widgets/dropjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
+index fa2bf4ccc..5af578d28 100644
+--- a/src/widgets/dropjob.cpp
++++ b/src/widgets/dropjob.cpp
+@@ -139,7 +139,7 @@ public:
+ void addPluginActions(KIO::DropMenu *popup, const KFileItemListProperties &itemProps);
+ void doCopyToDirectory();
+
+- const QMimeData *m_mimeData;
++ QPointer<const QMimeData> m_mimeData;
+ const QList<QUrl> m_urls;
+ QMap<QString, QString> m_metaData;
+ Qt::DropAction m_dropAction;
+@@ -271,7 +271,7 @@ void DropJobPrivate::slotStart()
+ q->emitResult();
+ }
+ }
+- } else {
++ } else if (m_mimeData) {
+ // Dropping raw data
+ KIO::PasteJob *job = KIO::PasteJobPrivate::newJob(m_mimeData, m_destUrl, KIO::HideProgressInfo, false /*not clipboard*/);
+ QObject::connect(job, &KIO::PasteJob::itemCreated, q, &KIO::DropJob::itemCreated);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.96.0-r1.ebuild b/kde-frameworks/kio/kio-5.96.0-r1.ebuild
new file mode 100644
index 000000000000..b0ac9188780f
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.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.4
+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
+ =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}-fix-crash-in-dropjob.patch" ) # KDE-bug #454747
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-07-26 12:08 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-07-26 12:08 UTC (permalink / raw
To: gentoo-commits
commit: befda3cc73a9de3fe71fd67bf806c5213eceeabc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 11:27:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 12:04:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=befda3cc
kde-frameworks/kio: Fix RAW file image preview
Upstream commit 5002a07e71ff270a8717911b965a75c33993f883
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=453480
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.96.0-fix-RAW-file-image-preview.patch | 37 ++++++++
kde-frameworks/kio/kio-5.96.0-r2.ebuild | 99 ++++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
new file mode 100644
index 000000000000..12d4a4c05f2d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
@@ -0,0 +1,37 @@
+From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Fri, 8 Jul 2022 11:00:42 +0200
+Subject: [PATCH] Fix thumbnailer result for parent mime types being
+ overwritten
+
+BUG: 453480
+---
+ src/widgets/previewjob.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
+index c53bcc88a..91be5575e 100644
+--- a/src/widgets/previewjob.cpp
++++ b/src/widgets/previewjob.cpp
+@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview()
+ }
+ }
+
+- // Check the wildcards last, see BUG 453480
+- QString groupMimeType = mimeType;
+- static const QRegularExpression expr(QStringLiteral("/.*"));
+- groupMimeType.replace(expr, QStringLiteral("/*"));
+- pluginIt = mimeMap.constFind(groupMimeType);
++ if (pluginIt == mimeMap.constEnd()) {
++ // Check the wildcards last, see BUG 453480
++ QString groupMimeType = mimeType;
++ static const QRegularExpression expr(QStringLiteral("/.*"));
++ groupMimeType.replace(expr, QStringLiteral("/*"));
++ pluginIt = mimeMap.constFind(groupMimeType);
++ }
+ }
+
+ if (pluginIt != mimeMap.constEnd()) {
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.96.0-r2.ebuild b/kde-frameworks/kio/kio-5.96.0-r2.ebuild
new file mode 100644
index 000000000000..f04669079060
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.0-r2.ebuild
@@ -0,0 +1,99 @@
+# 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.4
+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
+ =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}-fix-crash-in-dropjob.patch" # KDE-bug 454747
+ "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(cmake_use_find_package kerberos GSSAPI)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ $(cmake_use_find_package X X11)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-08-08 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-08-08 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 940ee28bb75cf49a6deed0198870cde4119dea14
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 22:16:44 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 14:39:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940ee28b
kde-frameworks/kio: Fix build with USE -X, drop obsolete DEPENDs
Upstream commit c7a277e6810b74b7f664b029573beab592932421
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 ++++++++++++++++
kde-frameworks/kio/kio-5.96.0-r3.ebuild | 96 ++++++++++++++++++++++
2 files changed, 168 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
new file mode 100644
index 000000000000..9f87ec989af1
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
@@ -0,0 +1,72 @@
+From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 1 Aug 2022 22:10:02 +0200
+Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option
+ instead
+
+This will only determine whether to search for Qt5X11Extras and then
+set HAVE_X11 accordingly. This is a behavior change as previously it was
+silently disabled if X11 was not found.
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 19 +++++++++----------
+ src/ioslaves/http/CMakeLists.txt | 3 ---
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95b5db299..c3372f7ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of
+ PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used"
+ )
+
+-if (NOT APPLE AND NOT WIN32)
+- find_package(X11)
+-endif()
+-
+-set(HAVE_X11 ${X11_FOUND})
+-if (HAVE_X11)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+- else()
+- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++if (NOT APPLE AND NOT WIN32 AND NOT ANDROID)
++ option(WITH_X11 "Build with X11 integration" ON)
++ if(WITH_X11)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ else()
++ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
++ endif()
+ endif()
++ set(HAVE_X11 ${WITH_X11})
+ endif()
+
+ find_package(ACL)
+diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
+index 4fbddb4a3..689f63dd8 100644
+--- a/src/ioslaves/http/CMakeLists.txt
++++ b/src/ioslaves/http/CMakeLists.txt
+@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable)
+ include(ConfigureChecks.cmake)
+ configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h )
+
+-find_package(X11)
+-set(HAVE_X11 ${X11_FOUND})
+-
+ if(GSSAPI_FOUND)
+ set(HAVE_LIBGSSAPI 1)
+ if(GSSAPI_FLAVOR STREQUAL "MIT")
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
new file mode 100644
index 000000000000..0a3ca54a7735
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.96.0-r3.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.4
+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}-fix-crash-in-dropjob.patch" # KDE-bug 454747
+ "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
+ # Approved upstream: https://invent.kde.org/frameworks/kio/-/merge_requests/943
+ "${FILESDIR}/${P}-with_x11.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(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
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2022-11-27 11:20 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2022-11-27 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 055421201fc763afbea5526c9eefba2319e93627
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:13:36 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05542120
kde-frameworks/kio: drop 5.96.0-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
.../kio-5.96.0-fix-RAW-file-image-preview.patch | 37 ---------
.../files/kio-5.96.0-fix-crash-in-dropjob.patch | 45 ----------
kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 ----------------
kde-frameworks/kio/kio-5.96.0-r3.ebuild | 96 ----------------------
5 files changed, 251 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 6bb49d8ed3dd..f73e93f3f0ef 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.100.0.tar.xz 3759832 BLAKE2B a98798bd35662699bd50b767c5a4c69ea85be616794dcbade560c3f212cfa0ed757dd67fa49afe4747d950416dc5d9c005a4183b53c199ce94ed2af16478aa60 SHA512 855ff7ff62a54a20d636c501fcb77e6d5bcb6376219152643298c7a3b2c4262ac61397c82f21711403482346c4cadb2b2e67f40d43a471bb03f25fe0a36cfa74
-DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
DIST kio-5.99.0.tar.xz 3407180 BLAKE2B 2014bb1e2ae020dbe47dd0964e003814fabde5cf14cbb74b05f5703ffc5fea2e6f22f26ae2a9cfc3806043d4618115ed14b9b60ab38bf9d5acb7ca8b2d5c2e06 SHA512 b18e6c79913b8da0f800bbf58433069531a6c79d711876c46785d88c79f6a45503d69dcd0fee958f727c7dd394f398c951b660e47f77e8372f3be75367ad9014
diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
deleted file mode 100644
index 12d4a4c05f2d..000000000000
--- a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Fri, 8 Jul 2022 11:00:42 +0200
-Subject: [PATCH] Fix thumbnailer result for parent mime types being
- overwritten
-
-BUG: 453480
----
- src/widgets/previewjob.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index c53bcc88a..91be5575e 100644
---- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview()
- }
- }
-
-- // Check the wildcards last, see BUG 453480
-- QString groupMimeType = mimeType;
-- static const QRegularExpression expr(QStringLiteral("/.*"));
-- groupMimeType.replace(expr, QStringLiteral("/*"));
-- pluginIt = mimeMap.constFind(groupMimeType);
-+ if (pluginIt == mimeMap.constEnd()) {
-+ // Check the wildcards last, see BUG 453480
-+ QString groupMimeType = mimeType;
-+ static const QRegularExpression expr(QStringLiteral("/.*"));
-+ groupMimeType.replace(expr, QStringLiteral("/*"));
-+ pluginIt = mimeMap.constFind(groupMimeType);
-+ }
- }
-
- if (pluginIt != mimeMap.constEnd()) {
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch
deleted file mode 100644
index 638a03f6eb98..000000000000
--- a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 29bdf541aa83c78bc8e9d90487a7e1dd505ef013 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 8 Jul 2022 15:46:11 +0100
-Subject: [PATCH] Fix crash in DropJob
-
-QMimeData is owned by the backend and can be deleted during any event
-processing.
-
-DropJob has a deferred start operation. One path in this is to call
-PasteJob with mimedata. It could be dangling by this point.
-
-Pastejob follows a similar pattern in
-1d668a9fe65c5bc178487fc32e6662ff815147f6 internally but we also need to
-handle this usage before PasteJob.
-
-BUG: 454747
----
- src/widgets/dropjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
-index fa2bf4ccc..5af578d28 100644
---- a/src/widgets/dropjob.cpp
-+++ b/src/widgets/dropjob.cpp
-@@ -139,7 +139,7 @@ public:
- void addPluginActions(KIO::DropMenu *popup, const KFileItemListProperties &itemProps);
- void doCopyToDirectory();
-
-- const QMimeData *m_mimeData;
-+ QPointer<const QMimeData> m_mimeData;
- const QList<QUrl> m_urls;
- QMap<QString, QString> m_metaData;
- Qt::DropAction m_dropAction;
-@@ -271,7 +271,7 @@ void DropJobPrivate::slotStart()
- q->emitResult();
- }
- }
-- } else {
-+ } else if (m_mimeData) {
- // Dropping raw data
- KIO::PasteJob *job = KIO::PasteJobPrivate::newJob(m_mimeData, m_destUrl, KIO::HideProgressInfo, false /*not clipboard*/);
- QObject::connect(job, &KIO::PasteJob::itemCreated, q, &KIO::DropJob::itemCreated);
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
deleted file mode 100644
index 9f87ec989af1..000000000000
--- a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 1 Aug 2022 22:10:02 +0200
-Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option
- instead
-
-This will only determine whether to search for Qt5X11Extras and then
-set HAVE_X11 accordingly. This is a behavior change as previously it was
-silently disabled if X11 was not found.
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 19 +++++++++----------
- src/ioslaves/http/CMakeLists.txt | 3 ---
- 2 files changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95b5db299..c3372f7ea 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of
- PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used"
- )
-
--if (NOT APPLE AND NOT WIN32)
-- find_package(X11)
--endif()
--
--set(HAVE_X11 ${X11_FOUND})
--if (HAVE_X11)
-- if (QT_MAJOR_VERSION STREQUAL "5")
-- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
-- else()
-- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
-+if (NOT APPLE AND NOT WIN32 AND NOT ANDROID)
-+ option(WITH_X11 "Build with X11 integration" ON)
-+ if(WITH_X11)
-+ if (QT_MAJOR_VERSION STREQUAL "5")
-+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
-+ else()
-+ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above
-+ endif()
- endif()
-+ set(HAVE_X11 ${WITH_X11})
- endif()
-
- find_package(ACL)
-diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
-index 4fbddb4a3..689f63dd8 100644
---- a/src/ioslaves/http/CMakeLists.txt
-+++ b/src/ioslaves/http/CMakeLists.txt
-@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable)
- include(ConfigureChecks.cmake)
- configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h )
-
--find_package(X11)
--set(HAVE_X11 ${X11_FOUND})
--
- if(GSSAPI_FOUND)
- set(HAVE_LIBGSSAPI 1)
- if(GSSAPI_FLAVOR STREQUAL "MIT")
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
deleted file mode 100644
index ba5dd490e22e..000000000000
--- a/kde-frameworks/kio/kio-5.96.0-r3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.4
-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}-fix-crash-in-dropjob.patch" # KDE-bug 454747
- "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
- # Approved upstream: https://invent.kde.org/frameworks/kio/-/merge_requests/943
- "${FILESDIR}/${P}-with_x11.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DKIO_NO_PUBLIC_QTCONCURRENT=ON
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(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
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2023-01-25 10:22 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-01-25 10:22 UTC (permalink / raw
To: gentoo-commits
commit: 176e58440a7ad690443610338884bfb5a0046e0f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 10:07:58 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 10:18:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176e5844
kde-frameworks/kio: Fix WebDAV file loss
Bug: https://bugs.gentoo.org/891961
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio/files/kio-5.99.0-fix-webdav-fileloss.patch | 26 +++++++
kde-frameworks/kio/kio-5.99.0-r1.ebuild | 91 ++++++++++++++++++++++
2 files changed, 117 insertions(+)
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
new file mode 100644
index 000000000000..68190d3d4c17
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.99.0-fix-webdav-fileloss.patch
@@ -0,0 +1,26 @@
+From 501091059ae9fc2877d621cdbc0fb3c5ece56dae Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+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
new file mode 100644
index 000000000000..f30be3b779bb
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.99.0-r1.ebuild
@@ -0,0 +1,91 @@
+# 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.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}-fix-webdav-fileloss.patch" ) # bug 891961
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(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
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2023-03-23 8:11 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-03-23 8:11 UTC (permalink / raw
To: gentoo-commits
commit: e5a1d3770a9f296ecc8069dd42a9f5574ba7731c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 08:10:02 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 08:11:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a1d377
kde-frameworks/kio: widgets/renamefiledialog: set number limit again
Upstream commit d8e4f575e4967a2303812529a866b89ad2fe26f5
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=466636
Bug: https://bugs.gentoo.org/899706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.104.0-renamefiledialog-fix-number-limit.patch | 31 ++++++++
kde-frameworks/kio/kio-5.104.0-r1.ebuild | 91 ++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch b/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch
new file mode 100644
index 000000000000..dfdf851e065e
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch
@@ -0,0 +1,31 @@
+From d8e4f575e4967a2303812529a866b89ad2fe26f5 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Tue, 7 Mar 2023 23:43:21 +0100
+Subject: [PATCH] widgets/renamefiledialog: set number limit again
+
+Not setting a maximum makes it default to 99, which is not what we want.
+Instead, set it to a billion, which should be enough for everyone
+
+BUG: 466636
+
+
+(cherry picked from commit 04e31155574939dc0be2078b5f17c36791ef57e5)
+---
+ src/widgets/renamefiledialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/widgets/renamefiledialog.cpp b/src/widgets/renamefiledialog.cpp
+index ad6eafbaa0..ceb0748755 100644
+--- a/src/widgets/renamefiledialog.cpp
++++ b/src/widgets/renamefiledialog.cpp
+@@ -132,6 +132,7 @@ RenameFileDialog::RenameFileDialog(const KFileItemList &items, QWidget *parent)
+ mainLayout->addWidget(infoLabel);
+ d->spinBox = new QSpinBox(page);
+ d->spinBox->setMinimum(0);
++ d->spinBox->setMaximum(1'000'000'000);
+ d->spinBox->setSingleStep(1);
+ d->spinBox->setValue(1);
+ d->spinBox->setDisplayIntegerBase(10);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.104.0-r1.ebuild b/kde-frameworks/kio/kio-5.104.0-r1.ebuild
new file mode 100644
index 000000000000..0a8a61024856
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.104.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}-renamefiledialog-fix-number-limit.patch" ) # KDE-bug 466636
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(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
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2023-03-23 16:47 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-03-23 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 6236777c9eb031d4637ea86950202248a1ab37eb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 16:45:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 16:46:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6236777c
kde-frameworks/kio: Also handle copy_file_range failing with ENOENT
Bug: https://bugs.gentoo.org/885793
Bug: https://bugs.gentoo.org/899706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...0-handle-copy_file_range-failing-w-ENOENT.patch | 33 ++++++++
kde-frameworks/kio/kio-5.104.0-r2.ebuild | 94 ++++++++++++++++++++++
2 files changed, 127 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch b/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch
new file mode 100644
index 000000000000..ae10923bb774
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch
@@ -0,0 +1,33 @@
+From 05dee56f45dae37745f21a95e19a149b69e719e3 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Mon, 27 Feb 2023 09:30:05 +0100
+Subject: [PATCH] Also handle copy_file_range failing with ENOENT
+
+There appears to be a kernel bug (?) that CIFS fails with ENOENT on
+copy_file_range.
+
+coreutils had to work around this as well, see the included link.
+
+(cherry picked from commit 00840d05abd875e1901b655ed6af3bc76ef48433)
+---
+ src/ioslaves/file/file_unix.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index 1865b852d9..8d005daf81 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -822,7 +822,9 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
+ const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
+
+ if (copiedBytes == -1) {
+- if (errno == EINVAL || errno == EXDEV) {
++ // ENOENT is returned on cifs in some cases, probably a kernel bug
++ // (s.a. https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c)
++ if (errno == EINVAL || errno == EXDEV || errno == ENOENT) {
+ break; // will continue with next copy mechanism
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.104.0-r2.ebuild b/kde-frameworks/kio/kio-5.104.0-r2.ebuild
new file mode 100644
index 000000000000..4734831d6e8a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.104.0-r2.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_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}-renamefiledialog-fix-number-limit.patch" # KDE-bug 466636
+ "${FILESDIR}/${P}-handle-copy_file_range-failing-w-ENOENT.patch" # bug 885793
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(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
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2023-03-26 9:52 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-03-26 9:52 UTC (permalink / raw
To: gentoo-commits
commit: b54d47c394ba378ca50df729688e5f0890466783
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 09:28:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 09:50:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b54d47c3
kde-frameworks/kio: CommandLauncher: call emitResult() as soon as
...process has started
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=466359
Bug: https://bugs.gentoo.org/899706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio-5.104.0-fix-kstart5-not-returning.patch | 78 ++++++++++++++++++
kde-frameworks/kio/kio-5.104.0-r3.ebuild | 95 ++++++++++++++++++++++
2 files changed, 173 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch
new file mode 100644
index 000000000000..53df9fcc0a62
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch
@@ -0,0 +1,78 @@
+From fea052ba369e474a092516a4717556b52ff92e00 Mon Sep 17 00:00:00 2001
+From: Thenujan Sandramohan <sthenujan2002@gmail.com>
+Date: Fri, 24 Mar 2023 22:33:19 +0000
+Subject: [PATCH] CommandLauncher: call emitResult() as soon as process has
+ started
+
+This MR makes `emitResult` get called as soon as the process has started instead of when the process has ended. It also changes `emitDelayedError` as a protected member of `KProcessRunner` to make it invokable by `ForkingProcessRunner`. It also removes `processFinished` signal as it's not used anymore.
+
+BUG: 466359
+---
+ src/gui/commandlauncherjob.cpp | 2 --
+ src/gui/kprocessrunner.cpp | 3 +--
+ src/gui/kprocessrunner_p.h | 7 +------
+ 3 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/src/gui/commandlauncherjob.cpp b/src/gui/commandlauncherjob.cpp
+index c82a8ef56e..06deede116 100644
+--- a/src/gui/commandlauncherjob.cpp
++++ b/src/gui/commandlauncherjob.cpp
+@@ -143,8 +143,6 @@ void KIO::CommandLauncherJob::start()
+ });
+ connect(d->m_processRunner, &KProcessRunner::processStarted, this, [this](qint64 pid) {
+ d->m_pid = pid;
+- });
+- connect(d->m_processRunner, &KProcessRunner::processFinished, this, [this]() {
+ emitResult();
+ });
+ }
+diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
+index 232b0e4caa..b97079c240 100644
+--- a/src/gui/kprocessrunner.cpp
++++ b/src/gui/kprocessrunner.cpp
+@@ -472,9 +472,8 @@ void ForkingProcessRunner::slotProcessExited(int exitCode, QProcess::ExitStatus
+ if (exitCode == 9009) {
+ #endif
+ const QStringList args = m_cmd.split(QLatin1Char(' '));
+- Q_EMIT error(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0]));
++ emitDelayedError(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0]));
+ }
+- Q_EMIT processFinished();
+ }
+
+ // This code is also used in klauncher (and KRun).
+diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
+index 84973547c6..65df04b073 100644
+--- a/src/gui/kprocessrunner_p.h
++++ b/src/gui/kprocessrunner_p.h
+@@ -120,11 +120,6 @@ Q_SIGNALS:
+ */
+ void processStarted(qint64 pid);
+
+- /**
+- * @brief emitted when the process was finished
+- */
+- void processFinished();
+-
+ /**
+ * Notifies about having received the token were waiting for.
+ *
+@@ -142,6 +137,7 @@ protected:
+ QString name() const;
+ QString maybeAliasedName(const QString &pattern) const;
+ static QString escapeUnitName(const QString &input);
++ void emitDelayedError(const QString &errorMsg);
+
+ std::unique_ptr<KProcess> m_process;
+ QString m_executable; // can be a full path
+@@ -157,7 +153,6 @@ protected:
+ KStartupInfoId m_startupId;
+
+ private:
+- void emitDelayedError(const QString &errorMsg);
+ void initFromDesktopName(const QString &desktopName,
+ const QString &execName,
+ const QString &iconName,
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.104.0-r3.ebuild b/kde-frameworks/kio/kio-5.104.0-r3.ebuild
new file mode 100644
index 000000000000..5be2f39055e0
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.104.0-r3.ebuild
@@ -0,0 +1,95 @@
+# 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}-renamefiledialog-fix-number-limit.patch" # KDE-bug 466636
+ "${FILESDIR}/${P}-handle-copy_file_range-failing-w-ENOENT.patch" # bug 885793
+ "${FILESDIR}/${P}-fix-kstart5-not-returning.patch" # KDE-bug 466359
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DKIO_NO_PUBLIC_QTCONCURRENT=ON
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package handbook KF5DocTools)
+ $(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
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2023-06-22 21:16 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2023-06-22 21:16 UTC (permalink / raw
To: gentoo-commits
commit: cca54926437d76292328419ebc5659b183a1640e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 20:42:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 21:16:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca54926
kde-frameworks/kio: drop 5.104.0-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
.../kio-5.104.0-fix-kstart5-not-returning.patch | 78 ------------------
...0-handle-copy_file_range-failing-w-ENOENT.patch | 33 --------
...5.104.0-renamefiledialog-fix-number-limit.patch | 31 -------
kde-frameworks/kio/kio-5.104.0-r3.ebuild | 95 ----------------------
5 files changed, 238 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index dea1e5c12ba3..252988842c2b 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.104.0.tar.xz 3770264 BLAKE2B 5633873828eafbfc1438d898c7eee7cc4234d0612b636d9b086ec273527900a0f9cc5fb3aeac327c2d0a96ec00192377e27f44bb300c6e7209876826b77a9b22 SHA512 483edb57a9de8be37248b4bdbd442d55814e126348d6db8316c9bcd59be76620d44145760e31ba685ce3ae606451547c3c386f8049b47df1b7f4ef2f45c276b8
DIST kio-5.106.0.tar.xz 3771496 BLAKE2B 46cb4ab6b6ec83efdd9fa9a4c988d25517462efb9f70a258cccb5c2c8ee197083cdd881a7393251487091d88d86580173d7f1a9af12347e707cdcbb864ed0cfd SHA512 d4996f5bc4e69ebab4ca49944c820c54998a0c25995f14f4f27e8d6967e0274ae02e248c75a8b3315cd77b10ce93b36c3825da2de832349f5a2abd067eae6b92
DIST kio-5.107.0.tar.xz 3771692 BLAKE2B d0528bf0b14ece9505d9c15b302415eea4384bd143b7963cf3ef475ccb1789ca3d1c8ada2047d964dbbf2d965e20dcd6d9509c8147beefa4f4b95d140a4f5731 SHA512 184b7eea95f72302a81f799e683228ebb6814d9fe6ca515f9db3a911fc773366aec0550bfc904e7c011977d6b577a7c2bbeab3c3bfeabf0fee54f72b2e12c222
diff --git a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch b/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch
deleted file mode 100644
index 53df9fcc0a62..000000000000
--- a/kde-frameworks/kio/files/kio-5.104.0-fix-kstart5-not-returning.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From fea052ba369e474a092516a4717556b52ff92e00 Mon Sep 17 00:00:00 2001
-From: Thenujan Sandramohan <sthenujan2002@gmail.com>
-Date: Fri, 24 Mar 2023 22:33:19 +0000
-Subject: [PATCH] CommandLauncher: call emitResult() as soon as process has
- started
-
-This MR makes `emitResult` get called as soon as the process has started instead of when the process has ended. It also changes `emitDelayedError` as a protected member of `KProcessRunner` to make it invokable by `ForkingProcessRunner`. It also removes `processFinished` signal as it's not used anymore.
-
-BUG: 466359
----
- src/gui/commandlauncherjob.cpp | 2 --
- src/gui/kprocessrunner.cpp | 3 +--
- src/gui/kprocessrunner_p.h | 7 +------
- 3 files changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/gui/commandlauncherjob.cpp b/src/gui/commandlauncherjob.cpp
-index c82a8ef56e..06deede116 100644
---- a/src/gui/commandlauncherjob.cpp
-+++ b/src/gui/commandlauncherjob.cpp
-@@ -143,8 +143,6 @@ void KIO::CommandLauncherJob::start()
- });
- connect(d->m_processRunner, &KProcessRunner::processStarted, this, [this](qint64 pid) {
- d->m_pid = pid;
-- });
-- connect(d->m_processRunner, &KProcessRunner::processFinished, this, [this]() {
- emitResult();
- });
- }
-diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
-index 232b0e4caa..b97079c240 100644
---- a/src/gui/kprocessrunner.cpp
-+++ b/src/gui/kprocessrunner.cpp
-@@ -472,9 +472,8 @@ void ForkingProcessRunner::slotProcessExited(int exitCode, QProcess::ExitStatus
- if (exitCode == 9009) {
- #endif
- const QStringList args = m_cmd.split(QLatin1Char(' '));
-- Q_EMIT error(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0]));
-+ emitDelayedError(xi18nc("@info", "The command <command>%1</command> could not be found.", args[0]));
- }
-- Q_EMIT processFinished();
- }
-
- // This code is also used in klauncher (and KRun).
-diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
-index 84973547c6..65df04b073 100644
---- a/src/gui/kprocessrunner_p.h
-+++ b/src/gui/kprocessrunner_p.h
-@@ -120,11 +120,6 @@ Q_SIGNALS:
- */
- void processStarted(qint64 pid);
-
-- /**
-- * @brief emitted when the process was finished
-- */
-- void processFinished();
--
- /**
- * Notifies about having received the token were waiting for.
- *
-@@ -142,6 +137,7 @@ protected:
- QString name() const;
- QString maybeAliasedName(const QString &pattern) const;
- static QString escapeUnitName(const QString &input);
-+ void emitDelayedError(const QString &errorMsg);
-
- std::unique_ptr<KProcess> m_process;
- QString m_executable; // can be a full path
-@@ -157,7 +153,6 @@ protected:
- KStartupInfoId m_startupId;
-
- private:
-- void emitDelayedError(const QString &errorMsg);
- void initFromDesktopName(const QString &desktopName,
- const QString &execName,
- const QString &iconName,
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch b/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch
deleted file mode 100644
index ae10923bb774..000000000000
--- a/kde-frameworks/kio/files/kio-5.104.0-handle-copy_file_range-failing-w-ENOENT.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 05dee56f45dae37745f21a95e19a149b69e719e3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Mon, 27 Feb 2023 09:30:05 +0100
-Subject: [PATCH] Also handle copy_file_range failing with ENOENT
-
-There appears to be a kernel bug (?) that CIFS fails with ENOENT on
-copy_file_range.
-
-coreutils had to work around this as well, see the included link.
-
-(cherry picked from commit 00840d05abd875e1901b655ed6af3bc76ef48433)
----
- src/ioslaves/file/file_unix.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 1865b852d9..8d005daf81 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -822,7 +822,9 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
- const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
-
- if (copiedBytes == -1) {
-- if (errno == EINVAL || errno == EXDEV) {
-+ // ENOENT is returned on cifs in some cases, probably a kernel bug
-+ // (s.a. https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=7fc84d1c0f6b35231b0b4577b70aaa26bf548a7c)
-+ if (errno == EINVAL || errno == EXDEV || errno == ENOENT) {
- break; // will continue with next copy mechanism
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch b/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch
deleted file mode 100644
index dfdf851e065e..000000000000
--- a/kde-frameworks/kio/files/kio-5.104.0-renamefiledialog-fix-number-limit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d8e4f575e4967a2303812529a866b89ad2fe26f5 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Tue, 7 Mar 2023 23:43:21 +0100
-Subject: [PATCH] widgets/renamefiledialog: set number limit again
-
-Not setting a maximum makes it default to 99, which is not what we want.
-Instead, set it to a billion, which should be enough for everyone
-
-BUG: 466636
-
-
-(cherry picked from commit 04e31155574939dc0be2078b5f17c36791ef57e5)
----
- src/widgets/renamefiledialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/widgets/renamefiledialog.cpp b/src/widgets/renamefiledialog.cpp
-index ad6eafbaa0..ceb0748755 100644
---- a/src/widgets/renamefiledialog.cpp
-+++ b/src/widgets/renamefiledialog.cpp
-@@ -132,6 +132,7 @@ RenameFileDialog::RenameFileDialog(const KFileItemList &items, QWidget *parent)
- mainLayout->addWidget(infoLabel);
- d->spinBox = new QSpinBox(page);
- d->spinBox->setMinimum(0);
-+ d->spinBox->setMaximum(1'000'000'000);
- d->spinBox->setSingleStep(1);
- d->spinBox->setValue(1);
- d->spinBox->setDisplayIntegerBase(10);
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.104.0-r3.ebuild b/kde-frameworks/kio/kio-5.104.0-r3.ebuild
deleted file mode 100644
index 30caf8f78229..000000000000
--- a/kde-frameworks/kio/kio-5.104.0-r3.ebuild
+++ /dev/null
@@ -1,95 +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
- =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}-renamefiledialog-fix-number-limit.patch" # KDE-bug 466636
- "${FILESDIR}/${P}-handle-copy_file_range-failing-w-ENOENT.patch" # bug 885793
- "${FILESDIR}/${P}-fix-kstart5-not-returning.patch" # KDE-bug 466359
-)
-
-src_configure() {
- local mycmakeargs=(
- -DKIO_NO_PUBLIC_QTCONCURRENT=ON
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package handbook KF5DocTools)
- $(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
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2024-03-19 9:10 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2024-03-19 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 932c0efc6bfa5466526dd0ef6e9258099cf2b691
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 09:07:18 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 09:10:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932c0efc
kde-frameworks/kio: Fix kterminallauncherjob
Inherit default process environment from parent
Upstream commit 6e7775d315f389df0a440ed62b842ce83dc9a27e
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=482107
See also:
https://mail.kde.org/pipermail/distributions/2024-March/001483.html
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio/files/kio-6.0.0-kterminallauncherjob.patch | 34 ++++++++
kde-frameworks/kio/kio-6.0.0-r1.ebuild | 91 ++++++++++++++++++++++
2 files changed, 125 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
new file mode 100644
index 000000000000..2c9b594b33ee
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
@@ -0,0 +1,34 @@
+From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Fri, 1 Mar 2024 22:16:07 +0100
+Subject: [PATCH] [kterminallauncherjob] Inherit default process environment
+ from parent
+
+Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused
+QProcess to incorrectly inherit the environment variables from the parent
+process. This was fixed in qtbase 5fc9c02a695.
+
+CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4,
+however here we are overriding its default env with our own default-constructed one
+
+BUG: 482107
+---
+ src/gui/kterminallauncherjob.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
+index c4e83fb11b..edd99327bd 100644
+--- a/src/gui/kterminallauncherjob.cpp
++++ b/src/gui/kterminallauncherjob.cpp
+@@ -22,7 +22,7 @@ public:
+ QString m_fullCommand; // "xterm -e ls"
+ QString m_desktopName;
+ QByteArray m_startupId;
+- QProcessEnvironment m_environment;
++ QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent};
+ };
+
+ KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent)
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-6.0.0-r1.ebuild b/kde-frameworks/kio/kio-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..384afe22e7e1
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.0.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 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=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kbookmarks-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/ktextwidgets-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/solid-${PVCUT}*:6
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kdoctools-${PVCUT}*:6
+ )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-power/switcheroo-control
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+
+PATCHES=( "${FILESDIR}/${P}-kterminallauncherjob.patch" ) # KDE-bug 482107
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package kwallet KF6Wallet)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2024-03-24 21:03 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2024-03-24 21:03 UTC (permalink / raw
To: gentoo-commits
commit: dcc5ac87c3c7da7b11384c424d5fdb0063fc3eae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 20:37:04 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 21:02:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc5ac87
kde-frameworks/kio: Backport various bug/regression fixes from 6.1.0
Berk Elyesa Yıldırım (1):
Drop legacy keys for m_runOnDiscreteGpuBool
Jonathan Marten (1):
kioexec: Remove temporary files after the main loop has completed
Martin Seher (1):
fix hide service menu items in context menu
Méven Car (2):
KFileitem: Use internal permissions as best case scenario
KFileItem: when checking access use current user
Nicolas Fella (4):
[knewfilemenu] Fix error handling when creating a folder that already exists
[kterminallauncherjob] Inherit default process environment from parent
[knewfilemenu] Add window title for new file dialog
[kfileplacesmodel] Remove wrong assert
Patrycja Rosa (1):
Fix sprintf buffer leaks on 32-bit systems
Sergey Katunin (1):
Revert "Temporarily revert "Consider slow files as remote files in previewjob""
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 +
.../kio/files/kio-6.0.0-kterminallauncherjob.patch | 34 --------
kde-frameworks/kio/kio-6.0.0-r2.ebuild | 93 ++++++++++++++++++++++
3 files changed, 94 insertions(+), 34 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index a7f8d0e727cf..a95962e599eb 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,3 @@
DIST kio-5.115.0.tar.xz 3799964 BLAKE2B 020084259a4e41d102e786d34b899420e18d75f27a3f8391dfd05f57d86168676d5ae88b603d84176a8ad963aee7bc5883ef4952c25f6d8ea1b11cd6d04bb470 SHA512 014eab017a1a9ba65cf122a9f241764054b3591c5759d5121ccd82593ebfe301eec0ba1f9e08165ef75b0fdf057094ef81293a6ec020ee2100394a68ab80a8d7
+DIST kio-6.0.0-patchset.tar.xz 5808 BLAKE2B 94b6a57a660fa2c6d2362b3a35c02a355dc486e59b9d4d74adab91258f2a8fd73ee2f2ae8168d4aaa11ae5508f3492e898002ba274cdd6a51eb1cf3422a003bb SHA512 b20e2b2ed673dffdbc9588bcaf1bcde9ff7dd6d4c77ef7398240b4d6c5f899f1025ef4757fa19f42c2196c60836afe6205bd8cd1ed436cc91ccffd7be427a7a7
DIST kio-6.0.0.tar.xz 3353680 BLAKE2B f65c2cc36e2e22494edf77f598ca6eff037d26de0981d3f136d3db901d1ca4cd069f696c5dd9a42622bcb6b60aabf79e1221b9862e47cc15205341101efe58e2 SHA512 ec230cda5fc9f973e0b02bf7e9a2c282c447c69cd247be10b11299b950043a9517ff17061c1262e4e709539d9fe17ff532d1ff69dae36abe56b1bb0d81327bfe
diff --git a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch b/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
deleted file mode 100644
index 2c9b594b33ee..000000000000
--- a/kde-frameworks/kio/files/kio-6.0.0-kterminallauncherjob.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6e7775d315f389df0a440ed62b842ce83dc9a27e Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 1 Mar 2024 22:16:07 +0100
-Subject: [PATCH] [kterminallauncherjob] Inherit default process environment
- from parent
-
-Before Qt 6.3, an empty (default constructed) QProcessEnvironment caused
-QProcess to incorrectly inherit the environment variables from the parent
-process. This was fixed in qtbase 5fc9c02a695.
-
-CommandLauncherJob was adjusted for this in 916984940f64e07db9b4d152be9f2a87dda0cfb4,
-however here we are overriding its default env with our own default-constructed one
-
-BUG: 482107
----
- src/gui/kterminallauncherjob.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/kterminallauncherjob.cpp b/src/gui/kterminallauncherjob.cpp
-index c4e83fb11b..edd99327bd 100644
---- a/src/gui/kterminallauncherjob.cpp
-+++ b/src/gui/kterminallauncherjob.cpp
-@@ -22,7 +22,7 @@ public:
- QString m_fullCommand; // "xterm -e ls"
- QString m_desktopName;
- QByteArray m_startupId;
-- QProcessEnvironment m_environment;
-+ QProcessEnvironment m_environment{QProcessEnvironment::InheritFromParent};
- };
-
- KTerminalLauncherJob::KTerminalLauncherJob(const QString &command, QObject *parent)
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-6.0.0-r2.ebuild b/kde-frameworks/kio/kio-6.0.0-r2.ebuild
new file mode 100644
index 000000000000..3c6c3979cb39
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.0.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${P}-patchset"
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kbookmarks-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/ktextwidgets-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/solid-${PVCUT}*:6
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kdoctools-${PVCUT}*:6
+ )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-power/switcheroo-control
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package kwallet KF6Wallet)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2024-07-16 16:32 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2024-07-16 16:32 UTC (permalink / raw
To: gentoo-commits
commit: b328c5fab384455b07366963061529a15c5c7e61
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 16:25:33 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 16:31:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b328c5fa
kde-frameworks/kio: Remove parent for DropMenu
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=490183
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
| 45 +++++++++++
kde-frameworks/kio/kio-6.4.0-r1.ebuild | 94 ++++++++++++++++++++++
2 files changed, 139 insertions(+)
--git a/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch b/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
new file mode 100644
index 000000000000..596806804902
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
@@ -0,0 +1,45 @@
+From e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Mon, 15 Jul 2024 09:45:20 +0300
+Subject: [PATCH] Remove parent for DropMenu
+
+QWidget::winId() will force creating window handles for all its ancestor
+widgets unless the Qt::WA_DontCreateNativeAncestors flag is set.
+
+For example, on wayland, this would result in creating sub-surfaces, and
+depending on the client, it's likely that there are going to be issues with
+painting.
+
+On the other hand, since the DropJob takes care of setting the transient
+parent for the DropMenu, the parent can be simply omitted.
+
+BUG: 490183
+---
+ src/widgets/dropjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
+index e11e762bd0..f4a23f5688 100644
+--- a/src/widgets/dropjob.cpp
++++ b/src/widgets/dropjob.cpp
+@@ -520,8 +520,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
+
+ // There was an error, handle it
+ if (error == KIO::ERR_UNKNOWN) {
+- auto *window = KJobWidgets::window(q);
+- KIO::DropMenu *menu = new KIO::DropMenu(window);
++ KIO::DropMenu *menu = new KIO::DropMenu();
+ QObject::connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
+
+ // If the user clicks outside the menu, it will be destroyed without emitting the triggered signal.
+@@ -541,6 +540,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
+ menu->windowHandle()->setTransientParent(transientParent);
+ }
+ }
++ auto *window = KJobWidgets::window(q);
+ menu->popup(window ? window->mapToGlobal(m_relativePos) : QCursor::pos());
+ }
+ m_menus.insert(menu);
+--
+GitLab
+
diff --git a/kde-frameworks/kio/kio-6.4.0-r1.ebuild b/kde-frameworks/kio/kio-6.4.0-r1.ebuild
new file mode 100644
index 000000000000..556fbe131d4d
--- /dev/null
+++ b/kde-frameworks/kio/kio-6.4.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 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=6.6.2
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="acl +kwallet wayland X"
+
+# tests hang
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+COMMON_DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kbookmarks-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcolorscheme-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kcrash-${PVCUT}*:6
+ =kde-frameworks/kdbusaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/knotifications-${PVCUT}*:6
+ =kde-frameworks/kservice-${PVCUT}*:6
+ =kde-frameworks/ktextwidgets-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/solid-${PVCUT}*:6
+ sys-power/switcheroo-control
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kdoctools-${PVCUT}*:6
+ )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
+ X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtbase-${QTMIN}:6[libproxy]
+ sys-power/switcheroo-control
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+
+PATCHES=( "${FILESDIR}/${P}-remove-parent-for-DropMenu.patch" ) # KDE-bug 490183
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package acl ACL)
+ $(cmake_use_find_package kwallet KF6Wallet)
+ -DWITH_WAYLAND=$(usex wayland)
+ -DWITH_X11=$(usex X)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ ecm_pkg_postinst
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ ecm_pkg_postrm
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 39+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/
@ 2024-08-10 7:57 Andreas Sturmlechner
0 siblings, 0 replies; 39+ messages in thread
From: Andreas Sturmlechner @ 2024-08-10 7:57 UTC (permalink / raw
To: gentoo-commits
commit: e653f89a19b7eabb04786e5d9847c1eef4960cca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 20:36:32 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:56:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e653f89a
kde-frameworks/kio: drop 6.4.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kio/Manifest | 1 -
| 45 -----------
kde-frameworks/kio/kio-6.4.0-r1.ebuild | 94 ----------------------
3 files changed, 140 deletions(-)
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index d5d358953c62..f89429b4d3a3 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.116.0.tar.xz 3800352 BLAKE2B 2197d92589bd6eba360a72fb1902bb1e97d48065834e762e681eb312797f8c54829ee6099e87f316de83913755572e7b9fe4aa1d168fa83ada519cce8980d030 SHA512 a07661717846860db3a64bcead9c2b80192d8c5b8e66a25f0f83ced6b596c4e8af7eb94e68b17770f45b36b22ccbcecaef4f8590d790cf69fceb140ab9e47376
-DIST kio-6.4.0.tar.xz 3347400 BLAKE2B 8497d550b247bacfd514a404c9b74fb5620bb0f4e0e3a75c50a637d053c2377ef0399167e13bb4622d02e97be721a1431fc65a5a21b17a8c0425239a5428b5c1 SHA512 9068ea2f400848ad26bfe4b56d9489f897c02a5410d47444b5f44118f7491cd7914eee83dee095f301e910c546a60d5d2a121aea617e87fbc9c971c3ac5e3e24
DIST kio-6.5.0.tar.xz 3350220 BLAKE2B 56b581082b0741953e8b980733dcea45a9c0c77585e061daa1d2ab35249c172c74cf4cf6abaac35c47829c007bf7f6192caddafe7fbf777f42f7624fecbd3cc1 SHA512 091e7bd21140b3c9b11608449dc0d4af75e0ad4e2122d95864cacb7e9f78502fe5daca80774287a9a724ddeb80bef35fbfb1d05a76810229f58f1b948be6093f
diff --git a/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch b/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
deleted file mode 100644
index 596806804902..000000000000
--- a/kde-frameworks/kio/files/kio-6.4.0-remove-parent-for-DropMenu.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Mon, 15 Jul 2024 09:45:20 +0300
-Subject: [PATCH] Remove parent for DropMenu
-
-QWidget::winId() will force creating window handles for all its ancestor
-widgets unless the Qt::WA_DontCreateNativeAncestors flag is set.
-
-For example, on wayland, this would result in creating sub-surfaces, and
-depending on the client, it's likely that there are going to be issues with
-painting.
-
-On the other hand, since the DropJob takes care of setting the transient
-parent for the DropMenu, the parent can be simply omitted.
-
-BUG: 490183
----
- src/widgets/dropjob.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
-index e11e762bd0..f4a23f5688 100644
---- a/src/widgets/dropjob.cpp
-+++ b/src/widgets/dropjob.cpp
-@@ -520,8 +520,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
-
- // There was an error, handle it
- if (error == KIO::ERR_UNKNOWN) {
-- auto *window = KJobWidgets::window(q);
-- KIO::DropMenu *menu = new KIO::DropMenu(window);
-+ KIO::DropMenu *menu = new KIO::DropMenu();
- QObject::connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
-
- // If the user clicks outside the menu, it will be destroyed without emitting the triggered signal.
-@@ -541,6 +540,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
- menu->windowHandle()->setTransientParent(transientParent);
- }
- }
-+ auto *window = KJobWidgets::window(q);
- menu->popup(window ? window->mapToGlobal(m_relativePos) : QCursor::pos());
- }
- m_menus.insert(menu);
---
-GitLab
-
diff --git a/kde-frameworks/kio/kio-6.4.0-r1.ebuild b/kde-frameworks/kio/kio-6.4.0-r1.ebuild
deleted file mode 100644
index a7bbf6bb0a66..000000000000
--- a/kde-frameworks/kio/kio-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 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=6.6.2
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="acl +kwallet wayland X"
-
-# tests hang
-RESTRICT="test"
-
-# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
-COMMON_DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets]
- >=dev-qt/qt5compat-${QTMIN}:6
- >=dev-qt/qtdeclarative-${QTMIN}:6
- =kde-frameworks/kauth-${PVCUT}*:6
- =kde-frameworks/kbookmarks-${PVCUT}*:6
- =kde-frameworks/kcodecs-${PVCUT}*:6
- =kde-frameworks/kcolorscheme-${PVCUT}*:6
- =kde-frameworks/kcompletion-${PVCUT}*:6
- =kde-frameworks/kconfig-${PVCUT}*:6
- =kde-frameworks/kconfigwidgets-${PVCUT}*:6
- =kde-frameworks/kcoreaddons-${PVCUT}*:6
- =kde-frameworks/kcrash-${PVCUT}*:6
- =kde-frameworks/kdbusaddons-${PVCUT}*:6
- =kde-frameworks/kguiaddons-${PVCUT}*:6
- =kde-frameworks/ki18n-${PVCUT}*:6
- =kde-frameworks/kiconthemes-${PVCUT}*:6
- =kde-frameworks/kitemviews-${PVCUT}*:6
- =kde-frameworks/kjobwidgets-${PVCUT}*:6
- =kde-frameworks/knotifications-${PVCUT}*:6
- =kde-frameworks/kservice-${PVCUT}*:6
- =kde-frameworks/ktextwidgets-${PVCUT}*:6
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
- =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?]
- =kde-frameworks/kxmlgui-${PVCUT}*:6
- =kde-frameworks/solid-${PVCUT}*:6
- sys-power/switcheroo-control
- acl? (
- sys-apps/attr
- virtual/acl
- )
- handbook? (
- dev-libs/libxml2
- dev-libs/libxslt
- =kde-frameworks/karchive-${PVCUT}*:6
- =kde-frameworks/kdoctools-${PVCUT}*:6
- )
- kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 )
- X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qtbase-${QTMIN}:6[concurrent]
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qtbase-${QTMIN}:6[libproxy]
- sys-power/switcheroo-control
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
-
-PATCHES=( "${FILESDIR}/${P}-remove-parent-for-DropMenu.patch" ) # KDE-bug 490183
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package acl ACL)
- $(cmake_use_find_package kwallet KF6Wallet)
- -DWITH_WAYLAND=$(usex wayland)
- -DWITH_X11=$(usex X)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- ecm_pkg_postrm
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 39+ messages in thread
end of thread, other threads:[~2024-08-10 7:57 UTC | newest]
Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-16 12:50 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-10 7:57 Andreas Sturmlechner
2024-07-16 16:32 Andreas Sturmlechner
2024-03-24 21:03 Andreas Sturmlechner
2024-03-19 9:10 Andreas Sturmlechner
2023-06-22 21:16 Andreas Sturmlechner
2023-03-26 9:52 Andreas Sturmlechner
2023-03-23 16:47 Andreas Sturmlechner
2023-03-23 8:11 Andreas Sturmlechner
2023-01-25 10:22 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-08 14:40 Andreas Sturmlechner
2022-07-26 12:08 Andreas Sturmlechner
2022-07-19 13:29 Andreas Sturmlechner
2022-06-29 19:53 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-18 10:38 Andreas Sturmlechner
2021-08-15 18:57 Andreas Sturmlechner
2021-08-14 17:09 Andreas Sturmlechner
2021-07-16 15:21 Andreas Sturmlechner
2021-07-14 12:41 Andreas Sturmlechner
2021-05-30 15:51 Andreas Sturmlechner
2021-05-15 10:49 Andreas Sturmlechner
2021-04-11 14:23 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-03-25 23:13 Andreas Sturmlechner
2021-02-13 20:49 Andreas Sturmlechner
2021-02-12 21:48 Andreas Sturmlechner
2021-01-24 13:02 Andreas Sturmlechner
2021-01-11 12:28 Andreas Sturmlechner
2020-12-23 21:32 Andreas Sturmlechner
2020-11-16 23:41 Andreas Sturmlechner
2020-09-29 12:49 Andreas Sturmlechner
2020-05-16 22:38 Andreas Sturmlechner
2018-07-21 16:51 Andreas Sturmlechner
2017-12-03 12:34 Andreas Sturmlechner
2017-09-30 20:34 Andreas Sturmlechner
2017-05-17 22:08 Andreas Sturmlechner
2017-02-28 21:02 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox