From 5c14ca0ead3260860cbe15f7d799eae89889d06a Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm> Date: Wed, 12 Jul 2023 07:38:20 +0200 Subject: [PATCH] Revert "Drop osk-wayland" This reverts commit db372b12863974906a80f8d2b8615a5ba97d7d94. --- debian/librem5-base-defaults.alternatives | 4 ++++ debian/librem5-base-defaults.install | 3 +++ default/osk-wayland | 9 +++++++++ default/sm.puri.OSK0-legacy.desktop | 12 ++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 debian/librem5-base-defaults.alternatives create mode 100755 default/osk-wayland create mode 100644 default/sm.puri.OSK0-legacy.desktop diff --git a/debian/librem5-base-defaults.alternatives b/debian/librem5-base-defaults.alternatives new file mode 100644 index 0000000..ebf7e26 --- /dev/null +++ b/debian/librem5-base-defaults.alternatives @@ -0,0 +1,4 @@ +Name: Phosh-OSK +Link: /usr/share/applications/sm.puri.OSK0.desktop +Alternative: /usr/share/applications/sm.puri.OSK0-legacy.desktop +Priority: 20 diff --git a/debian/librem5-base-defaults.install b/debian/librem5-base-defaults.install index 2442a74..ac3c418 100644 --- a/debian/librem5-base-defaults.install +++ b/debian/librem5-base-defaults.install @@ -9,6 +9,9 @@ default/audio/paths usr/share/pulseaudio/alsa-mixer/ default/audio/ucm2 usr/share/alsa/ default/audio/alsa-restore.service.d lib/systemd/system/ +default/sm.puri.OSK0-legacy.desktop usr/share/applications/ +default/osk-wayland usr/bin/ + # librem5 specific environment variables default/profile.d/*.sh etc/profile.d/ diff --git a/default/osk-wayland b/default/osk-wayland new file mode 100755 index 0000000..bf08479 --- /dev/null +++ b/default/osk-wayland @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +OSK=/usr/bin/virtboard + +if [ -x /usr/bin/squeekboard ]; then + OSK=/usr/bin/squeekboard +fi +exec $OSK + diff --git a/default/sm.puri.OSK0-legacy.desktop b/default/sm.puri.OSK0-legacy.desktop new file mode 100644 index 0000000..1847c84 --- /dev/null +++ b/default/sm.puri.OSK0-legacy.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=On-screen keyboard +Comment=Legacy on-screen keyboard wrapper +Exec=/usr/bin/osk-wayland +Categories=GNOME;Core; +OnlyShowIn=GNOME; +NoDisplay=true +X-GNOME-Autostart-Phase=Panel +X-GNOME-Provides=inputmethod +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true -- GitLab