community/squeekboard: upgrade to 1.9.3

Remove the custom terminal layout again. This was merged into upstream,
but then replaced upstream with yet another default terminal layout.
Let's stick with upstream default.

Related: https://source.puri.sm/Librem5/squeekboard/-/merge_requests/345
Related: https://source.puri.sm/Librem5/squeekboard/-/merge_requests/368

2 files changed, 5 insertions, 172 deletions

diff --git a/community/squeekboard/APKBUILD b/community/squeekboard/APKBUILD
index b05080717a1..b34c9f3d9aa 100644
--- a/community/squeekboard/APKBUILD
+++ b/community/squeekboard/APKBUILD
@@ -2,27 +2,18 @@
 # Contributor: Danct12 <danct12@disroot.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=squeekboard
-pkgver=1.9.2
-pkgrel=1
+pkgver=1.9.3
+pkgrel=0
 pkgdesc="The final Phosh keyboard"
 arch="all !s390x !ppc64le !mips !mips64" # Blocked by rust, fails to build on ppc64le
 url="https://source.puri.sm/Librem5/squeekboard"
 license="GPL-3.0-or-later"
 makedepends="meson ninja rust cargo bash glib-dev wayland-protocols wayland-dev
-	gtk+3.0-dev libcroco-dev gnome-desktop-dev"
+	gtk+3.0-dev libcroco-dev gnome-desktop-dev feedbackd-dev"
 checkdepends="xvfb-run"
-source="https://source.puri.sm/Librem5/squeekboard/-/archive/v$pkgver/squeekboard-v$pkgver.tar.gz
-	terminal.yaml"
+source="https://source.puri.sm/Librem5/squeekboard/-/archive/v$pkgver/squeekboard-v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-v$pkgver"
 
