diff options
Diffstat (limited to 'user/plasma-workspace')
| -rw-r--r-- | user/plasma-workspace/APKBUILD | 17 | ||||
| -rw-r--r-- | user/plasma-workspace/backport1.patch | 40 | ||||
| -rw-r--r-- | user/plasma-workspace/libkworkspace.patch | 16 |
3 files changed, 15 insertions, 58 deletions
diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD index 06b2acbd3..dd5c234d8 100644 --- a/user/plasma-workspace/APKBUILD +++ b/user/plasma-workspace/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox-kde@adelielinux.org> pkgname=plasma-workspace -pkgver=5.24.5 +pkgver=5.27.12 pkgrel=0 pkgdesc="KDE Plasma 5 workspace" url="https://www.kde.org/plasma-desktop" arch="all" -options="!check" # Test requires X11 accelration. +options="checkx11" license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1+ AND GPL-2.0+ AND MIT AND LGPL-2.1-only AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only" # startkde shell script calls depends="kinit qdbus qtpaths xmessage xprop xset xsetroot" @@ -23,6 +23,7 @@ depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev iso-codes-dev libdbusmenu-qt-dev libqalculate-dev libxtst-dev xcb-util-image-dev libkworkspace-dev networkmanager-qt-dev + wayland-protocols libxcursor-dev baloo-dev kactivities-dev kcmutils-dev kcrash-dev kdbusaddons-dev kdeclarative-dev kdesu-dev kdoctools-dev kglobalaccel-dev kholidays-dev @@ -34,11 +35,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev breeze-dev fontconfig-dev layer-shell-qt-dev qt5-qtwayland-tools libxkbcommon-dev libxft-dev qt5-qtwayland-dev wayland-dev" provides="user-manager=$pkgver-r$pkgrel" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz libkworkspace.patch - backport1.patch - backport2.patch " build() { @@ -49,7 +48,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_TESTING=OFF \ @@ -65,7 +64,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 plasma-workspace-5.24.5.tar.xz -f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch -022f1407c538f396cdd1fd9c228a56450ed868e0f16e42333cd10fca238fb5e12b38596f65b06159b573628c290f86d8af8dca136b1acafe4042d4c0d91e8a63 backport1.patch -3cc5228b5f2fdcb21a2e877fccde1e5316a9e2efae1523c68dff4a6a2efa5cc42782340b7ae491a5ea77ef642aa4b7ce35e58068d9e124b286c431105bad8821 backport2.patch" +sha512sums="9459b826110da3775dc206550811d40ede77c5c6c357c6334ee4464273eecc4a24e3fa799c60709f9ff9c4d99285a77ee0f7b2523b39bfe76dd69926b35095ab plasma-workspace-5.27.12.tar.xz +93d699cb03bac4d2f1c01b5a10abd61c4981244dfaa01cb3cbfa93043adc4e37af3ff85823193ebe45cb07f5ca59a4f71ebcf8ccb84f8d2ea81ac024696d3c38 libkworkspace.patch" diff --git a/user/plasma-workspace/backport1.patch b/user/plasma-workspace/backport1.patch deleted file mode 100644 index c2ccc0f62..000000000 --- a/user/plasma-workspace/backport1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Wed, 4 May 2022 10:45:52 -0600 -Subject: [PATCH] applets/appmenu: fix top-level menu text coloration - -28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but -neglected to respect the Plasma color scheme, if any. This causes -problems with Plasma themes that have their own colors and don't -respect the systemwide color scheme, such as Breeze Twilight. - -Fix it by using the appropriate colors from the PlasmaCore color scheme -object, not the systemwide object provided by Qt. - -BUG: 453348 -FIXED-IN: 5.24.6 - - -(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e) ---- - applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml -index 441e99016..afb37589a 100644 ---- a/applets/appmenu/package/contents/ui/MenuDelegate.qml -+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml -@@ -66,9 +66,6 @@ AbstractButton { - - contentItem: PC3.Label { - text: controlRoot.Kirigami.MnemonicData.richTextLabel -- // Kirigami.Theme.highlightedTextColor returns different colors -- // depending on window focus, which does not apply to this applet -- // instead, we use palette.highlightedText here, which returns consistent result -- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText -+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor - } - } --- -GitLab - diff --git a/user/plasma-workspace/libkworkspace.patch b/user/plasma-workspace/libkworkspace.patch index e8e3d93b6..4fe8fa0ea 100644 --- a/user/plasma-workspace/libkworkspace.patch +++ b/user/plasma-workspace/libkworkspace.patch @@ -11,18 +11,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index e587a386..d1a63527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -63,6 +63,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" +@@ -80,6 +80,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + pkg_check_modules(QALCULATE libqalculate>2.0 REQUIRED IMPORTED_TARGET) - find_package(KF5TextEditor) find_package(KWinDBusInterface CONFIG REQUIRED) +find_package(LibKWorkspace 5.17.90) - find_package(KScreenLocker 5.17.90 REQUIRED) - find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -@@ -151,7 +151,10 @@ endif() - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - - add_subdirectory(doc) + find_package(KF5Screen CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) +@@ -360,7 +361,10 @@ endif() + add_subdirectory(doc) + kdoctools_install(po) + endif() -add_subdirectory(libkworkspace) +if(NOT LibKWorkspace_FOUND) + message(STATUS "System LibKWorkspace not found, using bundled.") |