From 62a2c66f0296ca227a7d3ff9d0601ecf668499bd Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Mon, 11 Dec 2023 11:26:23 +0100
Subject: [PATCH] device-fairphone-fp4: remove phosh-specific config (MR 4619)

Remove the gtk tweaks, they break the UI now, presumably because I've
added proper notch config for FP4 to the gmobile project.

Also we can remove the phoc.ini since nowadays phosh can properly scale
itself based on the screen information and doesn't need this static
config anymore.
[ci:skip-build]: already built successfully in CI
---
 device/community/device-fairphone-fp4/APKBUILD | 15 +--------------
 device/community/device-fairphone-fp4/gtk.css  | 11 -----------
 device/community/device-fairphone-fp4/phoc.ini |  5 -----
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 device/community/device-fairphone-fp4/gtk.css
 delete mode 100644 device/community/device-fairphone-fp4/phoc.ini

diff --git a/device/community/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD
index 29955947d..055cc393c 100644
--- a/device/community/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
-pkgver=1.3
+pkgver=1.4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -26,12 +26,9 @@ source="
 	90-feedbackd-aw8695.rules
 	deviceinfo
 	modules-initfs
-	gtk.css
-	phoc.ini
 	"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
 "
 
 build() {
@@ -65,18 +62,8 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/gtk.css \
-		"$subpkgdir"/etc/skel/.config/gtk-3.0/gtk.css
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
-}
-
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
 e223df827d1d18507197d64fc409f527514f7f76b68f784811b7b59452260dbd72133c85277b1e7df38b0058e0f16ac0d1174104a193b7f6c8dcf64577863eba  deviceinfo
 285dcb0011a2114e83621811a4204dfae4310ff9312f727d2cbf5d10712fe7fae7a20f636fc02b7794a41af67864a42d04f8c2f7e241f9f5182827d0a0556179  modules-initfs
-25a93dcbe6dbc6cff24f57cbf5539bc475c5fe0f6bf5e8374c7032b9c38a939bef0aa0cde1707afcc16b1ec2d0859c03c6ee92d80d8048d1c6adc6e25178b85f  gtk.css
-65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
diff --git a/device/community/device-fairphone-fp4/gtk.css b/device/community/device-fairphone-fp4/gtk.css
deleted file mode 100644
index 027a0b6ba..000000000
--- a/device/community/device-fairphone-fp4/gtk.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* TWEAKS-START phosh-clock-notch */
-.phosh-topbar-clock {
-	margin-left: 100.0px;
-}
-/* TWEAKS-END phosh-clock-notch */
-/* TWEAKS-START phosh-panel-btn-space */
-.phosh-panel-btn {
-	margin-left: 10.0px;
-	margin-right: 10.0px;
-}
-/* TWEAKS-END phosh-panel-btn-space */
diff --git a/device/community/device-fairphone-fp4/phoc.ini b/device/community/device-fairphone-fp4/phoc.ini
deleted file mode 100644
index 3a87626f2..000000000
--- a/device/community/device-fairphone-fp4/phoc.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/phosh/phoc.ini
-# Overwrites values set in /usr/share/phosh/phoc.ini
-
-[output:DSI-1]
-scale = 3.0