From bc3abc60922ebde657ded472d6e235c9f614085a Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 27 Sep 2019 09:52:14 +0200 Subject: [PATCH] phosh/phosh: upgrade to 0.1.0 (!655) Also enable for all architectures --- phosh/phosh/APKBUILD | 23 ++++++++++++++--------- phosh/phosh/sm.puri.OSK0.desktop | 12 ++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 phosh/phosh/sm.puri.OSK0.desktop diff --git a/phosh/phosh/APKBUILD b/phosh/phosh/APKBUILD index efabd0c97..b158dc2fa 100644 --- a/phosh/phosh/APKBUILD +++ b/phosh/phosh/APKBUILD @@ -1,22 +1,23 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=phosh -pkgver=0.0.3_git20190716 -pkgrel=1 -_commit="9a0ab4df8b1a812d52e0d270adf7808c38449a90" +pkgver=0.1.0_git20191003 +pkgrel=0 +_commit="8ca6caeb898713e7e94eafb317ae5470106d6c59" _gvc_commit="ae1a34aafce7026b8c0f65a43c9192d756fe1057" pkgdesc="A shell PoC for the Librem5" -arch="x86 x86_64 aarch64 armv7" +arch="all" url="https://source.puri.sm/Librem5/phosh" license="GPL-3.0-only" -depends="gtk+3.0 wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon virtboard libpulse" +depends="gtk+3.0 wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon squeekboard libpulse" makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev libhandy-dev gcr-dev upower-dev linux-pam-dev git cmake pulseaudio-dev networkmanager-dev polkit-elogind-dev" subpackages="$pkgname-lang" source=" - $pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/$pkgname/-/archive/$_commit.tar.gz + $pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/phosh/-/archive/$_commit.tar.gz libgvc-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz stop-hardcoding-resolution.patch - phosh.desktop" + phosh.desktop + sm.puri.OSK0.desktop" options="!check" # Needs a running Wayland compositor builddir="$srcdir/$pkgname-$_commit" @@ -42,8 +43,12 @@ package() { install -D -m644 "$srcdir"/phosh.desktop \ "$pkgdir"/usr/share/wayland-sessions/phosh.desktop + install -D -m644 "$srcdir"/sm.puri.OSK0.desktop \ + "$pkgdir"/usr/share/applications/sm.puri.OSK0.desktop + } -sha512sums="946df091c9053dc32412f9b8f293d8378e734c023d900e18cfc2931991500bdad52feaee199b495d840d765e9b70d36bf6825750b26c2c480306a6be02517040 phosh-9a0ab4df8b1a812d52e0d270adf7808c38449a90.tar.gz +sha512sums="2adef47bffade8374dcfc32cd4bb84f18e46bf1a4fe25f0c9309c0e71d7a00c33f5f7df8a0034c99650edf9028ebc7ee712d1dba411abf33e4aadb38d8c550da phosh-8ca6caeb898713e7e94eafb317ae5470106d6c59.tar.gz 723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21 libgvc-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz 93c05f86a314bbd466b083cd9dfe0ba40803020d4865d666f2f67356be41f1769116f34eaade66d19a0f0cec2d79941986fef24a9a2fa19481c769019aef9ba3 stop-hardcoding-resolution.patch -6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c phosh.desktop" +6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c phosh.desktop +f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69 sm.puri.OSK0.desktop" diff --git a/phosh/phosh/sm.puri.OSK0.desktop b/phosh/phosh/sm.puri.OSK0.desktop new file mode 100644 index 000000000..140b417d1 --- /dev/null +++ b/phosh/phosh/sm.puri.OSK0.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=On-screen keyboard +Comment=Default on-screen keyboard +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