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

The fbdev backend was removed with Weston 10 which has been out for a
good while now. As such, it doesn't matter whether Xwayland works or not
since Weston won't work at all --- the DRM backend, which is what would
get used instead of fbdev with this removed, won't work on downstream
kernels like the one used by this device.
---
 device/testing/device-motorola-thea/APKBUILD   | 15 ++++-----------
 device/testing/device-motorola-thea/weston.ini | 11 -----------
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 device/testing/device-motorola-thea/weston.ini

diff --git a/device/testing/device-motorola-thea/APKBUILD b/device/testing/device-motorola-thea/APKBUILD
index 96df8ab0f..82eb1f3a6 100644
--- a/device/testing/device-motorola-thea/APKBUILD
+++ b/device/testing/device-motorola-thea/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-thea
-pkgver=1
-pkgrel=6
+pkgver=2
+pkgrel=0
 pkgdesc="Motorola Moto G 2014"
 url="https://postmarketos.org"
 arch="armv7"
@@ -9,8 +9,8 @@ license="MIT"
 depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
-subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo 90-android-touch-dev.rules profile.sh weston.ini"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo 90-android-touch-dev.rules profile.sh"
 options="!check !archcheck"
 
 build() {
@@ -29,12 +29,6 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-motorola-titan"
@@ -45,5 +39,4 @@ sha512sums="
 40ce29e9b4fa8617f31b7d89576b9786b5503745fe25f5efc72dd8f5e47219e37dff5495021addc096aed1462c8958bdff8666e9f9cf33ae67df961662a3a84f  deviceinfo
 8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
 "
diff --git a/device/testing/device-motorola-thea/weston.ini b/device/testing/device-motorola-thea/weston.ini
deleted file mode 100644
index d94ea3a19..000000000
--- a/device/testing/device-motorola-thea/weston.ini
+++ /dev/null
@@ -1,11 +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=false
-backend=fbdev-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg