From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 D541113933E for ; Wed, 14 Jul 2021 12:41:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 144DAE0A7F; Wed, 14 Jul 2021 12:41:54 +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 DBF91E0A7F for ; Wed, 14 Jul 2021 12:41:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5926E3409C8 for ; Wed, 14 Jul 2021 12:41:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2C59798 for ; Wed, 14 Jul 2021 12:41:47 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1626266208.ef5ff74686160669fea3f413f70e13f6493e8ca7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/, kde-frameworks/kio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch kde-frameworks/kio/kio-5.84.0.ebuild X-VCS-Directories: kde-frameworks/kio/files/ kde-frameworks/kio/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ef5ff74686160669fea3f413f70e13f6493e8ca7 X-VCS-Branch: master Date: Wed, 14 Jul 2021 12:41:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 23a31795-0a79-4f87-a663-7b32e46bcfba X-Archives-Hash: e0a94a265cfe016b35afd2e082000725 commit: ef5ff74686160669fea3f413f70e13f6493e8ca7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 14 12:36:30 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 outlook.com> Closes: https://bugs.gentoo.org/802030 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner 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 +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() {