postmarketos-base-ui-plasma: remove unnecessary override files, and move kscreenlocker override back to plasma-mobile (MR 4882)
A bunch of override files in postmarketos-base-ui-plasma seem to have come from the plasma-mobile ui package, which probably shouldn't be on desktop and bigscreen. With Plasma 6, a lot of the overrides are now no longer necessary for Plasma Mobile. Situation with each file: - 000-gschema.override - This likely was for changing maliit themes and GTK title bar layout for Plasma Mobile, maliit theming was dropped (https://github.com/maliit/keyboard/pull/108), and title bar layout is now handled within Plasma Mobile - kdeglobals - This was for setting the look-and-feel on Plasma Mobile and default browser, it's now handled within Plasma Mobile envmanager - kwinrc - These were settings for disabling window decorations and setting the vkbd to maliit, which is now handled in Plasma Mobile envmanager - kscreenlockerrc - This is to autolock the screen after login (tinydm autologs in), the file was for Plasma Mobile, I don't think we want it for Desktop since SDDM is used there
This commit is contained in:
parent
135a2e4904
commit
cf2026196e
6 changed files with 9 additions and 48 deletions
|
@ -1,6 +0,0 @@
|
|||
[org.gnome.desktop.wm.preferences]
|
||||
button-layout='appmenu:'
|
||||
|
||||
[org.maliit.keyboard.maliit]
|
||||
device='plasmamobile'
|
||||
theme='Breeze'
|
|
@ -1,8 +1,8 @@
|
|||
# Reference: https://postmarketos.org/uipkg
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
pkgname=postmarketos-base-ui-plasma
|
||||
pkgver=1
|
||||
pkgrel=1
|
||||
pkgver=2
|
||||
pkgrel=0
|
||||
pkgdesc="Meta package for shared configuration for Plasma-based UIs"
|
||||
url="https://postmarketos.org"
|
||||
arch="noarch !armhf" # armhf is not supported
|
||||
|
@ -53,27 +53,14 @@ _pmb_recommends="
|
|||
"
|
||||
install="$pkgname.post-install $pkgname.post-upgrade"
|
||||
source="
|
||||
000-gschema.override
|
||||
gtk-app-wayland.sh
|
||||
kdeglobals
|
||||
kdewallet.kwl
|
||||
kdewallet.salt
|
||||
kscreenlockerrc
|
||||
kwinrc
|
||||
qtlogging.ini
|
||||
"
|
||||
options="!check pmb:gpu-accel"
|
||||
|
||||
package() {
|
||||
install -Dm644 \
|
||||
"$srcdir"/kwinrc \
|
||||
-t "$pkgdir"/etc/xdg/
|
||||
|
||||
install -Dm644 \
|
||||
"$srcdir"/kdeglobals \
|
||||
"$srcdir"/kscreenlockerrc \
|
||||
-t "$pkgdir"/etc/xdg
|
||||
|
||||
install -Dm644 \
|
||||
"$srcdir"/qtlogging.ini \
|
||||
-t "$pkgdir"/etc/xdg/QtProject/
|
||||
|
@ -82,9 +69,6 @@ package() {
|
|||
"$srcdir"/gtk-app-wayland.sh \
|
||||
-t "$pkgdir"/etc/profile.d/
|
||||
|
||||
install -Dm644 "$srcdir"/000-gschema.override \
|
||||
"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
|
||||
|
||||
# TODO: remove once keyboard input bug is fixed
|
||||
# https://bugs.kde.org/show_bug.cgi?id=435183
|
||||
install -Dm600 -t "$pkgdir"/etc/skel/.local/share/kwalletd \
|
||||
|
@ -94,12 +78,8 @@ package() {
|
|||
|
||||
|
||||
sha512sums="
|
||||
591529f147f161f5e97c979a9ad4b9f3a65e6d3b87a7bdbd020ec928155cfe5fd561cae6582c4b2831b452fe9b0a03168731771b77020fb66e09f81552ba421e 000-gschema.override
|
||||
57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179 gtk-app-wayland.sh
|
||||
a1923ecd21ce3c5eacee18f7a64750072ef9cd4aea7b9a0092d23b8445d37d9e70a3ac873c0c50b748e32adc4c3b75169a6737f3aea06ef85bc1fc95a67bb3ce kdeglobals
|
||||
923309f71ee0840ae49d610ab5c11260432f462709eee7148ee5a4703872b9926a3267b16b524162c1560e0798c63fe392a161a57be5c6000bbb1e3f0c947e25 kdewallet.kwl
|
||||
f3fdaaaf13e985166b86158d5a60098aa45195ea078a4cab7fbf12d3aa428000af3e46ec011dbdc38a4c00faeac5f9a3b5bc2765a6afdd0f1ee58616e31e7429 kdewallet.salt
|
||||
b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c kscreenlockerrc
|
||||
f483e351781ad879deb3bca81d023098b780f0f95129ec20aa263836f0482f720cd46fee3980b088afde4e6c89bbe126eb7fb673fab65744153a7568ca3c8720 kwinrc
|
||||
341f0b866c315f37868ef3e7137cce8b53a0e8e6164e5af71b3e8e2fa68321afbf0652d76124ef84bade1393f701748852ac939aef9daff7e272a0df827780eb qtlogging.ini
|
||||
"
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
# SPDX-FileCopyrightText: None
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
[General]
|
||||
BrowserApplication[$e]=!angelfish
|
||||
|
||||
[KDE]
|
||||
LookAndFeelPackage=org.kde.plasma.phone
|
|
@ -1,11 +0,0 @@
|
|||
# SPDX-FileCopyrightText: None
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
[Wayland]
|
||||
InputMethod[$e]=/usr/share/applications/com.github.maliit.keyboard.desktop
|
||||
VirtualKeyboardEnabled=true
|
||||
|
||||
# This is here for legacy purposes since look-and-feel packages don't have an upgrade path
|
||||
# If the device came installed with Plasma 5.26 or newer, then this is not needed
|
||||
[org.kde.kdecoration2]
|
||||
NoPlugin=true
|
|
@ -1,7 +1,7 @@
|
|||
# Reference: https://postmarketos.org/uipkg
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
pkgname=postmarketos-ui-plasma-mobile
|
||||
pkgver=4
|
||||
pkgver=5
|
||||
pkgrel=0
|
||||
pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)"
|
||||
url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
|
||||
|
@ -29,6 +29,7 @@ _pmb_recommends="
|
|||
"
|
||||
install="$pkgname.post-install $pkgname.post-upgrade"
|
||||
source="
|
||||
kscreenlockerrc
|
||||
maliit-plasmamobile.json
|
||||
org.kde.phone.homescreen.js
|
||||
"
|
||||
|
@ -37,6 +38,10 @@ replaces="plasma-mobile"
|
|||
options="!check pmb:gpu-accel"
|
||||
|
||||
package() {
|
||||
install -Dm644 \
|
||||
"$srcdir"/kscreenlockerrc \
|
||||
-t "$pkgdir"/etc/xdg
|
||||
|
||||
install -Dm644 "$srcdir"/maliit-plasmamobile.json \
|
||||
"$pkgdir"/usr/share/maliit/keyboard2/devices/plasmamobile.json
|
||||
|
||||
|
@ -72,6 +77,7 @@ extras() {
|
|||
|
||||
|
||||
sha512sums="
|
||||
b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c kscreenlockerrc
|
||||
70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb maliit-plasmamobile.json
|
||||
50dbb5e0b1550776ca6fc5b91468412b23d49aa502af77cf7d5d15af11eaf61b1632b205f42eac3274bf28a0b7b278a4d6bfc98c6c12ea29830fd258bad5107d org.kde.phone.homescreen.js
|
||||
"
|
||||
|
|
Loading…
Reference in a new issue