summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-14 18:51:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-08-14 19:08:04 +0200
commit3bce50dd328215cfecc6bf3bed301843182885c2 (patch)
treecafccfb0a79864bbefc8558b45af4bf9267d4863 /kde-frameworks/solid
parentkde-frameworks/qqc2-desktop-style: drop 5.84.0* (diff)
downloadgentoo-3bce50dd328215cfecc6bf3bed301843182885c2.tar.gz
gentoo-3bce50dd328215cfecc6bf3bed301843182885c2.tar.bz2
gentoo-3bce50dd328215cfecc6bf3bed301843182885c2.zip
kde-frameworks/solid: drop 5.84.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/solid')
-rw-r--r--kde-frameworks/solid/Manifest1
-rw-r--r--kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch35
-rw-r--r--kde-frameworks/solid/solid-5.84.0-r1.ebuild53
3 files changed, 0 insertions, 89 deletions
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index fba25685559f..888415b36450 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,3 +1,2 @@
DIST solid-5.82.0.tar.xz 274184 BLAKE2B 296535424310770f3c1acb82217906c5f9ca0885202c51a6bd65e5ed4230a5f93d698a112323801f2d44fbafa637407a5e7793eb36b230e83c77059cf8317305 SHA512 ae15081a07e46590eb36f6c642adcded7bb519010f6f8bce1f38e14e97900f029a1ae0bc61d64d8a2752479ae54a9d2188e51698e0b46ebddd15bab6941ae59a
-DIST solid-5.84.0.tar.xz 275876 BLAKE2B beec229d68b57c450f9fa209af0038e060a1c16b7966cc3fec8ec0cf3eff9970162ea2f7febcc5dcac48ea2591d1a9ee5ec075926e3561868e48c017b216043b SHA512 2c646c1347312cb3cc716cd35b90da8057d09546c3e90cb0dab823c6cc07495efa04fe980503ed201e5cbcb763e130a8f0444b46139dbdf2e6749a445821616e
DIST solid-5.85.0.tar.xz 251032 BLAKE2B 31fb2c180506ee52955753c9fdae262d940d8e21b626ba9ef3e41b43cc0a26fcc901d7991a5e7f174eb218109cf992dcfc2f05c7bbe3d96b8144634ec8443c48 SHA512 e84148cdc76d8f0c075f5e064c4e7b5a886fb1beb6f343f9ab450cd17db8aa5094f839dd0fc383bc4ef1764e75f1444841bd802093343544cea99ab9668ac4c5
diff --git a/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch b/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
deleted file mode 100644
index bdba981b8ac8..000000000000
--- a/kde-frameworks/solid/files/solid-5.84.0-qstrcmp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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-r1.ebuild b/kde-frameworks/solid/solid-5.84.0-r1.ebuild
deleted file mode 100644
index dfd61f86b422..000000000000
--- a/kde-frameworks/solid/solid-5.84.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="ios nls"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- sys-apps/util-linux
- sys-fs/udisks:2
- virtual/libudev:=
- ios? (
- app-pda/libimobiledevice:=
- app-pda/libplist:=
- )
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
-"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qstrcmp.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package ios IMobileDevice)
- $(cmake_use_find_package ios PList)
- )
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "media player devices support" app-misc/media-player-info
- fi
- ecm_pkg_postinst
-}