-prepare() {
-	default_prepare
-
-	# A better terminal layout
-	# Upstream PR: https://source.puri.sm/Librem5/squeekboard/-/merge_requests/345
-	cp "$srcdir"/terminal.yaml "$builddir"/data/keyboards/terminal.yaml
-}
-
 build() {
 	meson \
 		--prefix=/usr \
@@ -41,5 +32,4 @@ check() {
 package() {
 	DESTDIR="$pkgdir" ninja -C output install
 }
-sha512sums="609fbbbc888b35ce0b6cba114fb7f85e00bdaf6899afc7fb9fcfd87900985b67f5c646b55fb8e760543e0f9be7d1bc2d243536d498e5e22f99d8bcebd236f2fd  squeekboard-v1.9.2.tar.gz
-1799ec16f020f3ad544e679ebf75a8b9c8ecfe64a5fab7731a76f8a1d0c37fbcb4a061571f6ef30dbddbec19eaef5d79c5665acd903a5b1ee2a889143b9d9f02  terminal.yaml"
+sha512sums="6d3459869e1c350f796e2ea0654e603a94e3487bb69be6a2237e9e2044237685a9466e9e31a7cef6d8b34127735c823c58bf0d0486d0c3ac798fe5d7c3afb8d3  squeekboard-v1.9.3.tar.gz"
diff --git a/community/squeekboard/terminal.yaml b/community/squeekboard/terminal.yaml
deleted file mode 100644
index d3b382a9ee5..00000000000
--- a/community/squeekboard/terminal.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
----
-outlines:
-    default: { width: 50, height: 50 }
-    altline: { width: 70, height: 50 }
-    spaceline: { width: 160, height: 50 }
-    special: { width: 35.33, height: 50 }
-    action: { width: 85, height: 35 }
-    fkey: { width: 41, height: 50 }
-
-views:
-    base:
-        - "1 2 3 4 5 6 7 8 9 0"
-        - "q w e r t y u i o p"
-        - "a s d f g h j k l"
-        - "Shift_L   z x c v b n m  BackSpace"
-        - "show_symbols show_eschars preferences         space        , . Return"
-        - "Ctrl Tab ↑ ↓ ← →"
-    upper:
-        - "! @ # $ % ^ & * ( )"
-        - "Q W E R T Y U I O P"
-        - "A S D F G H J K L"
-        - "Shift_L   Z X C V B N M  BackSpace"
-        - "show_symbols show_eschars preferences         space        < > Return"
-        - "Alt Esc PgUp PgDn Home End"
-    symbols:
-        - "~ ` ´ - _ + = ° © ®"
-        - "[ ] { } \\ | ÷ × √"
-        - "; : ' \" · € £ ¥"
-        - "Del / ? § π τ µ ¶ BackSpace"
-        - "show_letters show_eschars preferences         space        < > Return"
-        - "Ctrl Tab ↑ ↓ ← →"
-    eschars:
-        - "F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 F12"
-        - "ä è é ö ü Ä È É Ö Ü"
-        - "à â ê î ô À Â È Î Ô"
-        - "Del  « » ç Ç æ œ ß  BackSpace"
-        - "show_symbols show_eschars preferences         space        „ “ Return"
-        - "Alt Esc PgUp PgDn Home End"
-
-buttons:
-    Shift_L:
-        action:
-            locking:
-                lock_view: "upper"
-                unlock_view: "base"
-        outline: "altline"
-        icon: "key-shift"
-    Ctrl:
-        modifier: "Control"
-        outline: "action"
-        label: "Ctrl"
-    Alt:
-        modifier: "Alt"
-        outline: "action"
-        label: "Alt"
-    BackSpace:
-        outline: "altline"
-        icon: "edit-clear-symbolic"
-        action: "erase"
-    preferences:
-        action: "show_prefs"
-        outline: "special"
-        icon: "keyboard-mode-symbolic"
-    show_letters:
-        action:
-            set_view: "base"
-        outline: "altline"
-        label: "abc"
-    show_symbols:
-        action:
-            set_view: "symbols"
-        outline: "altline"
-        label: "[{/"
-    show_eschars:
-        action:
-            locking:
-                lock_view: "eschars"
-                unlock_view: "base"
-        outline: "altline"
-        label: "func"
-    space:
-        outline: "spaceline"
-        label: " "
-        text: " "
-    Return:
-        outline: "altline"
-        icon: "key-enter"
-        keysym: "Return"
-    F1:
-        outline: "fkey"
-        keysym: "F1"
-    F2:
-        outline: "fkey"
-        keysym: "F2"
-    F3:
-        outline: "fkey"
-        keysym: "F3"
-    F4:
-        outline: "fkey"
-        keysym: "F4"
-    F5:
-        outline: "fkey"
-        keysym: "F5"
-    F6:
-        outline: "fkey"
-        keysym: "F6"
-    F7:
-        outline: "fkey"
-        keysym: "F7"
-    F8:
-        outline: "fkey"
-        keysym: "F8"
-    F9:
-        outline: "fkey"
-        keysym: "F9"
-    F10:
-        outline: "fkey"
-        keysym: "F10"
-    F11:
-        outline: "fkey"
-        keysym: "F11"
-    F12:
-        outline: "fkey"
-        keysym: "F12"
-    Esc:
-        outline: "action"
-        keysym: "Escape"
-    Home:
-        outline: "action"
-        keysym: "Home"
-    End:
-        outline: "action"
-        keysym: "End"
-    Del:
-        outline: "altline"
-        keysym: "Delete"
-    PgUp:
-        outline: "action"
-        keysym: "Page_Up"
-    PgDn:
-        outline: "action"
-        keysym: "Page_Down"
-    Tab:
-        outline: "action"
-        keysym: "Tab"
-    "↑":
-        outline: "action"
-        keysym: "Up"
-    "↓":
-        outline: "action"
-        keysym: "Down"
-    "←":
-        outline: "action"
-        keysym: "Left"
-    "→":
-        outline: "action"
-        keysym: "Right"