From 7a0c56293bae3bab8cd65aec2e4728015ed15ff0 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 7 Feb 2024 11:25:06 +0100
Subject: [PATCH] device-fairphone-fp5: remove Phosh clock tweaks (MR 4804)

The latest version of phosh / gmobile knows about the notch, so remove
the gtk hacks.
---
 device/testing/device-fairphone-fp5/APKBUILD | 13 ++-----------
 device/testing/device-fairphone-fp5/gtk.css  |  5 -----
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 device/testing/device-fairphone-fp5/gtk.css

diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index 4feaa15c8..09d314293 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,15 +24,13 @@ makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	deviceinfo
-	gtk.css
 	modules-initfs
 	ucm/HiFi.conf
 	ucm/fp5.conf
 	"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-"
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -72,15 +70,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
-}
-
 sha512sums="
 63cbf700191cb22f699dd9bedb3f349bb03d4fe8eaac782689936bf8cfff8b5ef33e94072ca110e707470a4dcb4b863720997b1b8b668843334758fd08698da7  deviceinfo
-71cd1ffa1ae56874a0751ef9eb91f4bccbe2009c1287b2116f3c09e99e70e436ed3d3ef27684dd318c8ff140cdccd7428580788659b7c6b2a3d8df6948149171  gtk.css
 165ae7e1dbb5fb709e2f7b457dafa5df5b755c1199ea0f011b7e519ab49bc676ddeff92a3152629125e66d3dbbe5a70384364191000a1fdf860977e2ed43de54  modules-initfs
 f39b6e5de6d9bfefc841e887b92bb5a92d02d1de46fd376ca83871b7a9cf0da5297d7201457b2bb12c302887bb0a9d328604ff910ebda8022ac71ad120b11a3c  HiFi.conf
 fb510ca806fb76174576218f5cb4d799e05757b3e351eec32b1406bcf22540cf27888f30e3737f016d43e3c38dea8d7418c194e12c9879df9c756d4d80ceae99  fp5.conf
diff --git a/device/testing/device-fairphone-fp5/gtk.css b/device/testing/device-fairphone-fp5/gtk.css
deleted file mode 100644
index 8c6d3196a..000000000
--- a/device/testing/device-fairphone-fp5/gtk.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* TWEAKS-START phosh-clock-notch */
-.phosh-topbar-clock {
-	margin-left: 75.0px;
-}
-/* TWEAKS-END phosh-clock-notch */