gentoo resync : 01.08.2021

4 files changed, 39 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index f480cf0b0b8a..340fa8d33005 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 51b0987a4da4..3dcc173a070d 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,6 @@
+AUX solid-5.84.0-qstrcmp.patch 1702 BLAKE2B 8ee1bcbf71aac54a74e781307fe034b0806bd429290105c6be98fbebe12082488ea4418a4117e2564b81694aa9c7ada4122bcad8a232ed4a57da82472a7ebd39 SHA512 4d7718be8fd6ae9f06b3cd03b0bc641e983051dbd996d07096120ae3e40b0d99c8d38eb75c2507f3de6327144c6f25e1ffb9d2db54c7d4894690a2cc6366072a
 DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
 DIST solid-5.84.0.tar.xz 275876 BLAKE2B beec229d68b57c450f9fa209af0038e060a1c16b7966cc3fec8ec0cf3eff9970162ea2f7febcc5dcac48ea2591d1a9ee5ec075926e3561868e48c017b216043b SHA512 2c646c1347312cb3cc716cd35b90da8057d09546c3e90cb0dab823c6cc07495efa04fe980503ed201e5cbcb763e130a8f0444b46139dbdf2e6749a445821616e
 EBUILD solid-5.82.0.ebuild 1038 BLAKE2B f7a79563a60771ce4500b61592f33ba93ba6d0dd674fc2b6dd3a00b652d135bfef91e6945179288a17ad6b4360ce6e503b334499523dcd1d68b0e88732b5b207 SHA512 7c2b0b7e7e90d38a49d7806aef5ada3875c704c5360f4e09e6a9702302260ed7a294f7d4daa93f337476dd5685a8337a8e96b35b854356159151d823ecb64fa2
-EBUILD solid-5.84.0.ebuild 1070 BLAKE2B ea4b813e1821929986164cc9e2ed6e8c27ba4f7a9d3de11ba5ee63cca94c5ec430b48705adbf584162da7650538c300a4f8db09ba8e064b68628465d24397d87 SHA512 213aa6dcb13d1c44b8c04dbbd195b3d698dbab2c5e0203ab45e756e29d07599554eed8fcbfbb3d36996102e14eeb06a855a3feac73b0d161440e67663b7656aa
+EBUILD solid-5.84.0-r1.ebuild 1116 BLAKE2B 98c7e4ce2c879787b72c64bce661898538204d979dedf46d0748ce2dd7005b817d7a980d809343deeb5cfbb0fefb1216ba1df7d5be461a6a368a916dd3bba277 SHA512 49970f166821a4c928c36b2274e6a58328b865c11296a7e0306b66944886cb9825abe6b2b13104cca7fc7318ad9c8d498049f9e11f943f756533a3f7ffb1ba8b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch b/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
new file mode 100644
index 000000000000..bdba981b8ac8
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
@@ -0,0 +1,35 @@
+From e5964d13f36901e7768ca38064125a5c5c28a939 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Thu, 22 Jul 2021 01:26:37 +0200
+Subject: [PATCH] Use qstrcmp instead of strcmp
+
+qstrcmp can handle NULL args.
+
+This fixes an issue on Slackware, which doesn't use systemd and /var/run
+is a bind mount of /run, and for some reason mnt_fs_get_root(fs) would return
+NULL, which led to crashes in dolphin and plasmashell, see:
+https://invent.kde.org/frameworks/solid/-/commit/ef0b0dfa00b1de70c6d8e6913bbfdb79e7d3d1b6#note_276583
+---
+ src/solid/devices/backends/udisks2/udisksstorageaccess.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+index 1566787..35d1aa8 100644
+--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
++++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+@@ -92,9 +92,9 @@ static QString baseMountPoint(const QByteArray &dev)
+             const QByteArray devicePath = dev.endsWith('\x00') ? dev.chopped(1) : dev;
+ 
+             while (mnt_table_next_fs(table, itr, &fs) == 0) {
+-                if (mnt_fs_get_srcpath(fs) == devicePath
+-                    // Base mount point will have "/" as root fs
+-                    && (strcmp(mnt_fs_get_root(fs), "/") == 0)) {
++                if (mnt_fs_get_srcpath(fs) == devicePath //
++                    && (qstrcmp(mnt_fs_get_root(fs), "/") == 0) // Base mount point will have "/" as root fs
++                ) {
+                     mountPoint = QFile::decodeName(mnt_fs_get_target(fs));
+                     break;
+                 }
+-- 
+GitLab
+
diff --git a/kde-frameworks/solid/solid-5.84.0.ebuild b/kde-frameworks/solid/solid-5.84.0-r1.ebuild
index ee0d8d0d9790..dfd61f86b422 100644
--- a/kde-frameworks/solid/solid-5.84.0.ebuild
+++ b/kde-frameworks/solid/solid-5.84.0-r1.ebuild
@@ -35,6 +35,8 @@ BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qstrcmp.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ios IMobileDevice)