summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-01-19 09:41:30 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-01-25 10:43:46 +0100
commit1fcf181c500d30bbe73a5e032de5e050ed35ab81 (patch)
tree0ec5f9da09c8d82e34151f9b27679c9117cc2819 /kde-plasma/plasma-workspace
parentkde-plasma/plasma-thunderbolt: drop 5.23.4* (diff)
downloadgentoo-1fcf181c500d30bbe73a5e032de5e050ed35ab81.tar.gz
gentoo-1fcf181c500d30bbe73a5e032de5e050ed35ab81.tar.bz2
gentoo-1fcf181c500d30bbe73a5e032de5e050ed35ab81.zip
kde-plasma/plasma-workspace: drop 5.23.4*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/plasma-workspace')
-rw-r--r--kde-plasma/plasma-workspace/Manifest1
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch33
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch34
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch31
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild213
5 files changed, 0 insertions, 312 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index e5b78db71c63..1dd7e4ec752d 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099
DIST plasma-workspace-5.23.90.tar.xz 18479952 BLAKE2B cb7a6115230c27504a8c9b6439362baaacd70706bc76533c32d9c793bdae3d504b645ba2b6172254d81224d02c29468278cf1d9939a636cf3990633b118f45f1 SHA512 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
deleted file mode 100644
index 1153c9f006f1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001
-From: ValdikSS ValdikSS <iam@valdikss.org.ru>
-Date: Sun, 5 Dec 2021 15:46:00 +0300
-Subject: [PATCH] Fix Klipper Actions content truncation
-
-Commit f9669af2 introduced a regression with Klipper Actions: it used
-truncated text as a source for the action, which resulted in truncated
-output.
-
-BUG: 444365
-
-
-(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2)
----
- klipper/urlgrabber.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
-index fb7c0d0a2..185a6a5d6 100644
---- a/klipper/urlgrabber.cpp
-+++ b/klipper/urlgrabber.cpp
-@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const
- ClipCommand command = action->command(cmdIdx);
-
- if (command.isEnabled) {
-- QString text(m_myClipItem->text());
-+ QString text(m_myClipItem->mimeData()->text());
- if (m_stripWhiteSpace) {
- text = text.trimmed();
- }
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
deleted file mode 100644
index 29640f8262e6..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Sun, 5 Dec 2021 08:26:45 +0000
-Subject: [PATCH] [klipper] Use full text for DBus return values
-
-In a recent commit HistoryItem::text() became the visual representation
-of the mimedata; often a truncated string.
-
-mimeData()->text() always returns the full value.
-
-BUG: 446441
-
-
-(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d)
----
- klipper/klipper.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index b090a2409..3b12d1f95 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i)
- if (item) {
- do {
- if (i-- == 0) {
-- return item->text();
-+ return item->mimeData()->text();
- }
- item = history()->find(item->next_uuid());
- } while (item != history()->first());
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
deleted file mode 100644
index d46f33486785..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Wed, 8 Dec 2021 18:25:36 +0100
-Subject: [PATCH] lookandfeel: Add missing check if list of files is empty
-
-BUG: 439797
-
-
-(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645)
----
- kcms/lookandfeel/kcm.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
-index 75ce19197..349761aad 100644
---- a/kcms/lookandfeel/kcm.cpp
-+++ b/kcms/lookandfeel/kcm.cpp
-@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper)
- if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) {
- removeItemFromModel();
- } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) {
-- removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ if (!entry.uninstalledFiles().isEmpty()) {
-+ removeItemFromModel(); // In case we updated it we don't want to have it in twice
-+ }
- KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
- pkg.setPath(entry.installedFiles().constFirst());
- addKPackageToModel(pkg);
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
deleted file mode 100644
index e2c646f9117d..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast
-+semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5=
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kded-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5
- >=kde-frameworks/kinit-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kpeople-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kunitconversion-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwayland-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5[qml]
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kscreenlocker-${PVCUT}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/layer-shell-qt-${PVCUT}:5
- >=kde-plasma/libkscreen-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- appstream? ( dev-libs/appstream[qt5] )
- calculator? ( sci-libs/libqalculate:= )
- calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- fontconfig? (
- >=dev-qt/qtprintsupport-${QTMIN}:5
- media-libs/fontconfig
- x11-libs/libXft
- x11-libs/xcb-util-image
- )
- geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
- gps? ( sci-geosciences/gpsd )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.1.1
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtpaths-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- kde-apps/kio-extras:5
- >=kde-frameworks/kdesu-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/milou-${PVCUT}:5
- >=kde-plasma/plasma-integration-${PVCUT}:5
- sys-apps/dbus
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrdb
- x11-apps/xsetroot
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.21.90:5
-"
-BDEPEND="virtual/pkgconfig"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- # 5.23 branch
- "${FILESDIR}"/${P}-fix-klipper-use-full-text.patch # KDE-bug 446441
- "${FILESDIR}"/${P}-fix-klipper-actions-content-truncation.patch # KDE-bug 444365
- "${FILESDIR}"/${P}-fix-systemsettings-crash.patch # KDE-bug 439797
-)
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # KDE-bug: 433730
- use calculator ||
- cmake_run_in runners cmake_comment_add_subdirectory calculator
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${FILESDIR}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${FILESDIR}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
- elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
- elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}