main/postmarketos-ui-lxqt: new set of improvements (MR 4623)

Dependencies:
- Add dependency "xfce4-screensaver" to provide virtual keyboard at screen
  unlock. As a dependency because several settings need to be implemented to
  integrate it well in LXQt.
- Add dependency "setxkbmap" to make keyboard layout settings work
- Add dependency "upower" to make battery icon in panel work

Recommends:
- Add recommend "pulseaudio" to make sound work
- Add recommend "adwaita-icon-theme" because that's used by xfce4-screensaver
- Remove recommend "pavucontrol" because there is already "pavucontrol-qt"

Sources:
- Add autostart desktop file for xfce4-screensaver
- Add autostart desktop file to override lxqt-xscreensaver-autostart
- Modify autostart desktop file for onboard, a startup delay mitigates
  an issue with the onboard panel icon not showing up at the first boot
- Modify lxqt-tablet.sh to include custom XDG_DATA_DIRS
- Add application desktop file to override xfce4-screensaver-preferences,
  adding it to the menu
- Add application desktop file to override xscreensaver-settings, removing it
  from the menu
- Change install location of "lxqt-tablet" repository configs from
  /etc/skel/.config to /etc/xdg/lxqt-tablet. That way they are handled as
  distribution-specific configs and are separated from the user configs in
  ~/.config.
- Upgrade to version 0.3 of "lxqt-tablet" repository:
  - Change theme to "Dark" to fix panel look
  - Increase panel size
  - Change wallpaper mode to "zoom" to avoid deforming the picture
  - Disable global single click to not interfere with PCManFM
  - Add terminal and file manager launchers to panel
  - Rename openbox xml file to apply the configs
  - Set lock command to xfce4-screensaver
  - Add xfconf files to configure xfce4-screensaver
  - Clean up configs by removing default values

[ci:skip-build]: Already built successfully in CI.
This commit is contained in:
Jakob Hauser 2023-11-30 22:34:52 +01:00 committed by Stefan Hansson
parent 540c678ad2
commit 753b12a793
No known key found for this signature in database
GPG key ID: 8A700086A9FE41FD
7 changed files with 66 additions and 11 deletions

View file

