From 0a8cb8277fdb0d11d1bc32c7ca82274e4301678d Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Sun, 7 Feb 2021 19:10:12 +0100
Subject: [PATCH] main/postmarketos-ui-phosh: make Kirigami/QML apps use mobile
 controls (MR 1932)

Otherwise these applications will behave as desktop applications which
is obviously not desired
---
 main/.shared-scripts/qt-mobile-controls.sh         |  2 ++
 main/postmarketos-ui-phosh/APKBUILD                | 14 ++++++++------
 .../phosh-qt-mobile-controls.sh                    |  1 +
 .../{qt-tweaks.sh => phosh-qt-wayland.sh}          |  0
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 main/.shared-scripts/qt-mobile-controls.sh
 create mode 120000 main/postmarketos-ui-phosh/phosh-qt-mobile-controls.sh
 rename main/postmarketos-ui-phosh/{qt-tweaks.sh => phosh-qt-wayland.sh} (100%)

diff --git a/main/.shared-scripts/qt-mobile-controls.sh b/main/.shared-scripts/qt-mobile-controls.sh
new file mode 100644
index 000000000..1f1cb56fd
--- /dev/null
+++ b/main/.shared-scripts/qt-mobile-controls.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+export QT_QUICK_CONTROLS_MOBILE=true
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 9cd4be4c5..c0b1d81c6 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
 pkgver=6
-pkgrel=8
+pkgrel=9
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
 url="https://puri.sm"
 arch="noarch !armhf"
@@ -50,7 +50,8 @@ source="
 	mpris-proxy.desktop
 	osk.sh
 	pipewire.desktop
-	qt-tweaks.sh
+	phosh-qt-mobile-controls.sh
+	phosh-qt-wayland.sh
 	"
 options="!check"
 
@@ -76,8 +77,9 @@ package() {
 qt_tweaks() {
 	install_if="$pkgname=$pkgver-r$pkgrel qt5-qtbase"
 	depends="qt5-qtwayland"
-	install -Dm755 "$srcdir"/qt-tweaks.sh \
-		"$subpkgdir"/etc/profile.d/phosh-qt-tweaks.sh
+	install -Dm755 -t "$subpkgdir"/etc/profile.d/ \
+		"$srcdir"/phosh-qt-mobile-controls.sh \
+		"$srcdir"/phosh-qt-wayland.sh
 }
 
 pipewire() {
@@ -88,7 +90,6 @@ pipewire() {
 	install -Dm644 "$srcdir"/pipewire.desktop \
 		-t "$subpkgdir"/etc/xdg/autostart/
 }
-
 sha512sums="77a8aec2a43829422481c17beaf4224d686cc973f80d72be383103a6be0bf5d0689486c50a1dffecf9f2605bd607647e23ab539dc283978792d248625ab327d5  000-gschema.override
 4a60c08c86688f2d92820bc07305fe1bcff54986d29ee5dd84c7902ea5247b73b96f7453d2da9931a19903b2f5825b8a636f92edcf89bc205a7d389defea0b0e  01-phoc-scaling
 834d1c558b6a9ca26345928895a5436919aab13f944410240516953a13f8fdafae995af4b1baeee560a800c405a4d67c44bb92499bf8cacae7a17f6d9893577e  02-gnome-software-no-first-run
@@ -98,4 +99,5 @@ e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742e
 9276b4282860229da47b8b690307a8bf8907370fcdebf0be4c2b71f933593e115572e61d846cb13821d51859ec9e53af6de250afa953b42c06cf0ad4905377c3  mpris-proxy.desktop
 4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a  osk.sh
 e499c5440e1690447ea0840898b577083be0387264e0b5c65e93ee5b4bdf7a01ad51814be4168d75e167451baebcd4cc37a55920a4240249b268dad8b180f540  pipewire.desktop
-6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  qt-tweaks.sh"
+bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  phosh-qt-mobile-controls.sh
+6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  phosh-qt-wayland.sh"
diff --git a/main/postmarketos-ui-phosh/phosh-qt-mobile-controls.sh b/main/postmarketos-ui-phosh/phosh-qt-mobile-controls.sh
new file mode 120000
index 000000000..815334f11
--- /dev/null
+++ b/main/postmarketos-ui-phosh/phosh-qt-mobile-controls.sh
@@ -0,0 +1 @@
+../.shared-scripts/qt-mobile-controls.sh
\ No newline at end of file
diff --git a/main/postmarketos-ui-phosh/qt-tweaks.sh b/main/postmarketos-ui-phosh/phosh-qt-wayland.sh
similarity index 100%
rename from main/postmarketos-ui-phosh/qt-tweaks.sh
rename to main/postmarketos-ui-phosh/phosh-qt-wayland.sh