| 1 |
commit: ef5ff74686160669fea3f413f70e13f6493e8ca7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 14 12:36:30 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 14 12:36:48 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5ff746 |
| 7 |
|
| 8 |
kde-frameworks/kio: Fix build with clang[default-libcxx] |
| 9 |
|
| 10 |
Upstream commit 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 |
| 11 |
|
| 12 |
See also: https://mail.kde.org/pipermail/distributions/2021-July/001033.html |
| 13 |
|
| 14 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439780 |
| 15 |
Reported-by: 12101111 <w12101111 <AT> outlook.com> |
| 16 |
Closes: https://bugs.gentoo.org/802030 |
| 17 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 18 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 19 |
|
| 20 |
.../kio/files/kio-5.84.0-cxx17-std-mem_fn.patch | 31 ++++++++++++++++++++++ |
| 21 |
kde-frameworks/kio/kio-5.84.0.ebuild | 4 +-- |
| 22 |
2 files changed, 33 insertions(+), 2 deletions(-) |
| 23 |
|
| 24 |
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 |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..26383b788a0 |
| 27 |
--- /dev/null |
| 28 |
+++ b/kde-frameworks/kio/files/kio-5.84.0-cxx17-std-mem_fn.patch |
| 29 |
@@ -0,0 +1,31 @@ |
| 30 |
+From 36f1814b184f4d5ac628fca5db5f6cc1440b4db7 Mon Sep 17 00:00:00 2001 |
| 31 |
+From: Jan Paul Batrina <jpmbatrina01@×××××.com> |
| 32 |
+Date: Mon, 12 Jul 2021 22:06:19 +0800 |
| 33 |
+Subject: [PATCH] Use std::mem_fn instead of the deprecated/removed |
| 34 |
+ std::mem_fun |
| 35 |
+ |
| 36 |
+std::mem_fun was deprecated in C++11 and removed from |
| 37 |
+the standard in C++17. |
| 38 |
+ |
| 39 |
+BUG: 439780 |
| 40 |
+NO_CHANGELOG |
| 41 |
+--- |
| 42 |
+ src/widgets/kpropertiesdialog.cpp | 2 +- |
| 43 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 44 |
+ |
| 45 |
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp |
| 46 |
+index 3f61e8ea3..1ed8bc7d8 100644 |
| 47 |
+--- a/src/widgets/kpropertiesdialog.cpp |
| 48 |
++++ b/src/widgets/kpropertiesdialog.cpp |
| 49 |
+@@ -2273,7 +2273,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() |
| 50 |
+ d->fileSystemSupportsACLs = fileSystemSupportsACL(path); |
| 51 |
+ } |
| 52 |
+ if (d->fileSystemSupportsACLs) { |
| 53 |
+- std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun(&QWidget::hide)); |
| 54 |
++ std::for_each(theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn(&QWidget::hide)); |
| 55 |
+ extendedACLs = new KACLEditWidget(&dlg); |
| 56 |
+ extendedACLs->setEnabled(d->canChangePermissions); |
| 57 |
+ vbox->addWidget(extendedACLs); |
| 58 |
+-- |
| 59 |
+GitLab |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/kde-frameworks/kio/kio-5.84.0.ebuild b/kde-frameworks/kio/kio-5.84.0.ebuild |
| 63 |
index cc327525d7b..ee9c97e0d68 100644 |
| 64 |
--- a/kde-frameworks/kio/kio-5.84.0.ebuild |
| 65 |
+++ b/kde-frameworks/kio/kio-5.84.0.ebuild |
| 66 |
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND} |
| 67 |
PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
- # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
| 71 |
- "${FILESDIR}"/${PN}-5.84.0-fix-qtconcurrent-private-link.patch # bug 784971 |
| 72 |
+ "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971 |
| 73 |
+ "${FILESDIR}"/${P}-cxx17-std-mem_fn.patch # bug 802030 |
| 74 |
) |
| 75 |
|
| 76 |
src_configure() { |
Archives