From a9486831366878794c9c505b0455f5d9aba81deb Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Mon, 1 Dec 2025 18:11:43 -0500
Subject: [PATCH] device-pine64-pinenote: drop phosh subpackage as not needed

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7470>
---
 device/testing/device-pine64-pinenote/APKBUILD | 15 ++-------------
 device/testing/device-pine64-pinenote/phoc.ini |  6 ------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 device/testing/device-pine64-pinenote/phoc.ini

diff --git a/device/testing/device-pine64-pinenote/APKBUILD b/device/testing/device-pine64-pinenote/APKBUILD
index 027f64dad..c774ba788 100644
--- a/device/testing/device-pine64-pinenote/APKBUILD
+++ b/device/testing/device-pine64-pinenote/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 _commit="28d2c05ab4e80a7972611cd3188f3e8be4197f6a"
 url="https://postmarketos.org"
 license="GPL-3.0-only"
@@ -36,14 +36,12 @@ source="
 	30-eink-waveform.files
 	50-touchscreen.conf
 	panfrost.conf
-	phoc.ini
 	tinydm-ebc.service
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-nonfree-firmware-systemd:nonfree_firmware_systemd
-	$pkgname-phosh
 	$pkgname-x11
 	$pkgname-sway
 	$pkgname-sway-systemd:sway_systemd
@@ -103,14 +101,6 @@ package() {
 		-t "$pkgdir"/usr/lib/modprobe.d
 }
 
-phosh() {
-	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	depends="postmarketos-theme"
-
-	install -Dm644 "$srcdir"/phoc.ini \
-		-t "$subpkgdir"/etc/phosh
-}
-
 sway() {
 	install_if="$pkgname=$pkgver-r$pkgrel sway"
 	install="device-pine64-pinenote-sway.post-install"
@@ -251,6 +241,5 @@ df0565391a66eed53ed817d3d1415bef000f9ed33ef2e8aa3016be3ecc21dd4a357e57838979d271
 8f7a5ad2f407de8c474d54dfdb9cc099c96e8918fc123f8b2a8ff911d7e1c7ca6fe30f9cea8ee2f0c1ba5f3e53359193d0683ca912f0b66e79a12814ce38dd98  30-eink-waveform.files
 ac433eebbc35a48561837495997aee4e55510b979bc0d8e3bafb761bc1be5b4bdeed2f456369dcbc582688aefd07c63966b0d72b6ffa99e84cfd868e677f02c8  50-touchscreen.conf
 6ba6638754e00908243de2f73ed6898dac03638a200dcf7b7cd9684757355ee1eb0ac874af0f971ad2e054c1a8c471867bdaea4d9aaf7eea6d3cf81ac7dd73a2  panfrost.conf
-4bf5158fbd53274a7429e825bb66225001f2403a4851e2d6803323b77d9095738ee3e5340ac85baf3e86bb4f47d38af8cbd78d8a5055c59a62f5b06e722e19cb  phoc.ini
 efc0b7fd892a9557d404f3dd52e6f03187d183b9432947a8845ef417e52e9dc55a71f920936a8fa11b90e73a355212b6094b86406c564d439a2e0347cfb0cced  tinydm-ebc.service
 "
diff --git a/device/testing/device-pine64-pinenote/phoc.ini b/device/testing/device-pine64-pinenote/phoc.ini
deleted file mode 100644
index 90d53d8f9..000000000
--- a/device/testing/device-pine64-pinenote/phoc.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/phosh/phoc.ini
-# Overwrites values set in /usr/share/phosh/phoc.ini
-
-# e-ink is an "Unknown" display type for now in mainline
-[output:Unknown-1]
-scale = 2.0