[arch-commits] Commit in xfce4-settings/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, May 16, 2021 @ 09:49:39
  Author: foutrelis
Revision: 415588

upgpkg: xfce4-settings 4.16.1-2: fix layout switching on new installs

Added:
  xfce4-settings/trunk/keyboard-correctly-initialize-setting.patch
Modified:
  xfce4-settings/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |    7 ++++-
 keyboard-correctly-initialize-setting.patch |   33 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-16 09:31:55 UTC (rev 415587)
+++ PKGBUILD	2021-05-16 09:49:39 UTC (rev 415588)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-settings
 pkgver=4.16.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Settings manager of the Xfce desktop"
 arch=('x86_64')
 url="https://www.xfce.org/"
@@ -15,12 +15,17 @@
 makedepends=('intltool' 'xf86-input-libinput')
 optdepends=('python: xfce4-compose-mail -- "mailto:" URI handling')
 source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        keyboard-correctly-initialize-setting.patch
         default-xsettings-xml.patch)
 sha256sums=('bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6'
+            '020da2ecaef7d387c6082fed419bd01808c8c44f79c68b1a9c87ee6f85508d22'
             '8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/310
+  patch -Np1 -i ../keyboard-correctly-initialize-setting.patch
+
   # Enable Adwaita theme and font hinting by default
   patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
 }

Added: keyboard-correctly-initialize-setting.patch
===================================================================
--- keyboard-correctly-initialize-setting.patch	                        (rev 0)
+++ keyboard-correctly-initialize-setting.patch	2021-05-16 09:49:39 UTC (rev 415588)
@@ -0,0 +1,33 @@
+From d7541bca9533fc12cbf1d63fea122c50aac501b8 Mon Sep 17 00:00:00 2001
+From: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Wed, 5 May 2021 09:11:13 +0200
+Subject: [PATCH] keyboard: Correctly initialize setting (Fixes #310)
+
+---
+ dialogs/keyboard-settings/xfce-keyboard-settings.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index e031b374..69f5d9f0 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -352,6 +352,7 @@ xfce_keyboard_settings_constructed (GObject *object)
+   GObject              *xkb_layout_up_button;
+   GObject              *xkb_layout_down_button;
+ #endif /* HAVE_LIBXKLAVIER */
++  gboolean              xkb_disable_setting;
+ 
+   /* XKB settings */
+   xkb_key_repeat_check = gtk_builder_get_object (GTK_BUILDER (settings), "xkb_key_repeat_check");
+@@ -454,6 +455,8 @@ xfce_keyboard_settings_constructed (GObject *object)
+                     "state-set",
+                     G_CALLBACK (xfce_keyboard_settings_system_default_cb),
+                     settings);
++  xkb_disable_setting = xfconf_channel_get_bool (settings->priv->keyboard_layout_channel, "/Default/XkbDisable", TRUE);
++  gtk_switch_set_state (GTK_SWITCH (xkb_use_system_default_switch), xkb_disable_setting);
+   xfce_keyboard_settings_update_sensitive (GTK_SWITCH (xkb_use_system_default_switch), settings);
+ 
+   /* Keyboard model combo */
+-- 
+GitLab
+