Date: Tuesday, June 8, 2021 @ 08:00:51 Author: foutrelis Revision: 417354
upgpkg: xfce4-settings 4.16.2-1: new upstream release Modified: xfce4-settings/trunk/PKGBUILD Deleted: xfce4-settings/trunk/keyboard-correctly-initialize-setting.patch ---------------------------------------------+ PKGBUILD | 11 ++------ keyboard-correctly-initialize-setting.patch | 33 -------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-08 07:27:22 UTC (rev 417353) +++ PKGBUILD 2021-06-08 08:00:51 UTC (rev 417354) @@ -3,8 +3,8 @@ # Contributor: Corrado Primier <[email protected]> pkgname=xfce4-settings -pkgver=4.16.1 -pkgrel=3 +pkgver=4.16.2 +pkgrel=1 pkgdesc="Settings manager of the Xfce desktop" arch=('x86_64') url="https://docs.xfce.org/xfce/xfce4-settings/start"; @@ -15,17 +15,12 @@ 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' +sha256sums=('4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197da03d7e' '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" } Deleted: keyboard-correctly-initialize-setting.patch =================================================================== --- keyboard-correctly-initialize-setting.patch 2021-06-08 07:27:22 UTC (rev 417353) +++ keyboard-correctly-initialize-setting.patch 2021-06-08 08:00:51 UTC (rev 417354) @@ -1,33 +0,0 @@ -From d7541bca9533fc12cbf1d63fea122c50aac501b8 Mon Sep 17 00:00:00 2001 -From: Simon Steinbeiss <[email protected]> -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 -
