From 1261285536bea7b25d5619f27907de6491cd9db2 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Fri, 3 Jan 2020 20:37:39 +0100
Subject: [PATCH] phosh/phosh: remove, upstreamed (!857)

---
 phosh/phosh/APKBUILD                         | 53 --------------------
 phosh/phosh/phosh.desktop                    | 11 ----
 phosh/phosh/sm.puri.OSK0.desktop             | 12 -----
 phosh/phosh/stop-hardcoding-resolution.patch | 27 ----------
 4 files changed, 103 deletions(-)
 delete mode 100644 phosh/phosh/APKBUILD
 delete mode 100644 phosh/phosh/phosh.desktop
 delete mode 100644 phosh/phosh/sm.puri.OSK0.desktop
 delete mode 100644 phosh/phosh/stop-hardcoding-resolution.patch

diff --git a/phosh/phosh/APKBUILD b/phosh/phosh/APKBUILD
deleted file mode 100644
index 2f669d5f4..000000000
--- a/phosh/phosh/APKBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgname=phosh
-pkgver=0.1.4
-pkgrel=0
-_gvc_commit="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
-pkgdesc="A shell PoC for the Librem5"
-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 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 libsecret-dev"
-subpackages="$pkgname-lang"
-source="
-	$pkgname-$pkgver.tar.gz::https://source.puri.sm/Librem5/phosh/-/archive/v$pkgver/phosh-v$pkgver.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
-	sm.puri.OSK0.desktop"
-options="!check" # Needs a running Wayland compositor
-builddir="$srcdir/$pkgname-v$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$srcdir"
-	mv libgnome-volume-control*/* "$builddir"/subprojects/gvc/
-}
-
-build() {
-	meson . _build --prefix=/usr
-	ninja -C _build
-}
-
-check() {
-	ninja -C _build test
-}
-
-package() {
-	DESTDIR="$pkgdir/" ninja -C _build install
-
-	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="293d9574f272510876f77d020f3185fc18306067ab6df6705d42d7e6cceb9d3ab977e6f0e47027cf8fd7d78c6fc8f11f849b8bd85c4941c3700e47f801da8a60  phosh-0.1.4.tar.gz
-723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21  libgvc-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz
-93c05f86a314bbd466b083cd9dfe0ba40803020d4865d666f2f67356be41f1769116f34eaade66d19a0f0cec2d79941986fef24a9a2fa19481c769019aef9ba3  stop-hardcoding-resolution.patch
-6644870edbbbc6b88d6e19f7771d81dba1a11066c2b34e4c22736db73a2dfd0d4909b4967503059c35385c5139a834a5c06a3c56b148ba1275d7f089c0c5f33c  phosh.desktop
-f97019598323276cf97ae62f04b6245983198e04b228ddc605835ee46845d9b88c6890fb86e97e4bb6f1ad73361437d9ed18c91e81fe1284a88cdcb92d3fdc69  sm.puri.OSK0.desktop"
diff --git a/phosh/phosh/phosh.desktop b/phosh/phosh/phosh.desktop
deleted file mode 100644
index 844528451..000000000
--- a/phosh/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/phosh/phosh/sm.puri.OSK0.desktop b/phosh/phosh/sm.puri.OSK0.desktop
deleted file mode 100644
index 140b417d1..000000000
--- a/phosh/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
diff --git a/phosh/phosh/stop-hardcoding-resolution.patch b/phosh/phosh/stop-hardcoding-resolution.patch
deleted file mode 100644
index 1ef02cd1e..000000000
--- a/phosh/phosh/stop-hardcoding-resolution.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/data/rootston.ini b/data/rootston.ini
-index 7a3b754..1ae3883 100644
---- a/data/rootston.ini
-+++ b/data/rootston.ini
-@@ -7,22 +7,6 @@ map-to-output:DSI-1
- [output:DSI-1]
- scale = 2
- 
--[output:Virtual-1]
--# For the x86 VM using QXL to get a phone like geometry
--modeline = 87.25  720 776 848 976  1440 1443 1453 1493 -hsync +vsync
--mode = 720x1440
--scale = 2
--
--[output:X11-1]
--mode = 360x720
--#rotate = 90
--scale = 1
--
--[output:WL-1]
--mode = 360x720
--#rotate = 90
--scale = 1
--
- [keyboard]
- meta-key = Logo
-