From 7f47a0c6ea2533e71ab34bb7147f6b3568589963 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Thu, 11 Jan 2024 21:16:28 +0100
Subject: [PATCH] device-pine64-dontbeevil: remove Weston configuration (MR
 4713)

The fbdev backend was removed with Weston 10 which has been out for a
good while now. This device should be able to use the DRM backend
anyway given that it uses the A64 SoC which also e.g. the PinePhone
uses.

Additionally, the comment about Xwayland being broken contradicts the
actual configuration file where Xwayland actually is being enabled
(xwayland=true), so this shouldn't be causing any regressions even if it
actually is broken.
---
 device/testing/device-pine64-dontbeevil/APKBUILD   | 13 ++-----------
 device/testing/device-pine64-dontbeevil/weston.ini | 12 ------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 device/testing/device-pine64-dontbeevil/weston.ini

diff --git a/device/testing/device-pine64-dontbeevil/APKBUILD b/device/testing/device-pine64-dontbeevil/APKBUILD
index c8e73608e..cef4f8632 100644
--- a/device/testing/device-pine64-dontbeevil/APKBUILD
+++ b/device/testing/device-pine64-dontbeevil/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-pine64-dontbeevil
-pkgver=0.4
-pkgrel=3
+pkgver=0.5
+pkgrel=0
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 url="https://postmarketos.org"
 license="MIT"
@@ -12,7 +12,6 @@ subpackages="
 	$pkgname-kernel-shortts:kernel_shortts
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-sensorfw
-	$pkgname-weston
 	$pkgname-x11
 "
 depends="postmarketos-base u-boot-sunxi u-boot-tools ofono"
@@ -23,7 +22,6 @@ source="
 	modules-initfs
 	sensorfw/90-dontbeevil.conf
 	uboot-script.cmd
-	weston.ini
 	xorg.conf
 	"
 
@@ -48,12 +46,6 @@ x11() {
 		"$subpkgdir"/etc/X11/xorg.conf.d/10-framebuffer.conf
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
 	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt"
@@ -85,6 +77,5 @@ dc24f907b420481fc63c277bb3ddc1bde07c01b5bdb1cd13648357299e2279e6a42310ffbaec2c3d
 c240c7ff7bd0ec0561eacc1927e678b3955086c951548633e1ee5284283e005f0c7fb4c4472f40529cba552cce076294fdfae97f35a338592b3a6961da4a7a3f  modules-initfs
 967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d  90-dontbeevil.conf
 7d46b92a9a831ead6c1919b95ec4930242b35c2d8e2ce05fcb70dcd8c77c61d840d78738c5d82f6f4d56a1e676237243a795a728e76f38c27a74ed6dcb44279a  uboot-script.cmd
-c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
 "
diff --git a/device/testing/device-pine64-dontbeevil/weston.ini b/device/testing/device-pine64-dontbeevil/weston.ini
deleted file mode 100644
index 2266916b6..000000000
--- a/device/testing/device-pine64-dontbeevil/weston.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=true
-backend=fbdev-backend.so
-
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg