Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/dolphin-plugins-mountiso/files/
Date: Sun, 22 Aug 2021 22:47:21
Message-Id: 1629672425.5e551cd036a132e8e0b2fb8497c510af83990e08.asturm@gentoo
1 commit: 5e551cd036a132e8e0b2fb8497c510af83990e08
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Fri Aug 20 18:23:06 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 22 22:47:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e551cd0
7
8 app-cdr/dolphin-plugins-mountiso: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/22054
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 ...iso-20.12.3-dont-mount-ISO-multiple-times.patch | 41 ----------------------
16 1 file changed, 41 deletions(-)
17
18 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
19 deleted file mode 100644
20 index fc59e171850..00000000000
21 --- a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
22 +++ /dev/null
23 @@ -1,41 +0,0 @@
24 -From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
25 -From: Kwon-Young Choi <kwon-young.choi@×××××××.fr>
26 -Date: Fri, 19 Mar 2021 17:10:31 +0100
27 -Subject: [PATCH] BackingFile property should be use with StorageVolume instead
28 - of StorageAccess
29 -
30 -BUG: 434617
31 -
32 -When mounting an iso with `udisksctl`, first a loop device is created
33 -`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
34 -a filesystem location.
35 -
36 -Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
37 -device without the `/dev/loop0` device and the BackingFile property does not
38 -work on `/dev/loop0p1`.
39 -
40 -Solution: query for StorageVolume instead which returns all loop devices:
41 -`/dev/loop0` and `/dev/loop1`.
42 -
43 -Warning: Because StorageVolume returns more devices, the function
44 -`getDeviceFromBackingFile` could be a little bit slower.
45 ----
46 - mountiso/mountisoaction.cpp | 2 +-
47 - 1 file changed, 1 insertion(+), 1 deletion(-)
48 -
49 -diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
50 -index e5575ae..d198a89 100644
51 ---- a/mountiso/mountisoaction.cpp
52 -+++ b/mountiso/mountisoaction.cpp
53 -@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
54 - const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
55 - {
56 - const QList<Solid::Device> blockDevices =
57 -- Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
58 -+ Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
59 -
60 - for (const Solid::Device &device : blockDevices) {
61 - auto genericDevice = device.as<Solid::GenericInterface>();
62 ---
63 -GitLab
64 -