From 8fd97238fbb75ca47ab5696bbdca6478cc0d3423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 17 Feb 2022 21:52:33 +0100 Subject: [PATCH] main/postmarketos-ui-phosh: remove redundant schemas set by Phosh (MR 2945) Phosh already installs these schemas by default[1] and makes them specific to the Phosh desktop. Originally these might have been needed because either Phosh didn't ship the overrides or/and tinydm wasn't setting the environment variable XDG_CURRENT_DESKTOP properly[2]. To verify that the behavior of the Phosh override is working as expected one can do the following from an ssh session (so that the full DE envvars are not set): ```bash $ export DISPLAY=:0 # so that gsettings reset works $ gsettings reset org.gnome.desktop.interface clock-show-date $ gsettings get org.gnome.desktop.interface clock-show-date # false $ sudo rm /usr/share/glib-2.0/schemas/000-postmarketos.gschema.override $ sudo glib-compile-schemas --strict /usr/share/glib-2.0/schemas/ $ gsettings get org.gnome.desktop.interface clock-show-date # true (which is the default) $ export XDG_CURRENT_DESKTOP=GNOME:Phosh $ gsettings get org.gnome.desktop.interface clock-show-date # false (from phosh override) ``` [1] https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/00_sm.puri.Phosh.gschema.override [2] https://gitlab.com/postmarketOS/tinydm/-/merge_requests/12 --- main/postmarketos-ui-phosh/000-gschema.override | 8 -------- main/postmarketos-ui-phosh/APKBUILD | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/main/postmarketos-ui-phosh/000-gschema.override b/main/postmarketos-ui-phosh/000-gschema.override index 74b053b82..d94096ef7 100644 --- a/main/postmarketos-ui-phosh/000-gschema.override +++ b/main/postmarketos-ui-phosh/000-gschema.override @@ -1,10 +1,6 @@ [org.gnome.desktop.background] picture-uri='file:///usr/share/wallpapers/postmarketos.jpg' -[org.gnome.desktop.interface] -clock-show-weekday=false -clock-show-date=false - [org.gnome.desktop.wm.preferences] button-layout='appmenu:' @@ -22,10 +18,6 @@ ambient-enabled=false [org.gnome.eog.ui] sidebar=false -# squeekboard >= 0.10.0 requires this to be set for the keyboard to show -[org.gnome.desktop.a11y.applications] -screen-keyboard-enabled=true - [sm.puri.phosh] # disable filtering apps based on 'adaptive' tag app-filter-mode=[] diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index ebe03d15d..8d0c51861 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -109,7 +109,7 @@ firefox() { } sha512sums=" -d321d2829da80a61a084b6b2e8ca7d9148fcf2bdf9b160213451de0f8be28aab5172377ba7e944653ddb8e3f6e7eee48efe143ee7045ea529ec33adc70fea6a0 000-gschema.override +1cd21d2ec85abf1c9c2a17603f1ca21655c94f78e008c86927de2277956b4e563b2dcc5c38d300238dc92e1ceb3b8ae36789683bc5650b1911026e434f03e201 000-gschema.override 6d0ccbecfab1dbf2543dbd938d4b7544e278af9e88c8ab6751494b49aa281369f46d2769a1a1874e9bdad2faf8e8025d2ce97ea6b6302569a95283af5cedf459 01-phoc-scaling 50aa0083fc83f85e8c3e624c7782a5be01187321645c01d20c9f3adf19893375ab7d7b1ec3d51943fd09bcc78df4bbe1a369c951500bc7b766baff01febc1015 02-gnome-software-tweaks b9fed11dfd51cb54f9523376c965a952c1785c369a8e747868609dcb14787f260d994cb8a60a033a0ad2aa0991eb985dff158850d0f6ff48410f5ae7b789fc36 03-favorites