From ad75c180777d180f6e860a74336e00d41e38a676 Mon Sep 17 00:00:00 2001
From: Jakob Hauser <jahau@rocketmail.com>
Date: Thu, 26 Aug 2021 22:23:57 +0200
Subject: [PATCH] postmarketos-ui-xfce4 & -mate: Implement onboard keyboard (MR
2464)
Installing "onboard" onscreen keyboard and enabling autostart.
Option "Don't auto-show while external keyboards are connected" is
activated.
[ci:skip-build] already built successfully in CI
---
.../10_onboard.gschema.override | 14 +++++++++
main/postmarketos-ui-mate/APKBUILD | 29 +++++++++++++++----
.../onboard-autostart.desktop | 6 ++++
.../10_onboard.gschema.override | 14 +++++++++
main/postmarketos-ui-xfce4/APKBUILD | 25 ++++++++++++----
.../onboard-autostart.desktop | 2 ++
6 files changed, 80 insertions(+), 10 deletions(-)
create mode 100644 main/postmarketos-ui-mate/10_onboard.gschema.override
create mode 100644 main/postmarketos-ui-mate/onboard-autostart.desktop
create mode 100644 main/postmarketos-ui-xfce4/10_onboard.gschema.override
create mode 100644 main/postmarketos-ui-xfce4/onboard-autostart.desktop
diff --git a/main/postmarketos-ui-mate/10_onboard.gschema.override b/main/postmarketos-ui-mate/10_onboard.gschema.override
new file mode 100644
index 00000000000..e9890a704ba
--- /dev/null
+++ b/main/postmarketos-ui-mate/10_onboard.gschema.override
@@ -0,0 +1,14 @@
+[org.gnome.desktop.interface]
+toolkit-accessibility=true
+
+[org.onboard]
+layout='/usr/share/onboard/layouts/Small.onboard'
+theme='/usr/share/onboard/themes/Nightshade.theme'
+show-tooltips=false
+
+[org.onboard.auto-show]
+enabled=true
+keyboard-device-detection-enabled=true
+
+[org.onboard.window]
+docking-enabled=true
diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD
index 13bb3e7549a..cd76405550d 100644
--- a/main/postmarketos-ui-mate/APKBUILD
+++ b/main/postmarketos-ui-mate/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=postmarketos-ui-mate
-pkgver=1
-pkgrel=13
+pkgver=2
+pkgrel=0
pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
url="http://mate-desktop.org/"
arch="noarch"
@@ -19,8 +19,17 @@ depends="
postmarketos-artwork-wallpapers
xorg-server
"
+_pmb_recommends="
+ onboard
+ "
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade"
-source="000-system-background.gschema.override 001-screensaver.gschema.override 61-lightdm-autologin.conf"
+source="
+ 000-system-background.gschema.override
+ 001-screensaver.gschema.override
+ 10_onboard.gschema.override
+ 61-lightdm-autologin.conf
+ onboard-autostart.desktop
+ "
options="!check"
package() {
@@ -30,10 +39,20 @@ package() {
install -Dm644 "$srcdir"/001-screensaver.gschema.override \
"$pkgdir"/usr/share/glib-2.0/schemas/001-screensaver.gschema.override
+ install -Dm644 "$srcdir"/10_onboard.gschema.override \
+ "$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
+
install -Dm644 "$srcdir"/61-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf
+
+ install -Dm644 "$srcdir"/onboard-autostart.desktop \
+ "$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
}
-sha512sums="b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 000-system-background.gschema.override
+sha512sums="
+b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 000-system-background.gschema.override
68c7614bab2f9beadac6a92508c3d63e05938e2746c7314921d4b0c2fc85e7fdca094c1c7c300710ab778a09b76a85158fc806150bc5bf3fce270f51c1d5d65b 001-screensaver.gschema.override
-225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 61-lightdm-autologin.conf"
+ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override
+225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 61-lightdm-autologin.conf
+d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747 onboard-autostart.desktop
+"
diff --git a/main/postmarketos-ui-mate/onboard-autostart.desktop b/main/postmarketos-ui-mate/onboard-autostart.desktop
new file mode 100644
index 00000000000..6ef6c4e216d
--- /dev/null
+++ b/main/postmarketos-ui-mate/onboard-autostart.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Onboard
+Comment=Flexible onscreen keyboard
+Icon=onboard
+Exec=onboard
diff --git a/main/postmarketos-ui-xfce4/10_onboard.gschema.override b/main/postmarketos-ui-xfce4/10_onboard.gschema.override
new file mode 100644
index 00000000000..e9890a704ba
--- /dev/null
+++ b/main/postmarketos-ui-xfce4/10_onboard.gschema.override
@@ -0,0 +1,14 @@
+[org.gnome.desktop.interface]
+toolkit-accessibility=true
+
+[org.onboard]
+layout='/usr/share/onboard/layouts/Small.onboard'
+theme='/usr/share/onboard/themes/Nightshade.theme'
+show-tooltips=false
+
+[org.onboard.auto-show]
+enabled=true
+keyboard-device-detection-enabled=true
+
+[org.onboard.window]
+docking-enabled=true
diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD
index ea9a49097fa..ec5827c59e8 100644
--- a/main/postmarketos-ui-xfce4/APKBUILD
+++ b/main/postmarketos-ui-xfce4/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=postmarketos-ui-xfce4
pkgver=0.3
-pkgrel=8
+pkgrel=9
pkgdesc="(X11) Lightweight desktop (stylus recommended)"
url="https://gitlab.com/postmarketOS/xfce4-phone"
arch="noarch"
@@ -21,6 +21,7 @@ depends="
_pmb_recommends="
faenza-icon-theme
gnome-keyring
+ onboard
pavucontrol
pm-utils
postmarketos-artwork-icons
@@ -34,8 +35,12 @@ _pmb_recommends="
xfce4-whiskermenu-plugin
"
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
- 64-lightdm-autologin.conf"
+source="
+ xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
+ 10_onboard.gschema.override
+ 64-lightdm-autologin.conf
+ onboard-autostart.desktop
+ "
options="!check"
builddir="$srcdir/xfce4-phone-$pkgver"
@@ -43,9 +48,19 @@ package() {
install -d -m755 "$pkgdir"/etc/skel
cp -a "$builddir"/config "$pkgdir"/etc/skel/.config
+ install -Dm644 "$srcdir"/10_onboard.gschema.override \
+ "$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
+
install -Dm644 "$srcdir"/64-lightdm-autologin.conf \
"$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf
+
+ install -Dm644 "$srcdir"/onboard-autostart.desktop \
+ "$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
}
-sha512sums="9adf87cdb531ad0eb4ab0d42dd4d43c88da117fdb8c7583c58ef2fcda52ce658e9234fe0451e5bf7d3768cdabf966c9dc27bda360e53ec44c04856ddfa941ab4 postmarketos-ui-xfce4-0.3.tar.gz
-3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf"
+sha512sums="
+9adf87cdb531ad0eb4ab0d42dd4d43c88da117fdb8c7583c58ef2fcda52ce658e9234fe0451e5bf7d3768cdabf966c9dc27bda360e53ec44c04856ddfa941ab4 xfce4-phone-0.3.tar.gz
+ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override
+3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf
+0f7947628076fcecb4883df8c4ff9989fb98448bbe8c12558bb47fc0d6dde0001c023c814fa88fe1390d6b058c7449dbecd0538e2289016ab84db0df2e15af6a onboard-autostart.desktop
+"
diff --git a/main/postmarketos-ui-xfce4/onboard-autostart.desktop b/main/postmarketos-ui-xfce4/onboard-autostart.desktop
new file mode 100644
index 00000000000..ac917af102e
--- /dev/null
+++ b/main/postmarketos-ui-xfce4/onboard-autostart.desktop
@@ -0,0 +1,2 @@
+[Desktop Entry]
+X-XFCE-Autostart-Override=true
--
GitLab