diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index 1f3ba87dd..bb85d30e6 100644 --- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD +++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD @@ -1,36 +1,37 @@ # Reference: https://postmarketos.org/uipkg maintainer="Bart Ribbers " pkgname=postmarketos-ui-plasma-bigscreen -pkgver=1 -pkgrel=3 +pkgver=2 +pkgrel=0 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400" pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs" -url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen" -# Crashes on armhf due to https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/75 -# riscv64: plasma-workspace, qt5-qtbase need rebuild against libcui18n in alpine edge -arch="!armhf !riscv64" +url="https://plasma-bigscreen.org" +# armhf blocked by qt6-qtdeclarative -> plasma-bigscreen +# x86, riscv64 and s390x blocked by qt6-qtwebengine -> plasma-bigscreen +arch="all !armhf !x86 !riscv64 !s390x" license="GPL-3.0-or-later" depends=" plasma-bigscreen postmarketos-base-ui-plasma - qt5-qtvirtualkeyboard + postmarketos-base-ui-tinydm + tinydm " _pmb_recommends=" aura-browser - breeze-icons5 + breeze-icons nymphcast plank-player " -subpackages="$pkgname-openrc" +install=" + $pkgname.post-install + $pkgname.post-upgrade + " source="$pkgname-$_commit_configs.tar.gz::https://invent.kde.org/plasma-bigscreen/bigscreen-image-settings/-/archive/$_commit_configs/bigscreen-image-settings-$_commit_configs.tar.gz - qtlogging.ini nymphcast.desktop " -options="!check pmb:drm" +options="!check pmb:systemd" # No tests for a meta package package() { - install -Dm644 -t "$pkgdir"/etc/xdg/QtProject \ - "$srcdir"/qtlogging.ini install -Dm644 -t "$pkgdir"/etc/xdg/autostart \ "$srcdir"/nymphcast.desktop @@ -39,21 +40,7 @@ package() { mv "$srcdir"/bigscreen-image-settings-"$_commit_configs"/etc/skel/.config "$pkgdir"/etc/skel/ } -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" - depends=" - elogind-openrc - openrc - networkmanager-openrc - tinydm-openrc - " - - mkdir -p "$subpkgdir" -} - sha512sums=" a3b877e15f06078c4ac6017d2b6ce57902d23d40c0fbbc8e7ad0af8f5b9ddc802e8e353ee4f48a07315dd2d1fd1b34ed3bfc4235649ba27729cbfd67dad3675a postmarketos-ui-plasma-bigscreen-a8bd93e279c222be6058ef46b065c11e88aa8400.tar.gz -341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini 04b0dc1385072b5e9004068594c110678ed9efd6254fd98dee302524e0edf139f936de849d80253301552f9927409a8b0cf5ad32cdb9f7861ef0e72787610d3c nymphcast.desktop " diff --git a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-install b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-install deleted file mode 100644 index 58197a7b9..000000000 --- a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -rc-update add elogind default -rc-update add networkmanager default -rc-update add tinydm default - -tinydm-set-session -s /usr/share/wayland-sessions/plasma-bigscreen-wayland.desktop diff --git a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-upgrade b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-upgrade deleted file mode 120000 index bb25ad303..000000000 --- a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -postmarketos-ui-plasma-bigscreen-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-install b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-install new file mode 100644 index 000000000..28ceed0fb --- /dev/null +++ b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-install @@ -0,0 +1,3 @@ +#!/bin/sh + +tinydm-set-session -s /usr/share/wayland-sessions/plasma-bigscreen-wayland.desktop diff --git a/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-upgrade b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-upgrade new file mode 120000 index 000000000..f6ac88f0d --- /dev/null +++ b/main/postmarketos-ui-plasma-bigscreen/postmarketos-ui-plasma-bigscreen.post-upgrade @@ -0,0 +1 @@ +postmarketos-ui-plasma-bigscreen.post-install \ No newline at end of file diff --git a/main/postmarketos-ui-plasma-bigscreen/qtlogging.ini b/main/postmarketos-ui-plasma-bigscreen/qtlogging.ini deleted file mode 100644 index 71b71ce9f..000000000 --- a/main/postmarketos-ui-plasma-bigscreen/qtlogging.ini +++ /dev/null @@ -1,70 +0,0 @@ -[Rules] -org.kde.kwindowsystem.info=true -org.kde.kwindowsystem.warning=true -org.kde.kwindowsystem.critical=true -org.kde.kwindowsystem.debug=true -kwin_core.info=true -kwin_core.warning=true -kwin_core.critical=true -kwin_core.debug=true -kwineffects.info=true -kwineffects.warning=true -kwineffects.critical=true -kwineffects.debug=true -libkwineffects.info=true -libkwineffects.warning=true -libkwineffects.critical=true -libkwineffects.debug=true -libkwinglutils.info=true -libkwinglutils.warning=true -libkwinglutils.critical=true -libkwinglutils.debug=true -libkwinxrenderutils.info=true -libkwinxrenderutils.warning=true -libkwinxrenderutils.critical=true -libkwinxrenderutils.debug=true -kwin_wayland_drm.info=true -kwin_wayland_drm.warning=true -kwin_wayland_drm.critical=true -kwin_wayland_drm.debug=true -kwin_wayland_framebuffer.info=true -kwin_wayland_framebuffer.warning=true -kwin_wayland_framebuffer.critical=true -kwin_wayland_framebuffer.debug=true -kwin_wayland_hwcomposer.debug=true -kwin_wayland_backend.info=true -kwin_wayland_backend.warning=true -kwin_wayland_backend.critical=true -kwin_wayland_backend.debug=true -kwin_wayland_x11windowed.info=true -kwin_wayland_x11windowed.warning=true -kwin_wayland_x11windowed.critical=true -kwin_wayland_x11windowed.debug=true -kwin_platform_x11_standalone.info=true -kwin_platform_x11_standalone.warning=true -kwin_platform_x11_standalone.critical=true -kwin_platform_x11_standalone.debug=true -kwin_libinput.info=true -kwin_libinput.warning=true -kwin_libinput.critical=true -kwin_libinput.debug=true -kwin_tabbox.info=true -kwin_tabbox.warning=true -kwin_tabbox.critical=true -kwin_tabbox.debug=true -kwin_decorations.info=true -kwin_decorations.warning=true -kwin_decorations.critical=true -kwin_decorations.debug=true -kwin_scripting.info=true -kwin_scripting.warning=true -kwin_scripting.critical=true -kwin_scripting.debug=true -kwin_xkbcommon.info=true -kwin_xkbcommon.warning=true -kwin_xkbcommon.critical=true -kwin_xkbcommon.debug=true -kwin_qpa_plugin.info=true -kwin_qpa_plugin.warning=true -kwin_qpa_plugin.critical=true -kwin_qpa_plugin.debug=true