summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r--kde-frameworks/kio/Manifest1
-rw-r--r--kde-frameworks/kio/files/kio-5.38.0-kioexec.patch87
-rw-r--r--kde-frameworks/kio/kio-5.38.0-r1.ebuild80
-rw-r--r--kde-frameworks/kio/kio-5.38.0.ebuild78
4 files changed, 0 insertions, 246 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 5f10976a70b..f4b1d700889 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
-DIST kio-5.38.0.tar.xz 3086436 SHA256 f43ab29c0ab51c78bd323e57fa6bba4aedf2d26d70df973b7ef7c80c9fc81597 SHA512 7a35c20d220308f329ba496cabc71f4be44debab09591c3301533ddc348a88bb928f5220ede8500f70fd6f8b50a77ae99877f4ca9544be149e3eb1b7ed785611 WHIRLPOOL ede2c160e5216dba084f3b475744c780b22095032d60e463f9891f85f6ba98df337b6af82426f46d8c1c47857726e79925172a903ea1de033138d3cb4a40925a
DIST kio-5.39.0.tar.xz 3093732 SHA256 96cbea5aba34b4e1b0df5ecfb4aaf65ff324341fb00f99796146536557232f24 SHA512 18e87ba62610c1aa1a3281642cda627407ff0c0cc5eedbd990bb58721271442a3aad7db58b3d808ce977400ca3dd9d64792feb64f5746c54e2d3ee8ad2820d8e WHIRLPOOL 3c2f2e3c76d64f687e3ebdbafa8b0feee9be3fbcc45d7952b509af041b6b404a2eefec1583122a9a17459bbfcd996e17c16031c7790a28a3db2462e498db381f
diff --git a/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch b/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
deleted file mode 100644
index 1cf2a1bfb83..00000000000
--- a/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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
deleted file mode 100644
index d20326004df..00000000000
--- a/kde-frameworks/kio/kio-5.38.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
-}
diff --git a/kde-frameworks/kio/kio-5.38.0.ebuild b/kde-frameworks/kio/kio-5.38.0.ebuild
deleted file mode 100644
index 4c595b88b63..00000000000
--- a/kde-frameworks/kio/kio-5.38.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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"
-
-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
-}