community/plasma: upgrade to 6.1.2 (MR 5327) (MR 5563)
[ci:skip-vercheck] Rebased-By: Oliver Smith <ollieparanoid@postmarketos.org>
This commit is contained in:
Bart Ribbers
@@ -1,11 +1,8 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: team/kde <bribbers@disroot.org>
|
||||
# Forked from Alpine to add systemd!
|
||||
|
||||
# The group tag is just to easily find this APKBUILD by some scripts for automation
|
||||
# group=kde-plasma
|
||||
pkgname=kactivitymanagerd
|
||||
pkgver=9999_git20240428
|
||||
_pkgver=6.0.4
|
||||
pkgver=99996.1.2
|
||||
_pkgver=6.1.2
|
||||
pkgrel=0
|
||||
pkgdesc="System service to manage user's activities and track the usage patterns"
|
||||
# armhf blocked by qt6-qtdeclarative
|
||||
@@ -53,5 +50,5 @@ package() {
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
}
|
||||
sha512sums="
|
||||
10a945a70f4c4ab2b28a9731771c0a79aef9ce99b6c179544c85e1c7935554893284d3718c9653eff3a2c2534149a8f337b92dbc9c43c9336988961b8201a295 kactivitymanagerd-6.0.4.tar.xz
|
||||
70c6ade88ac2ec9b35ee40eca696f0e62a52075c1852ab22113fe7fe6cb35a4c2786b3b60efc297e91a57fadfdd55b3428c8b761f5260571af24fb6cfbb20b9b kactivitymanagerd-6.1.2.tar.xz
|
||||
"
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/lib/journaldexportreader.cpp b/lib/journaldexportreader.cpp
|
||||
index 7ad19d6..b304a46 100644
|
||||
--- a/lib/journaldexportreader.cpp
|
||||
+++ b/lib/journaldexportreader.cpp
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "journaldexportreader.h"
|
||||
#include "kjournaldlib_log_general.h"
|
||||
+#include <endian.h>
|
||||
#include <QDebug>
|
||||
#include <QVector>
|
||||
#include <QIODevice>
|
||||
@@ -1,10 +1,7 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
|
||||
# The group tag is just to easily find this APKBUILD by some scripts for automation
|
||||
# group=kde-applications
|
||||
pkgname=kjournald
|
||||
pkgver=24.02.2
|
||||
pkgver=24.05.1
|
||||
pkgrel=0
|
||||
pkgdesc="Framework for interacting with systemd-journald"
|
||||
# armhf blocked by extra-cmake-modules
|
||||
@@ -30,9 +27,7 @@ case "$pkgver" in
|
||||
*) _rel=stable;;
|
||||
esac
|
||||
_repo_url="https://invent.kde.org/system/kjournald.git"
|
||||
source="https://download.kde.org/$_rel/release-service/$pkgver/src/kjournald-$pkgver.tar.xz
|
||||
0001-kjournald-missing-include.patch
|
||||
"
|
||||
source="https://download.kde.org/$_rel/release-service/$pkgver/src/kjournald-$pkgver.tar.xz"
|
||||
|
||||
build() {
|
||||
cmake -B build -G Ninja \
|
||||
@@ -51,6 +46,5 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
90f809a57ce862433fd46f7013fa2a8e16cc2decaf9e78d3d35a47058a654ea4b91e0ff17baef47010bcbf35b38508ef7f56c361536383bdcf4b5150ca00a213 kjournald-24.02.2.tar.xz
|
||||
5e5b67d49d45fb3721522f4682c8cfbf6cd6a68caba45b58c52712dc173652bc48409f5d0f4b2b9872b0f44f2e0daeefb32f4db351ad79fe0b3d69801d01d985 0001-kjournald-missing-include.patch
|
||||
850e6ab4f9cdd9f38563858db3507523af5918b111176a743a0285c19cf67dcf53b3d70bdd6397d22c8f54f5ddba42ba53b669398aa7323caa2947c382879dea kjournald-24.05.1.tar.xz
|
||||
"
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
# Forked from Alpine to add systemd!
|
||||
|
||||
# The group tag is just to easily find this APKBUILD by some scripts for automation
|
||||
# group=kde-plasma
|
||||
pkgname=kscreenlocker
|
||||
pkgver=9999_git20240428
|
||||
_pkgver=6.0.4
|
||||
pkgver=99996.1.2
|
||||
_pkgver=6.1.2
|
||||
pkgrel=0
|
||||
pkgdesc="Library and components for secure lock screen architecture"
|
||||
# armhf blocked by extra-cmake-modules
|
||||
@@ -78,7 +75,7 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf kscreenlocker-6.0.4.tar.xz
|
||||
3f840435feba5601a849c2f9191524d7ca16eee672995a0a7194cace98614bc019c4ee7266bc40a6c64ca9c88f372c465861cf0a593fcb6cb5979f486edc89fb kscreenlocker-6.1.2.tar.xz
|
||||
cdbc45fb74a3c43fb2302fe09bf2f9f644ca93693e0110cf748c403762236aaeea8284a8d21fc495014c69b6d5fe4789aaff7687ce9f03dda270490fa5042e2b kde.pam
|
||||
fe2f244b73b5cccf4b7125b9e3cac0a35566840e4ba2f69937fd8053aa56af71ee43dcbfa9c0f79de9ebe31f656e98a5d38955f77560be5c3535b08215ad8789 kde-fingerprint.pam
|
||||
2ae866d25224ba345ea9d5ddb2fce668de5c51d1cfbb4d7a048c50107ccd6cffc3231a46855599c0ba3d62ff002a26e45b69d9029f88f4ab42661465a5e526c5 kde-smartcard.pam
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From a879c59a082707e0e7dfa8ebeb7b239551ec9c71 Mon Sep 17 00:00:00 2001
|
||||
From: Bart Ribbers <bribbers@disroot.org>
|
||||
Date: Thu, 11 Jan 2024 16:58:52 +0100
|
||||
Subject: [PATCH] Fix building of tests on Musl by making sure to include
|
||||
sys/select.h
|
||||
|
||||
Required for access to fd_set
|
||||
---
|
||||
tests/waylandservertest.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/waylandservertest.cpp b/tests/waylandservertest.cpp
|
||||
index d6210be373..1447152306 100644
|
||||
--- a/tests/waylandservertest.cpp
|
||||
+++ b/tests/waylandservertest.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <private/qeventdispatcher_glib_p.h>
|
||||
|
||||
#include <iostream>
|
||||
+#include <sys/select.h>
|
||||
#include <unistd.h>
|
||||
|
||||
static int startXServer()
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: team/kde <bribbers@disroot.org>
|
||||
# Forked from Alpine to add systemd!
|
||||
|
||||
# The group tag is just to easily find this APKBUILD by some scripts for automation
|
||||
# group=kde-plasma
|
||||
pkgname=kwin
|
||||
pkgver=99996.0.4.1
|
||||
_pkgver=6.0.4.1
|
||||
pkgver=99996.1.2
|
||||
_pkgver=6.1.2
|
||||
pkgrel=0
|
||||
pkgdesc="An easy to use, but flexible, composited Window Manager"
|
||||
# armhf blocked by qt6-qtdeclarative
|
||||
@@ -88,8 +85,7 @@ case "$_pkgver" in
|
||||
esac
|
||||
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
|
||||
_repo_url="https://invent.kde.org/plasma/kwin.git"
|
||||
source="https://download.kde.org/stable/plasma/${_pkgver%.*}/kwin-$_pkgver.tar.xz
|
||||
0001-kwin-Fix-building-of-tests.patch
|
||||
source="https://download.kde.org/stable/plasma/$(echo $_pkgver | cut -d . -f 1-3)/kwin-$_pkgver.tar.xz
|
||||
"
|
||||
# Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR?
|
||||
options="!check"
|
||||
@@ -115,6 +111,5 @@ package() {
|
||||
DESTDIR="$pkgdir" cmake --install build
|
||||
}
|
||||
sha512sums="
|
||||
a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5 kwin-6.0.4.1.tar.xz
|
||||
76dbcc01d7863939a1c83bdb730c61ecf939396428fd393be103c0621442143ba46ae366802c99a7cf3b27b67e28dea74e2e72f2511f697bd32bdc85a1bccfdc 0001-kwin-Fix-building-of-tests.patch
|
||||
cd138846c985ad415ef8fe070034da7887bfd0f31641f2ef5d52e8a0f4c9d00d759c6dcbeaa21b2e482c145f357cc6548476aae53d3eab8654a5b0175eeedc0e kwin-6.1.2.tar.xz
|
||||
"
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
# Contributor: Bart Ribbers <bribbers@disroot.org>
|
||||
# Maintainer: team/kde <bribbers@disroot.org>
|
||||
# Forked from Alpine to add systemd!
|
||||
|
||||
# The group tag is just to easily find this APKBUILD by some scripts for automation
|
||||
# group=kde-plasma
|
||||
pkgname=plasma-workspace
|
||||
pkgver=9999_git20240428
|
||||
_pkgver=6.0.4
|
||||
pkgver=99996.1.2
|
||||
_pkgver=6.1.2
|
||||
pkgrel=0
|
||||
pkgdesc="KDE Plasma Workspace"
|
||||
# armhf blocked by extra-cmake-modules
|
||||
@@ -82,6 +79,7 @@ depends_dev="
|
||||
plasma-wayland-protocols
|
||||
plasma5support-dev
|
||||
prison-dev
|
||||
qcoro-dev
|
||||
qt6-qtwayland-dev
|
||||
wayland-dev
|
||||
wayland-protocols
|
||||
@@ -103,12 +101,22 @@ case "$_pkgver" in
|
||||
*.90*) _rel=unstable;;
|
||||
*) _rel=stable;;
|
||||
esac
|
||||
subpackages="$pkgname-dbg $pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang $pkgname-zsh-completion"
|
||||
subpackages="
|
||||
$pkgname-dbg
|
||||
$pkgname-dev
|
||||
$pkgname-libs
|
||||
$pkgname-doc
|
||||
$pkgname-lang
|
||||
$pkgname-zsh-completion
|
||||
"
|
||||
_repo_url="https://invent.kde.org/plasma/plasma-workspace.git"
|
||||
source="https://download.kde.org/$_rel/plasma/$_pkgver/plasma-workspace-$_pkgver.tar.xz"
|
||||
builddir="$srcdir/$pkgname-$_pkgver"
|
||||
|
||||
replaces="plasma-desktop<5.24 breeze<5.22.90"
|
||||
# secfixes:
|
||||
# 6.0.5.1:
|
||||
# - CVE-2024-36041
|
||||
|
||||
|
||||
build() {
|
||||
# reduce size of debug syms
|
||||
@@ -117,7 +125,8 @@ build() {
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DPLASMA_WAYLAND_DEFAULT_SESSION=TRUE
|
||||
-DPLASMA_X11_DEFAULT_SESSION=OFF \
|
||||
-DINSTALL_SDDM_WAYLAND_SESSION=OFF # Fails to get permissions to take control over tty
|
||||
cmake --build build
|
||||
}
|
||||
|
||||
@@ -144,7 +153,7 @@ check() {
|
||||
skipped_tests="$skipped_tests|$test"
|
||||
done
|
||||
skipped_tests="$skipped_tests)"
|
||||
xvfb-run ctest --test-dir build --output-on-failure -E "$skipped_tests"
|
||||
xvfb-run -a ctest --test-dir build --output-on-failure -E "$skipped_tests"
|
||||
}
|
||||
|
||||
package() {
|
||||
@@ -152,5 +161,5 @@ package() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
d55cd7232b2d4da4172e813cdaa432e9582f3d16a7f38055303617a0c66f67511c6e20cc19bfb8bff68e06515c445783040dd212fbb686b2993f469ec6757466 plasma-workspace-6.0.4.tar.xz
|
||||
c37818ca6a733b48012fde4b230cbd2e90e9bd7c3b2611f0f6ab1bdfb5b1cf8e9b9d3ab79b95ea8c892889b17bf2bdceacd06acd11d508e91cffa6feed963c17 plasma-workspace-6.1.2.tar.xz
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user