[arch-commits] Commit in xfce4-settings/repos/extra-x86_64 (5 files)

Evangelos Foutras foutrelis at archlinux.org
Sun May 16 09:50:47 UTC 2021


    Date: Sunday, May 16, 2021 @ 09:50:47
  Author: foutrelis
Revision: 415589

archrelease: copy trunk to extra-x86_64

Added:
  xfce4-settings/repos/extra-x86_64/PKGBUILD
    (from rev 415588, xfce4-settings/trunk/PKGBUILD)
  xfce4-settings/repos/extra-x86_64/default-xsettings-xml.patch
    (from rev 415588, xfce4-settings/trunk/default-xsettings-xml.patch)
  xfce4-settings/repos/extra-x86_64/keyboard-correctly-initialize-setting.patch
    (from rev 415588, xfce4-settings/trunk/keyboard-correctly-initialize-setting.patch)
Deleted:
  xfce4-settings/repos/extra-x86_64/PKGBUILD
  xfce4-settings/repos/extra-x86_64/default-xsettings-xml.patch

---------------------------------------------+
 PKGBUILD                                    |  107 +++++++++++++-------------
 default-xsettings-xml.patch                 |   52 ++++++------
 keyboard-correctly-initialize-setting.patch |   33 ++++++++
 3 files changed, 115 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-16 09:49:39 UTC (rev 415588)
+++ PKGBUILD	2021-05-16 09:50:47 UTC (rev 415589)
@@ -1,51 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-
-pkgname=xfce4-settings
-pkgver=4.16.1
-pkgrel=1
-pkgdesc="Settings manager of the Xfce desktop"
-arch=('x86_64')
-url="https://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'libcanberra'
-         'colord' 'libxklavier' 'adwaita-icon-theme' 'gnome-themes-extra')
-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
-        default-xsettings-xml.patch)
-sha256sums=('bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6'
-            '8e9a6c70ab0ceb5d91b637dc290768f8a47edb5d7b6e2eebc4459dbc4ee040d7')
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Enable Adwaita theme and font hinting by default
-  patch -Np1 -i "$srcdir/default-xsettings-xml.patch"
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-xrandr \
-    --enable-xcursor \
-    --enable-libnotify \
-    --enable-libxklavier \
-    --enable-pluggable-dialogs \
-    --enable-sound-settings \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfce4-settings/repos/extra-x86_64/PKGBUILD (from rev 415588, xfce4-settings/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-16 09:50:47 UTC (rev 415589)
@@ -0,0 +1,56 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+
+pkgname=xfce4-settings
+pkgver=4.16.1
+pkgrel=2
+pkgdesc="Settings manager of the Xfce desktop"
+arch=('x86_64')
+url="https://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('exo' 'garcon' 'libxfce4ui' 'xfconf' 'libnotify' 'libcanberra'
+         'colord' 'libxklavier' 'adwaita-icon-theme' 'gnome-themes-extra')
+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"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-xrandr \
+    --enable-xcursor \
+    --enable-libnotify \
+    --enable-libxklavier \
+    --enable-pluggable-dialogs \
+    --enable-sound-settings \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: default-xsettings-xml.patch
===================================================================
--- default-xsettings-xml.patch	2021-05-16 09:49:39 UTC (rev 415588)
+++ default-xsettings-xml.patch	2021-05-16 09:50:47 UTC (rev 415589)
@@ -1,26 +0,0 @@
-diff -upr xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.12.0/xfsettingsd/xsettings.xml
---- xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml	2015-02-24 03:33:11.000000000 +0200
-+++ xfce4-settings-4.12.0/xfsettingsd/xsettings.xml	2015-03-01 09:52:24.376869688 +0200
-@@ -6,8 +6,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <channel name="xsettings" version="1.0">
-   <property name="Net" type="empty">
--    <property name="ThemeName" type="empty"/>
--    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Adwaita"/>
-+    <property name="IconThemeName" type="string" value="Adwaita"/>
-     <property name="DoubleClickTime" type="int" value="400"/>
-     <property name="DoubleClickDistance" type="int" value="5"/>
-     <property name="DndDragThreshold" type="int" value="8"/>
-@@ -19,9 +19,9 @@
-   </property>
-   <property name="Xft" type="empty">
-     <property name="DPI" type="empty"/>
--    <property name="Antialias" type="int" value="-1"/>
-+    <property name="Antialias" type="int" value="1"/>
-     <property name="Hinting" type="int" value="-1"/>
--    <property name="HintStyle" type="string" value="hintnone"/>
-+    <property name="HintStyle" type="string" value="hintfull"/>
-     <property name="RGBA" type="string" value="none"/>
-     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
-   </property>

Copied: xfce4-settings/repos/extra-x86_64/default-xsettings-xml.patch (from rev 415588, xfce4-settings/trunk/default-xsettings-xml.patch)
===================================================================
--- default-xsettings-xml.patch	                        (rev 0)
+++ default-xsettings-xml.patch	2021-05-16 09:50:47 UTC (rev 415589)
@@ -0,0 +1,26 @@
+diff -upr xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.12.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.12.0.orig/xfsettingsd/xsettings.xml	2015-02-24 03:33:11.000000000 +0200
++++ xfce4-settings-4.12.0/xfsettingsd/xsettings.xml	2015-03-01 09:52:24.376869688 +0200
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Adwaita"/>
++    <property name="IconThemeName" type="string" value="Adwaita"/>
+     <property name="DoubleClickTime" type="int" value="400"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>
+@@ -19,9 +19,9 @@
+   </property>
+   <property name="Xft" type="empty">
+     <property name="DPI" type="empty"/>
+-    <property name="Antialias" type="int" value="-1"/>
++    <property name="Antialias" type="int" value="1"/>
+     <property name="Hinting" type="int" value="-1"/>
+-    <property name="HintStyle" type="string" value="hintnone"/>
++    <property name="HintStyle" type="string" value="hintfull"/>
+     <property name="RGBA" type="string" value="none"/>
+     <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+   </property>

Copied: xfce4-settings/repos/extra-x86_64/keyboard-correctly-initialize-setting.patch (from rev 415588, xfce4-settings/trunk/keyboard-correctly-initialize-setting.patch)
===================================================================
--- keyboard-correctly-initialize-setting.patch	                        (rev 0)
+++ keyboard-correctly-initialize-setting.patch	2021-05-16 09:50:47 UTC (rev 415589)
@@ -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
+



More information about the arch-commits mailing list