From fb119cc8e237a92faee22fd4af66b54fa351bdcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= <cedric.bellegarde@adishatz.org>
Date: Sun, 1 Jan 2023 21:53:20 +0100
Subject: [PATCH] main/postmarketos-ui-phosh: clean up dconf overrides (MR
 3775)

[ci:skip-build]: already built successfully in CI
---
 main/postmarketos-ui-phosh/APKBUILD                        | 7 +------
 main/postmarketos-ui-phosh/dconf-profile-postmarketos      | 2 --
 .../postmarketos-ui-phosh.post-install                     | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 main/postmarketos-ui-phosh/dconf-profile-postmarketos

diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index eb15cf939..de88d0bf9 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
-pkgver=22.1
+pkgver=22.2
 pkgrel=0
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5"
 url="https://puri.sm"
@@ -59,7 +59,6 @@ subpackages="$pkgname-qt_tweaks"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	01_postmarketos-ui-phosh.gschema.override
-	dconf-profile-postmarketos
 	mimeapps.list
 	phosh-qt-mobile-controls.sh
 	phosh-qt-wayland.sh
@@ -70,11 +69,8 @@ options="!check pmb:gpu-accel"
 package() {
 	install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
 		-t "$pkgdir"/usr/share/glib-2.0/schemas/
-	install -Dm755 "$srcdir"/dconf-profile-postmarketos \
-		"$pkgdir"/etc/dconf/profile/user
 	install -Dm644 "$srcdir"/mimeapps.list \
 		"$pkgdir"/usr/share/applications/mimeapps.list
-	# Only relocatable schemas should be installed under dconf
 	install -Dm644 "$srcdir"/udiskie.desktop \
 		"$pkgdir"/etc/xdg/autostart/udiskie.desktop
 }
@@ -89,7 +85,6 @@ qt_tweaks() {
 
 sha512sums="
 bfdef6d89015c34cbb9cf67f623f8d51f0b2d9665bca447c434ac14031ad13e8a5fe6fc63bdf52957bc6fd5404f2fe1321df8f5f2a9b945a2df09c741a2c672b  01_postmarketos-ui-phosh.gschema.override
-e00756c2c056f68123d877f2f6a5ad3434ca7851095f021c26831c081728b821cf7947ba08d6742eee51d93dc83859a7ead553f4dcbc8b6fcefa33ae344ba178  dconf-profile-postmarketos
 d58379d4dcbcc8df68e20c4a2f45dc320db5e9c383b8ffe2f3ba3815ebff46e8c1c32d18195800ac8b37adfab23ef4f985be2bf5da7ed3f10d15c5e3915c2fd3  mimeapps.list
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  phosh-qt-mobile-controls.sh
 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  phosh-qt-wayland.sh
diff --git a/main/postmarketos-ui-phosh/dconf-profile-postmarketos b/main/postmarketos-ui-phosh/dconf-profile-postmarketos
deleted file mode 100644
index 5a55db14d..000000000
--- a/main/postmarketos-ui-phosh/dconf-profile-postmarketos
+++ /dev/null
@@ -1,2 +0,0 @@
-user-db:user
-system-db:postmarketos
diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
index 561015796..33ae82105 100644
--- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
+++ b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
@@ -6,7 +6,6 @@ rc-update add bluetooth default
 rc-update add iio-sensor-proxy default
 rc-update add networkmanager default
 rc-update add waked default
-dconf update
 tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
 
 # Add the user to relevant groups in post-upgrade (symlink to post-install).