From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1247886-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9880C1382C5
for <garchives@archives.gentoo.org>; Wed, 3 Feb 2021 22:34:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B7641E0898;
Wed, 3 Feb 2021 22:34:00 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8CB7CE0898
for <gentoo-commits@lists.gentoo.org>; Wed, 3 Feb 2021 22:34:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BB3D4342002
for <gentoo-commits@lists.gentoo.org>; Wed, 3 Feb 2021 22:33:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E24AF49
for <gentoo-commits@lists.gentoo.org>; Wed, 3 Feb 2021 22:33:56 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1612391626.ffb79726a4d361406005a2417a519ffb4c7e7030.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch kde-frameworks/kio/kio-5.78.0-r1.ebuild
X-VCS-Directories: kde-frameworks/kio/files/ kde-frameworks/kio/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: ffb79726a4d361406005a2417a519ffb4c7e7030
X-VCS-Branch: master
Date: Wed, 3 Feb 2021 22:33:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2660d371-0558-4191-a043-036ccfba84f2
X-Archives-Hash: e0150397786b3bab206871d5571affab
commit: ffb79726a4d361406005a2417a519ffb4c7e7030
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 21:10:44 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 22:33:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffb79726
kde-frameworks/kio: CopyJob: fix crash with skip/retry
Upstream commit a183dd0d1ee0659e5341c7cb4117df27edd6f125
See also: https://mail.kde.org/pipermail/distributions/2021-February/000938.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431731
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kio/files/kio-5.78.0-copyjob-crash.patch | 32 +++++++
kde-frameworks/kio/kio-5.78.0-r1.ebuild | 99 ++++++++++++++++++++++
2 files changed, 131 insertions(+)
diff --git a/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch
new file mode 100644
index 00000000000..a4b87821e20
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch
@@ -0,0 +1,32 @@
+From a183dd0d1ee0659e5341c7cb4117df27edd6f125 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <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-r1.ebuild b/kde-frameworks/kio/kio-5.78.0-r1.ebuild
new file mode 100644
index 00000000000..d84b138ad1a
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.78.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ =kde-frameworks/kauth-${PVCUT}*:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kbookmarks-${PVCUT}*:5
+ =kde-frameworks/kcodecs-${PVCUT}*:5
+ =kde-frameworks/kcompletion-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kcrash-${PVCUT}*:5
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kiconthemes-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5
+ =kde-frameworks/knotifications-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5
+ =kde-frameworks/kxmlgui-${PVCUT}*:5
+ =kde-frameworks/solid-${PVCUT}*:5
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+ kerberos? ( virtual/krb5 )
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ test? ( sys-libs/zlib )
+ X? (
+ x11-base/xorg-proto
+ 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
+)
+
+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
+}