diff --git a/temp/phosh/0001-PMOS-Hide-Logout-action.patch b/temp/phosh/0001-PMOS-Hide-Logout-action.patch deleted file mode 100644 index 99d74adc6..000000000 --- a/temp/phosh/0001-PMOS-Hide-Logout-action.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d0ed89ba5902a5f301f102f8073098525e3c11ad Mon Sep 17 00:00:00 2001 -From: Luca Weiss -Date: Thu, 23 Jul 2020 22:10:18 +0200 -Subject: [PATCH 2/2] PMOS: Hide Logout action - -It doesn't work on pmOS and we don't need it. ---- - src/ui/top-panel.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ui/top-panel.ui b/src/ui/top-panel.ui -index a91e9c4..7c6791b 100644 ---- a/src/ui/top-panel.ui -+++ b/src/ui/top-panel.ui -@@ -17,7 +17,7 @@ - - - -- True -+ False - panel.logout - Logout - --- -2.27.0 - diff --git a/temp/phosh/0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch b/temp/phosh/0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch deleted file mode 100644 index 1aa4ac451..000000000 --- a/temp/phosh/0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream: no -Needed until openrc-settingsd reports chassis: -https://gitlab.com/postmarketOS/pmaports/-/issues/851 - -From 4833a4e29df2ce3fff1f3b082537569e48bf4340 Mon Sep 17 00:00:00 2001 -From: Martijn Braam -Date: Wed, 28 Oct 2020 17:33:22 +0100 -Subject: [PATCH] mode-manager: default to being a phone when chassis isn't set - ---- - src/mode-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mode-manager.c b/src/mode-manager.c -index 7b9b30b..963587e 100644 ---- a/src/mode-manager.c -+++ b/src/mode-manager.c -@@ -102,7 +102,7 @@ update_props (PhoshModeManager *self) - } else if (g_strcmp0 (self->chassis, "tablet") == 0) { - device_type = PHOSH_MODE_DEVICE_TYPE_TABLET; - } else { -- device_type = PHOSH_MODE_DEVICE_TYPE_UNKNOWN; -+ device_type = PHOSH_MODE_DEVICE_TYPE_PHONE; - } - mimicry = device_type; - -@@ -346,7 +346,7 @@ static void - phosh_mode_manager_init (PhoshModeManager *self) - { - self->hw_flags = PHOSH_MODE_HW_NONE; -- self->device_type = PHOSH_MODE_DEVICE_TYPE_UNKNOWN; -+ self->device_type = PHOSH_MODE_DEVICE_TYPE_PHONE; - self->mimicry = PHOSH_MODE_DEVICE_TYPE_UNKNOWN; - } - --- -2.29.0 - diff --git a/temp/phosh/APKBUILD b/temp/phosh/APKBUILD deleted file mode 100644 index 9b0d22b6d..000000000 --- a/temp/phosh/APKBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Forked from Alpine to apply Hide-Logout-action patch -pkgname=phosh -pkgver=9999 -_pkgver=0.6.0 -pkgrel=4 -pkgdesc="Shell PoC for the Librem5" -# Blocked on mips and s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy -# Blocked on ppc64le by gnome-session -arch="all !s390x !ppc64le !mips !mips64" -url="https://source.puri.sm/Librem5/phosh" -license="GPL-3.0-only" -depends="wayland-protocols phoc gnome-session bash dbus-x11 gnome-settings-daemon - squeekboard libpulse dbus:org.freedesktop.Secrets elogind gnome-control-center" -makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev libhandy1-dev gcr-dev upower-dev - linux-pam-dev git cmake pulseaudio-dev networkmanager-dev polkit-elogind-dev - libsecret-dev feedbackd-dev" -subpackages="$pkgname-lang" -source="$pkgname-$_pkgver.tar.xz::https://repo.pureos.net/pureos/pool/main/p/phosh/phosh_$_pkgver.tar.xz - phosh.desktop - sm.puri.OSK0.desktop - 0001-PMOS-Hide-Logout-action.patch - 0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch - " -options="!check" # Needs a running Wayland compositor -builddir="$srcdir/$pkgname-$_pkgver" - -build() { - abuild-meson . output - meson compile ${JOBS:+-j ${JOBS}} -C output -} - -check() { - meson test --no-rebuild -v -C output -} - -package() { - DESTDIR="$pkgdir/" meson install --no-rebuild -C output - - 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="9be5a9e81eeeb2e9f6f5585fe81fd847c6fb38cf3feb3192d966d23a4396146b221602e8ac34b75343dcfc76402c6f6954b5b59417a3a086e1fb06485af41327 phosh-0.6.0.tar.xz -6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c phosh.desktop -f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69 sm.puri.OSK0.desktop -f289c8a9db01741058881ca6b20c386fcd87f00d3f638f1d32d181bed70d36e9696d84f4c210b581138fff6fceeafa5dcbcb4e1097f04eb29d8cee2930ca4446 0001-PMOS-Hide-Logout-action.patch -00b29af6c3540b7c7518d5b5e09d79748bd23899a2d292e3c5b4e6c26f8c27f42100db88450c34904787d89a28b727486aa77eff9aa57bb1c2a7954e9b8fcbf1 0002-mode-manager-default-to-being-a-phone-when-chassis-i.patch" diff --git a/temp/phosh/phosh.desktop b/temp/phosh/phosh.desktop deleted file mode 100644 index 844528451..000000000 --- a/temp/phosh/phosh.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Phosh -Name[en]=Phosh -Comment=This session logs you into Phosh -Comment[en]=This session logs in you into Phosh -Exec=dbus-run-session /usr/bin/phosh -TryExec=/usr/bin/phosh -Icon= -Type=Application -X-DesktopNames=Phosh -Keywords=launch;Phosh;desktop;session; diff --git a/temp/phosh/sm.puri.OSK0.desktop b/temp/phosh/sm.puri.OSK0.desktop deleted file mode 100644 index 140b417d1..000000000 --- a/temp/phosh/sm.puri.OSK0.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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