gentoo resync : 28.04.2021

4 files changed, 54 insertions, 8 deletions

diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 90ff3c5c5de9..84665b889d20 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,5 +1,6 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
+AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BLAKE2B 0adc695494b95e300bc4b3539cdaf8c67ab8a6c60761977d93d375d1bb1c01ab5d8e65860de63f689b7a971a1f72fdae602e84620f54505ba7547067e6c3ba72 SHA512 402db0b683e71957ecba9d9280b3bf3f8911304ca06e4f767d3432376793d45e8c63ca8e16fea4cbf2f975ebcc467c6a9793ae64f15807ba88cd70b3b2d22d30
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-mountiso-20.08.3.ebuild 1533 BLAKE2B 48540c43db4b2317dcf456d1d62c149145e1791c018147076c7ea4da1df178bcac205a4702e4a812fdda4bd7b4b74018717c3247101bcc4293c875f088c4a5be SHA512 3fcccd613b05a494fd32e65a98a7dd4af4f1c863aa38a23a8de3a4438533bb1e421007c4d63e1f30100e4a178645c05f2d0af5680c81534ff14bbb7d464f8e2d
-EBUILD dolphin-plugins-mountiso-20.12.3.ebuild 1536 BLAKE2B a6494225f50cad2dfb63d62d1717daa627fdc29c107803d7ebdfde6faea4a5619c2f9262c46f798a9259f78fdcaa60507b245614d1016f077a68c943cde526ad SHA512 fb5db91d02841b0fb97cfad513fd2545fded5b08a3682499d4dd335c70b37fa1d83296bcef3dfe6c68e66f1a5ddae228c40f28b866e607a4046a6db0afa7e75a
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-mountiso-20.12.3-r1.ebuild 1619 BLAKE2B a9e27570026206592dade9cc52dbe329650b809e521d96affee8e2ac540b185e02e3fe4aae6e7aaefec64f6176b311c3e528ef40822dc66c3d097717227dafbb SHA512 c569f1835d7341b3b71a89433bbbd9f73a9a28bfae7685de3b016ecac4ae829a985f2c6b614b0dafcc60f3762957f343105ca9cf9bcb0388c58b32331cf31bf4
+EBUILD dolphin-plugins-mountiso-21.04.0.ebuild 1525 BLAKE2B 574c02ec140244bfc8584b3ed8356844395e01ce0e1cd0280b8dfbd0f4f1bdd5f4fb9d864e7bd79f55fcfc6c35e34d1aed9ab5ae68394ea27c4fb5e79061cd14 SHA512 05006fb0530a6d837df603ea0ae95d637189d6286e397452140dbe636392603be348f83cea5a17b82aa9e914e7a7761b01e1dca101ce950385b5374e035d4b8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
index 21fec5cbd098..8b0f89d13e0f 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ KDE_RELEASE_SERVICE="true"
 KDE_ORG_CATEGORY="sdk"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
-KFMIN=5.74.0
+KFMIN=5.75.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
@@ -36,6 +36,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-dont-mount-ISO-multiple-times.patch" # KDE-bug 434617
+)
+
 src_prepare() {
 	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.0.ebuild
index fc497549263a..27a4b3f28f94 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.0.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 ECM_HANDBOOK="false"
-KDE_RELEASE_SERVICE="true"
+KDE_GEAR="true"
 KDE_ORG_CATEGORY="sdk"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
-KFMIN=5.75.0
+KFMIN=5.80.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
new file mode 100644
index 000000000000..fc59e1718503
--- /dev/null
+++ b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
@@ -0,0 +1,41 @@
+From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
+From: Kwon-Young Choi <kwon-young.choi@hotmail.fr>
+Date: Fri, 19 Mar 2021 17:10:31 +0100
+Subject: [PATCH] BackingFile property should be use with StorageVolume instead
+ of StorageAccess
+
+BUG: 434617
+
+When mounting an iso with `udisksctl`, first a loop device is created
+`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
+a filesystem location.
+
+Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
+device without the `/dev/loop0` device and the BackingFile property does not
+work on `/dev/loop0p1`.
+
+Solution: query for StorageVolume instead which returns all loop devices:
+`/dev/loop0` and `/dev/loop1`.
+
+Warning: Because StorageVolume returns more devices, the function
+`getDeviceFromBackingFile` could be a little bit slower.
+---
+ mountiso/mountisoaction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
+index e5575ae..d198a89 100644
+--- a/mountiso/mountisoaction.cpp
++++ b/mountiso/mountisoaction.cpp
+@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
+ const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
+ {
+     const QList<Solid::Device> blockDevices =
+-        Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
++        Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
+ 
+     for (const Solid::Device &device : blockDevices) {
+         auto genericDevice = device.as<Solid::GenericInterface>();
+-- 
+GitLab
+