summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-09-20 20:22:34 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-09-21 00:01:04 +0200
commit512fa57ac3c466cec0588cb91f5de25f289e8d9e (patch)
treef029345e583b3fbd06a1402592483bdf029c5c88 /kde-plasma/plasma-workspace
parentkde-plasma/plasma-thunderbolt: drop 5.27.11 (diff)
downloadgentoo-512fa57ac3c466cec0588cb91f5de25f289e8d9e.tar.gz
gentoo-512fa57ac3c466cec0588cb91f5de25f289e8d9e.tar.bz2
gentoo-512fa57ac3c466cec0588cb91f5de25f289e8d9e.zip
kde-plasma/plasma-workspace: drop 5.27.11.1-r1
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.24.80-split-libkworkspace.patch37
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch66
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild234
4 files changed, 0 insertions, 338 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index ab8ee02877bf..2590c4ecff33 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
deleted file mode 100644
index e605473e3546..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 21 Feb 2022 12:24:56 +0100
-Subject: [PATCH] libkworkspace: Allow standalone build
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3ec5f0893..b022a20b3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library"
- )
-
- find_package(KWinDBusInterface CONFIG REQUIRED)
-+find_package(LibKWorkspace 5.21.5)
-
- find_package(KF5Screen CONFIG REQUIRED)
- find_package(KScreenLocker 5.13.80 REQUIRED)
-@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma
- if(KF5DocTools_FOUND)
- add_subdirectory(doc)
- endif()
--add_subdirectory(libkworkspace)
-+if(NOT LibKWorkspace_FOUND)
-+ message(STATUS "System LibKWorkspace not found, using bundled.")
-+ add_subdirectory(libkworkspace)
-+endif()
- add_subdirectory(libdbusmenuqt)
- add_subdirectory(appmenu)
-
---
-2.35.1
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
deleted file mode 100644
index ed1b67bbd85f..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.27.11.1-fix-writing-iceauthority-file.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1181acfe30557d6646511df8d98d82589878a570 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Tue, 4 Jun 2024 12:18:11 +0000
-Subject: [PATCH] Fix writing ICEAuthority file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth
-dependency" introduced two bugs:
-
-1) "fp" is never closed, so the generated auth data stays buffered in
- memory for some indeterminate time and the file stays empty on disk.
- This completely breaks authentication and thus also session restore.
-
-2) Checking the return value of IceWriteAuthFileEntry() is inverted (the
- function returns non-zero on success), so warnings are printed iff
- everything goes well.
-
-BUG: 487912
-
-
-(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa)
-
-Co-authored-by: Tomáš Trnka <tomastrnka@gmx.com>
----
- ksmserver/server.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
-index f88de40dba4..bba6b13ffae 100644
---- a/ksmserver/server.cpp
-+++ b/ksmserver/server.cpp
-@@ -333,7 +333,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
- file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
- file_entry->auth_data = strdup((*authDataEntries)[i].auth_data);
- file_entry->auth_data_length = MAGIC_COOKIE_LEN;
-- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
-+ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
- qWarning("Failed to write ice auth file entry");
- }
- IceFreeAuthFileEntry(file_entry);
-@@ -357,7 +357,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
- file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1");
- file_entry->auth_data = strdup((*authDataEntries)[i + 1].auth_data);
- file_entry->auth_data_length = MAGIC_COOKIE_LEN;
-- if (IceWriteAuthFileEntry(fp, file_entry) != 0) {
-+ if (IceWriteAuthFileEntry(fp, file_entry) == 0) {
- qWarning("Failed to write xsmp ice auth file entry");
- }
- IceFreeAuthFileEntry(file_entry);
-@@ -366,6 +366,11 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry *
- IceSetPaAuthData(2, &(*authDataEntries)[i]);
- }
-
-+ if (fclose(fp) != 0) {
-+ qWarning() << "Could not close ICEAuthority file";
-+ return 0;
-+ }
-+
- return (1);
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
deleted file mode 100644
index 624db686d518..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.1-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry +wallpaper-metadata"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
- dev-libs/icu:=
- >=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/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${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/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/kparts-${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/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
- >=kde-frameworks/kxmlgui-${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/kwayland-${KFMIN}: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
- >=kde-plasma/libplasma-${KFMIN}:5
- >=kde-plasma/plasma-activities-${KFMIN}:5
- >=kde-plasma/plasma-activities-stats-${KFMIN}:5
- >=media-libs/phonon-4.11.0[qt5(+)]
- sci-libs/libqalculate:=
- 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
- appstream? ( <dev-libs/appstream-1[qt5] )
- 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 )
- policykit? (
- sys-auth/polkit-qt[qt5(+)]
- virtual/libcrypt:=
- )
- screencast? (
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- >=kde-plasma/kpipewire-${PVCUT}:5
- media-libs/libglvnd
- >=media-video/pipewire-0.3:=
- x11-libs/libdrm
- )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( kde-frameworks/kuserfeedback:5 )
- wallpaper-metadata? ( kde-apps/libkexiv2:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.6.0
- >=dev-libs/wayland-protocols-1.31
- >=dev-qt/qtconcurrent-${QTMIN}:5
- x11-base/xorg-proto
- fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/breeze-5.22.90:5
- !<kde-plasma/plasma-desktop-5.27.0:5
- app-text/iso-codes
- >=dev-qt/qdbus-${QTMIN}:*
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- || (
- kde-apps/kio-extras-kf5:5
- kde-apps/kio-extras:5
- )
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
- >=kde-plasma/kactivitymanagerd-${PVCUT}: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
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
- >=kde-frameworks/kcmutils-${KFMIN}:5
- virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream
- "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
- "${FILESDIR}/${P}-fix-writing-iceauthority-file.patch" # bug 933435, KDE-bug 487912
-)
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- ecm_punt_bogus_dep KPipeWire
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if use geolocation; then
- use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
- -i dataengines/geolocation/CMakeLists.txt || die
- fi
-
- if ! use policykit; then
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- if ! use fontconfig; then
- ecm_punt_bogus_dep XCB IMAGE
- sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- -DGLIBC_LOCALE_GEN=$(usex policykit)
- $(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)
- $(cmake_use_find_package wallpaper-metadata KF5KExiv2)
- )
-
- 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"
-}