From b1c81de4fadbd00897700a7321f03b390d952b2e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Aug 2021 00:09:36 +0100 Subject: gentoo resync : 26.08.2021 --- app-cdr/Manifest.gz | Bin 7829 -> 7833 bytes app-cdr/dolphin-plugins-mountiso/Manifest | 1 - ...iso-20.12.3-dont-mount-ISO-multiple-times.patch | 41 --------------------- 3 files changed, 42 deletions(-) delete mode 100644 app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch (limited to 'app-cdr') diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index 8c8d79fc596f..fe19a69a15a1 100644 Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest index 586d3446d7d9..8a656746d89d 100644 --- a/app-cdr/dolphin-plugins-mountiso/Manifest +++ b/app-cdr/dolphin-plugins-mountiso/Manifest @@ -1,4 +1,3 @@ -AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BLAKE2B 0adc695494b95e300bc4b3539cdaf8c67ab8a6c60761977d93d375d1bb1c01ab5d8e65860de63f689b7a971a1f72fdae602e84620f54505ba7547067e6c3ba72 SHA512 402db0b683e71957ecba9d9280b3bf3f8911304ca06e4f767d3432376793d45e8c63ca8e16fea4cbf2f975ebcc467c6a9793ae64f15807ba88cd70b3b2d22d30 DIST dolphin-plugins-21.04.3.tar.xz 253244 BLAKE2B c5c0e302dfc4eb82e2de1a635824bf8fd2c70bcac65c261253f0e52e7d9242fa339fe2dc619b927b0379477b2c80a22ec210080af8f2370e0a0182af3347df6a SHA512 e4beba0d596782951b149d42e930d76b12a36bea83f35eb0cff9e49b3e02d4b2aa55f4245d4b8708044a49770d477badc964752828eef4caeaefd4f16e5f9dad DIST dolphin-plugins-21.08.0.tar.xz 252708 BLAKE2B 7e6d4c72b0527302737a9e636a6e672699868325af4ef763a7595677e4f0ba3dc1e8cbcbcbe4db92becf481f9746ac61257e1d2c91fb145059724c9e70497f0a SHA512 46448d35e0d599c373f990a9cdc6bac91a6acb1bdd871e73ced298ae6be3c9187be12a3ffcc7734c9d87f8825adae472d5d923f46bf15d0b2c012b2d5b755a92 EBUILD dolphin-plugins-mountiso-21.04.3.ebuild 1520 BLAKE2B 5b271edc47eda6710084f595628618facac6b1765e3c2cf005c1443c0de5d78cfb97b8234177904ff8841754cb5fd2761cb5a208621e20445f460b23ad2eef3a SHA512 0fab52acb8b629f9eaee2a589d64df96856c1689e0eef1cf5bec3f674587bc887cab02387c7e6319a15db7bed7de75c9f20f81b88fd15eba839788898b4ea313 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 deleted file mode 100644 index fc59e1718503..000000000000 --- a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001 -From: Kwon-Young Choi -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 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(); --- -GitLab - -- cgit v1.2.3