@ -1,8 +1,8 @@
# Reference: https://postmarketos.org/uipkg
# Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
pkgname=postmarketos-ui-lxqt
pkgver=0.2
pkgrel=2
pkgver=0.3
pkgrel=0
pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
url="https://lxqt-project.org/"
# armhf: lxqt-desktop not available
@ -19,11 +19,15 @@ depends="
polkit-elogind
postmarketos-base-ui
postmarketos-base-ui-networkmanager
setxkbmap
tinydm
tinydm-openrc
upower
xfce4-screensaver
xorg-server
"
_pmb_recommends="
adwaita-icon-theme
alsa-plugins-pulse
alsa-utils
bluedevil
@ -34,10 +38,10 @@ _pmb_recommends="
obconf-qt
onboard
paper-icon-theme
pavucontrol
pavucontrol-qt
pm-utils
postmarketos-artwork-wallpapers
pulseaudio
pulseaudio-utils
qps
screengrab
@ -48,19 +52,29 @@ source="
$pkgname-$pkgver.tar.gz::https://gitlab.com/antoni.aloytorrens/lxqt-tablet/-/archive/$pkgver/lxqt-tablet-$pkgver.tar.gz
10_onboard.gschema.override
lxqt-tablet.sh
lxqt-xscreensaver-autostart.desktop
onboard-autostart.desktop
unclutter-xfixes.desktop
xfce4-screensaver.desktop
xfce4-screensaver-preferences.desktop
xscreensaver-settings.desktop
"
options="!check" # No testsuite
builddir="$srcdir/lxqt-tablet-$pkgver"
package() {
install -d -m755 "$pkgdir"/etc/skel
cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
mkdir -p "$pkgdir"/etc/xdg
cp -a "$builddir"/config "$pkgdir"/etc/xdg/lxqt-tablet
install -Dm644 -t "$pkgdir"/etc/xdg/lxqt-tablet/autostart \
"$srcdir"/lxqt-xscreensaver-autostart.desktop \
"$srcdir"/onboard-autostart.desktop \
"$srcdir"/unclutter-xfixes.desktop
"$srcdir"/unclutter-xfixes.desktop \
"$srcdir"/xfce4-screensaver.desktop
install -Dm644 -t "$pkgdir"/usr/share/lxqt-tablet/applications \
"$srcdir"/xfce4-screensaver-preferences.desktop \
"$srcdir"/xscreensaver-settings.desktop
install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
"$srcdir"/10_onboard.gschema.override
@ -70,9 +84,13 @@ package() {
}
sha512sums="
dab8453a8dbb8d01f978340ac598a3705461ec3a536b131e9247511d090ce40c8732284f39f0464e3fa2134e21277db3570f106fc1ad85cd7e6cdc7043704a4d postmarketos-ui-lxqt-0.2.tar.gz
d3bfa79f4f7dbf478ea5b321918d8a733a726839ab92b02c85a53fd3102b5b2cc5c928fbdfb6bc05bb7e8038bf13d45ccd73975160046912128bcfb4e2f2909c postmarketos-ui-lxqt-0.3.tar.gz
ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override
54e7ab0c44d88578e46a6a7ecd0cad9980c4d062d453a9443428bdfe2773d26a7b110103c854d7f1ca20d764b1f79a5bf082474fb4a0949ffe871671cc66d97e lxqt-tablet.sh
d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747 onboard-autostart.desktop
1b5ca0c5bc6ef0c06cd60f8ca26259da42e992f9aed8918901d52d267ce3d9861c514643d33a1e45257012e28631d07c244bfb821782cf4c2eab3094bf6a32fc lxqt-tablet.sh
688f1920f64fa9996d598a44c4a4e7a73d7b032489cebfdb52f3cb1b410b9843a696b0de25579fd0e8436f3f72cfdb4a9b6cb491479185deac0f8ce4e95746a5 lxqt-xscreensaver-autostart.desktop
ecf85cd0547ff4195ad4e5c15c1a5a1a23704e17318cc0fcde63cf8560df516b744fd64f85d3bb9450294fef0d4241398898acaa21068dca942359256b471b4b onboard-autostart.desktop
b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop
ffd31188677c1befcf94e47b350aa691f615b0320ef433ed9250d622c5be25b36b913ff551578329b32971c3320beba6794b1e3da93997811d0d1019be2b41ce xfce4-screensaver.desktop
d3182a58383f5e1f5c93129f69f6949565b566a7101037cd6a5643a6ec105aa31a5333877f89623981ca49ca8b0ad601e66b60957602ebc18883ecdce2d2a2de xfce4-screensaver-preferences.desktop
ff04ecf59aeeff3f0cee8bc53099ecadddec6ff33547fbcec9aa8debb0b8d6db629c45866d9809f992247f02c488ffd1f059755b2367cb1fb92c4b376ab4e5ec xscreensaver-settings.desktop
"

View file

@ -1,3 +1,4 @@
# shellcheck shell=sh
# Set primary config directory for postmarketOS LXQt configs.
# Set primary directories for postmarketOS LXQt configs and data.
export XDG_CONFIG_DIRS="/etc/xdg/lxqt-tablet:/etc/xdg:/etc:/usr/share"
export XDG_DATA_DIRS="/usr/share/lxqt-tablet:/usr/local/share:/usr/share"

View file

@ -0,0 +1,8 @@
# This file disables XScreenSaver autostart by option "Hidden=true".
# It overrides the corresponding desktop file in /etc/xdg/autostart.
[Desktop Entry]
Type=Application
Name=XScreenSaver
TryExec=xscreensaver
Exec=xscreensaver -no-splash
Hidden=true

View file

@ -3,4 +3,4 @@ Type=Application
Name=Onboard
Comment=Flexible onscreen keyboard
Icon=onboard
Exec=onboard
Exec=onboard --startup-delay=3.0

View file

@ -0,0 +1,11 @@
# This file adds a menu entry for Xfce Screensaver by removing "OnlyShowIn=XFCE".
# It overrides the corresponding desktop file in /usr/share/applications.
[Desktop Entry]
Type=Application
Name=Xfce Screensaver
Comment=Set your screensaver preferences
Icon=org.xfce.ScreenSaver
Exec=xfce4-screensaver-preferences
Categories=Settings;DesktopSettings
Terminal=false
StartupNotify=true

View file

@ -0,0 +1,7 @@
[Desktop Entry]
Type=Application
Name=Xfce Screensaver
Comment=Launch screensaver and locker program
Icon=org.xfce.ScreenSaver
Exec=xfce4-screensaver
NoDisplay=true

View file

@ -0,0 +1,10 @@
# This file removes the menu entry for XScreenSaver Settings by option "NoDisplay=true".
# It overrides the corresponding desktop file in /usr/share/applications.
[Desktop Entry]
Type=Application
Name=XScreenSaver Settings
Comment=Change screensaver properties
Icon=xscreensaver
Exec=xscreensaver-settings
Terminal=false
NoDisplay=true