[bug#74989] [PATCH 00/23] xfce 4.20 updates

[bug#74989] [PATCH 00/23] xfce 4.20 updates

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

Hello, here are updates for xfce 4.20.
Wayland support (with labwc) not tested yet.

Sou Bunnbu (宋文武) (23):
  gnu: xfce4-dev-tools: Update to 4.20.0.
  gnu: libxfce4util: Update to 4.20.0.
  gnu: xfconf: Update to 4.20.0.
  gnu: libxfce4ui: Update to 4.20.0.
  gnu: elementary-xfce-icon-theme: Update to 0.20.
  gnu: exo: Update to 4.20.0.
  gnu: garcon: Update to 4.20.0.
  gnu: tumbler: Update 4.20.0.
  gnu: Add libxfce4windowing.
  gnu: xfce4-panel: Update to 4.20.0.
  gnu: xfdesktop: Update to 4.20.0.
  gnu: xfce4-session: Update to 4.20.0.
  gnu: xfce4-settings: Update to 4.20.0.
  gnu: xfce4-power-manager: Update to 4.20.0.
  gnu: xfce4-pulseaudio-plugin: Update to 0.4.9.
  gnu: xfce4-appfinder: Update to 4.20.0.
  gnu: xfce4-session: Update to 4.20.0.
  gnu: thunar: Update to 4.20.0.
  gnu: thunar-volman: Update to 4.20.0.
  gnu: xfwm4: Update to 4.20.0.
  gnu: xfce4-dict: Update to 0.8.8.
  gnu: mousepad: Update to 0.6.3.
  gnu: xfce4-weather-plugin: Update to 0.11.3.

 gnu/local.mk                                  |   1 -
 .../patches/xfce4-panel-plugins.patch         | 115 ---------
 .../patches/xfce4-settings-defaults.patch     |  14 +-
 gnu/packages/xfce.scm                         | 234 ++++++++++++------
 4 files changed, 168 insertions(+), 196 deletions(-)
 delete mode 100644 gnu/packages/patches/xfce4-panel-plugins.patch


base-commit: 1a62f687e504c67f26693f3bc60a90e503ab4ea9
--
2.46.0

[bug#74989] [PATCH 01/23] gnu: xfce4-dev-tools: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-dev-tools): Update to 4.20.0.
[native-inputs]: Add meson.
[inputs]: Add python.
[propagated-inputs]: Add glib:bin.

Change-Id: Ifabd5a554a4af0cfbe86554cac9428c7a61c25ce
---
 gnu/packages/xfce.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 48fdfc8fdc..ab279eac2c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -38,6 +38,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages fonts)
@@ -2222,7 +2223,7 @@ (define-public xfce4-weather-plugin
 (define-public xfce4-dev-tools
   (package
     (name "xfce4-dev-tools")
-    (version "4.18.1")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -2230,13 +2231,16 @@ (define-public xfce4-dev-tools
                                   "xfce4-dev-tools-" version ".tar.bz2"))
               (sha256
                (base32
-                "10bnb8q7sj60ahzfwrb3av4ngr17wk1p6jsnfv0yn8l90kksnb41"))))
+                "1ak68k6r0q6dh3knc3vxqvkvkw54f916wfrsm8g7gk0fiah3kfhz"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config
+     (list meson
+           pkg-config
            libxslt))
     (inputs
-     (list glib))
+     (list glib python))
+    (propagated-inputs
+     (list `(,glib "bin")))    ; 'glib-genmarshal' required by 'xdt-depends.m4'
     (home-page "https://docs.xfce.org/xfce/xfce4-dev-tools/")
     (synopsis "Xfce developer tools")
     (description
-- 
2.46.0

[bug#74989] [PATCH 02/23] gnu: libxfce4util: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (libxfce4util): Update to 4.20.0.

Change-Id: Id503c73d35e76708567d83e47280bc762d5dfc6b
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ab279eac2c..c17a76b213 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -112,7 +112,7 @@ (define-public gtk-xfce-engine
 (define-public libxfce4util
   (package
     (name "libxfce4util")
-    (version "4.18.2")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -120,7 +120,7 @@ (define-public libxfce4util
                                   "/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ly3i4w2xb9rcmkr34d8yrig3fvb4yxzranl1i9f5xvq5cc2k8yr"))))
+                "14mml8rdj16gkax92h89vcgf6sphp7v3jf5r7n1858lmk6f3yj91"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config gobject-introspection intltool vala))
-- 
2.46.0

[bug#74989] [PATCH 03/23] gnu: xfconf: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfconf): Update to 4.20.0.
[arguments]: Add 'patch-configure phase for 'gdbus-codegen'.

Change-Id: I9b652946796ff65d7fa22338adfcbb6534894169
---
 gnu/packages/xfce.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c17a76b213..7b6b525cb7 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -135,7 +135,7 @@ (define-public libxfce4util
 (define-public xfconf
   (package
     (name "xfconf")
-    (version "4.18.3")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -143,12 +143,18 @@ (define-public xfconf
                                   "xfconf-" version ".tar.bz2"))
               (sha256
                (base32
-                "165xbr6y5z4zr235znkqlwkcy2ib9hgfqrdic0n7p57nas8ccv65"))))
+                "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
        ;; Run check after install phase to test dbus activation.
        (modify-phases %standard-phases
+         (add-before 'configure 'patch-configure
+           (lambda _
+             (substitute* "configure"
+               ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+               (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                "type -p gdbus-codegen"))))
          ;; tests-end seems to hang forever
          (add-before 'configure 'patchout-tests-end
            (lambda _
-- 
2.46.0

[bug#74989] [PATCH 04/23] gnu: libxfce4ui: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (libxfce4ui): Update to 4.20.0.

Change-Id: Id5301ea1e0694f9ed2e39943b0742a5690cc73c5
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7b6b525cb7..bc1af0c495 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -192,7 +192,7 @@ (define-public xfconf
 (define-public libxfce4ui
   (package
     (name "libxfce4ui")
-    (version "4.18.6")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -200,7 +200,7 @@ (define-public libxfce4ui
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1k9hrq4mlpknv6kb32aakp57n0vaxv3q7716kkvcgin8dhh9kpbp"))))
+                "1vpafvmn2x95n0d8dmr6pp81w8bw2ksicp6dvsm7a0zjhilrks3m"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
2.46.0

[bug#74989] [PATCH 05/23] gnu: elementary-xfce-icon-theme: Update to 0.20.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (elementary-xfce-icon-theme): Update to 0.20.

Change-Id: I230bf0e71ab85dfd31beec4a7b9b826dedd842dc
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bc1af0c495..b9b7b00818 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -277,7 +277,7 @@ (define-public catfish
 (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
-    (version "0.19")
+    (version "0.20")
     (source (origin
               (method git-fetch)
               (uri
@@ -287,7 +287,7 @@ (define-public elementary-xfce-icon-theme
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0yvn8s7z18g4far37xyq6d5hw9x89injkdcy21sibpwjkv2cy6kv"))))
+                "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no check target
-- 
2.46.0

[bug#74989] [PATCH 06/23] gnu: exo: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (exo): Update to 4.20.0.

Change-Id: Ia847597bfbc1ddc34a8fb2ada761bfa70e327697
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b9b7b00818..af202fe1d3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -310,7 +310,7 @@ (define-public elementary-xfce-icon-theme
 (define-public exo
   (package
     (name "exo")
-    (version "4.18.0")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -318,7 +318,7 @@ (define-public exo
                                   "exo-" version ".tar.bz2"))
               (sha256
                (base32
-                "0mbxv8hys1i8s4p5d0pvgywsjgf21ki0mzcp8avcv2588p862b2g"))))
+                "1387xib59z9m43z772lz3kwjrcd6id9zs5yr3khgs7jz4jczfxs2"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool))
-- 
2.46.0

[bug#74989] [PATCH 07/23] gnu: garcon: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (garcon): Update to 4.20.0.

Change-Id: I76831f22da1244074b880b64205a3300d10948cb
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index af202fe1d3..5619f2767c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -339,7 +339,7 @@ (define-public exo
 (define-public garcon
   (package
     (name "garcon")
-    (version "4.18.2")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -347,7 +347,7 @@ (define-public garcon
                                   "garcon-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ka35nxqhl4cbmyf9x2ysinihixsqmibqywqr2zqz5iiw699530v"))))
+                "13ysx9gl22a5rjzl4m3v0zm3hpii1jy38b5lz3fs971h29y53f3z"))))
     (build-system gnu-build-system)
     (native-inputs
      (list `(,glib "bin") gobject-introspection intltool pkg-config))
-- 
2.46.0

[bug#74989] [PATCH 08/23] gnu: tumbler: Update 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (tumbler): Update to 4.20.0.
[native-inputs]: Remove dbus-glib.
[arguments]: Add 'patch-configure phase for 'gdbus-codegen'.

Change-Id: Ie661eae35d935c1e05952d7d5c20872be3ca492f
---
 gnu/packages/xfce.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5619f2767c..e86341fef9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -366,7 +366,7 @@ (define-public garcon
 (define-public tumbler
   (package
     (name "tumbler")
-    (version "4.18.2")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -374,12 +374,20 @@ (define-public tumbler
                                   "tumbler-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ymy6a0hbv5iainphgpd7dfi8snpg7zs7lyqq2cgiiza6p3fwc5m"))))
+                "102qwa8an7wdqf0hrqd5k51aiib3zww0iizsigllfrcjamyn9cbl"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'patch-configure
+                 (lambda _
+                   (substitute* "configure"
+                     ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+                     (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                      "type -p gdbus-codegen")))))))
     (native-inputs
      (list pkg-config intltool
-           `(,glib "bin") ; need glib-genmarshal
-           dbus-glib))       ; need dbus-binding-tool
+           `(,glib "bin")))       ; need glib-genmarshal and gdbus-codegen
     (propagated-inputs
      (list glib))                 ; required by tumbler-1.pc
     (inputs
-- 
2.46.0

[bug#74989] [PATCH 09/23] gnu: Add libxfce4windowing.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (libxfce4windowing): New package.

Change-Id: Ica871e0068e423fbc75f58f354cdd5f6e3b66900
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e86341fef9..e6499987e4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -410,6 +410,34 @@ (define-public tumbler
 management D-Bus specification.")
     (license gpl2+)))
 
+(define-public libxfce4windowing
+  (package
+    (name "libxfce4windowing")
+    (version "4.20.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/xfce/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0s4zjf7bwzski7zsmb7i5frd4xr8w7ng8gn8285b0vv0g4frpwjn"))))
+    (build-system gnu-build-system)
+    (native-inputs (list pkg-config xfce4-dev-tools))
+    (propagated-inputs (list gtk+))     ; required by libxfce4windowing-0.pc
+    (inputs (list libdisplay-info
+                  libwnck
+                  libxrandr
+                  wayland
+                  wayland-protocols))
+    (home-page "https://www.xfce.org/")
+    (synopsis "Windowing concept abstraction library for X11 and Wayland")
+    (description
+     "Libxfce4windowing is an abstraction library that attempts to present
+windowing concepts (screens, toplevel windows, workspaces, etc.) in a
+windowing-system-independent manner.")
+    (license lgpl2.1+)))
+
 (define-public xfce4-panel
   (package
     (name "xfce4-panel")
-- 
2.46.0

[bug#74989] [PATCH 10/23] gnu: xfce4-panel: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-panel): Update to 4.20.0.
[source]: Remove 'xfce4-panel-plugins.patch'.
[arguments]: Add 'patch-configure phase for 'gdbus-codegen'.
[inputs]: Remove gtk+-2.  Add gtk-layer-shell and libxfce4windowing.
[native-search-paths]: Replace 'X_XFCE4_LIB_DIRS' with 'XDG_DATA_DIRS'.
* gnu/packages/patches/xfce4-panel-plugins.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Remove it.

Change-Id: I8104a9a9e0fcd69b12ebc1346681f6f4bb29e17d
---
 gnu/local.mk                                  |   1 -
 .../patches/xfce4-panel-plugins.patch         | 115 ------------------
 gnu/packages/xfce.scm                         |  20 +--
 3 files changed, 13 insertions(+), 123 deletions(-)
 delete mode 100644 gnu/packages/patches/xfce4-panel-plugins.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index fbe9dfbb0e..4f052da781 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2366,7 +2366,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/xfig-Enable-error-message-for-missing-libraries.patch		\
   %D%/packages/patches/xfig-Fix-double-free-when-requesting-MediaBox.patch		\
   %D%/packages/patches/xfig-Use-pkg-config-to-set-fontconfig-CFLAGS-and-LIBS.patch	\
-  %D%/packages/patches/xfce4-panel-plugins.patch		\
   %D%/packages/patches/xfce4-settings-defaults.patch		\
   %D%/packages/patches/xgboost-use-system-dmlc-core.patch       \
   %D%/packages/patches/xmonad-dynamic-linking.patch		\
diff --git a/gnu/packages/patches/xfce4-panel-plugins.patch b/gnu/packages/patches/xfce4-panel-plugins.patch
deleted file mode 100644
index df5a0a914d..0000000000
--- a/gnu/packages/patches/xfce4-panel-plugins.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Search for xfce4 panel plugins in the directories specified
-in XDG_DATA_DIRS and X_XFCE4_LIB_DIRS.  For discussion of the
-relevant issues, see:
-
-  https://bugzilla.xfce.org/show_bug.cgi?id=5455
-
-Patch by Mark H Weaver <mhw@netris.org>
-
---- xfce4-panel-4.10.0/panel/panel-module.c.orig	2012-04-28 16:31:35.000000000 -0400
-+++ xfce4-panel-4.10.0/panel/panel-module.c	2014-12-14 01:31:55.728107386 -0500
-@@ -35,8 +35,14 @@
- #include <panel/panel-plugin-external-wrapper.h>
- #include <panel/panel-plugin-external-46.h>
- 
--#define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
--#define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins")
-+#define PANEL_PLUGINS_LIB_DIR_TAIL (G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
-+#define PANEL_PLUGINS_LIB_DIR_TAIL_OLD (G_DIR_SEPARATOR_S "panel-plugins")
-+
-+static const gchar *plugins_lib_dir_tails[] =
-+{
-+  PANEL_PLUGINS_LIB_DIR_TAIL,
-+  PANEL_PLUGINS_LIB_DIR_TAIL_OLD
-+};
- 
- 
- typedef enum _PanelModuleRunMode PanelModuleRunMode;
-@@ -335,21 +341,39 @@
-           /* show a messsage if the old module path key still exists */
-           g_message ("Plugin %s: The \"X-XFCE-Module-Path\" key is "
-                      "ignored in \"%s\", the panel will look for the "
--                     "module in %s. See bug #5455 why this decision was made",
--                     name, filename, PANEL_PLUGINS_LIB_DIR);
-+                     "module in DIR%s for each DIR in $X_XFCE4_LIB_DIRS "
-+                     "(%s by default).  See bug #5455 for discussion.",
-+                     name, filename, PANEL_PLUGINS_LIB_DIR_TAIL, LIBDIR);
-         }
- #endif
- 
--      path = g_module_build_path (PANEL_PLUGINS_LIB_DIR, module_name);
--      found = g_file_test (path, G_FILE_TEST_EXISTS);
-+      /* search for module */
-+      {
-+        gchar   *dirs_string;
-+        gchar  **dirs;
-+        int      i, j;
-+
-+        dirs_string = (gchar *) g_getenv ("X_XFCE4_LIB_DIRS");
-+        if (!dirs_string)
-+          dirs_string = LIBDIR;
-+        dirs = g_strsplit (dirs_string, G_SEARCHPATH_SEPARATOR_S, 0);
-+
-+        found = FALSE;
-+        path = NULL;
-+
-+        for (i = 0; !found && dirs[i] != NULL; i++)
-+          for (j = 0; !found && j < G_N_ELEMENTS (plugins_lib_dir_tails); j++)
-+            {
-+              gchar *dir = g_strconcat (dirs[i], plugins_lib_dir_tails[j], NULL);
-+
-+              g_free (path);
-+              path = g_module_build_path (dir, module_name);
-+              found = g_file_test (path, G_FILE_TEST_EXISTS);
-+              g_free (dir);
-+            }
- 
--      if (!found)
--        {
--          /* deprecated location for module plugin directories */
--          g_free (path);
--          path = g_module_build_path (PANEL_PLUGINS_LIB_DIR_OLD, module_name);
--          found = g_file_test (path, G_FILE_TEST_EXISTS);
--        }
-+        g_strfreev (dirs);
-+      }
- 
-       if (G_LIKELY (found))
-         {
---- xfce4-panel-4.10.0/panel/panel-module-factory.c.orig	2012-04-28 16:31:35.000000000 -0400
-+++ xfce4-panel-4.10.0/panel/panel-module-factory.c	2014-12-13 23:55:27.439404812 -0500
-@@ -42,6 +42,11 @@
- #define PANEL_PLUGINS_DATA_DIR     (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins")
- #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins")
- 
-+static const gchar *plugins_data_dir_tails[] =
-+{
-+  (G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins"),
-+  (G_DIR_SEPARATOR_S "xfce4" G_DIR_SEPARATOR_S "panel-plugins")
-+};
- 
- 
- static void     panel_module_factory_finalize        (GObject                  *object);
-@@ -223,8 +228,22 @@
- panel_module_factory_load_modules (PanelModuleFactory *factory,
-                                    gboolean            warn_if_known)
- {
-+  const gchar * const * system_data_dirs;
-+  int i, j;
-+
-   panel_return_if_fail (PANEL_IS_MODULE_FACTORY (factory));
- 
-+  system_data_dirs = g_get_system_data_dirs ();
-+  for (i = 0; system_data_dirs[i] != NULL; i++)
-+    for (j = 0; j < G_N_ELEMENTS (plugins_data_dir_tails); j++)
-+    {
-+      gchar *dir;
-+
-+      dir = g_strconcat (system_data_dirs[i], plugins_data_dir_tails[j], NULL);
-+      panel_module_factory_load_modules_dir (factory, dir, warn_if_known);
-+      g_free (dir);
-+    }
-+
-   /* load from the new and old location */
-   panel_module_factory_load_modules_dir (factory, PANEL_PLUGINS_DATA_DIR, warn_if_known);
-   panel_module_factory_load_modules_dir (factory, PANEL_PLUGINS_DATA_DIR_OLD, warn_if_known);
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e6499987e4..0315179ecb 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -441,7 +441,7 @@ (define-public libxfce4windowing
 (define-public xfce4-panel
   (package
     (name "xfce4-panel")
-    (version "4.18.6")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -449,12 +449,17 @@ (define-public xfce4-panel
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0qkw1msrvq7hc4mjg9iai0kymgkrpj1nijv04zjbdfcbymhp2cr1"))
-              (patches (search-patches "xfce4-panel-plugins.patch"))))
+                "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'patch-configure
+           (lambda _
+             (substitute* "configure"
+               ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+               (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                "type -p gdbus-codegen"))))
          (add-after 'unpack 'fix-tzdata-path
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* (string-append "plugins/clock/clock.c")
@@ -470,15 +475,16 @@ (define-public xfce4-panel
     (inputs
      (list tzdata ;; For fix-tzdata-path phase only.
            exo
-           gtk+-2
            xfconf
            garcon
+           gtk-layer-shell
            libwnck
-           libxfce4ui))
+           libxfce4ui
+           libxfce4windowing))
     (native-search-paths
      (list (search-path-specification
-            (variable "X_XFCE4_LIB_DIRS")
-            (files '("lib/xfce4")))))
+            (variable "XDG_DATA_DIRS")
+            (files '("share")))))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce desktop panel")
     (description
-- 
2.46.0

[bug#74989] [PATCH 11/23] gnu: xfdesktop: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfdesktop): Update to 4.20.0.
[arguments]: Add 'patch-configure phase.  Adjust 'prepare-background-image
phase.
[native-inputs]: Add glib:bin.
[inputs]: Add gtk-layer-shell, libxfce4windowing and libyaml.

Change-Id: Ic7f56f7d344b3bd40e0118f8890ece5a69a71e28
---
 gnu/packages/xfce.scm | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0315179ecb..4a502d75a4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -67,6 +67,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages search)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages version-control)
@@ -1020,7 +1021,7 @@ (define-public xfwm4-themes
 (define-public xfdesktop
   (package
     (name "xfdesktop")
-    (version "4.18.1")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -1028,7 +1029,7 @@ (define-public xfdesktop
                                   "xfdesktop-" version ".tar.bz2"))
               (sha256
                (base32
-                "0mpp9znpwkhp1h4cmpxhkhij1qgdr0fa6npzm4i7x1r51hcni4pg"))
+                "0cjnsrf7788vyq1mfcx4qypdhd9b2gqigj6yk6ffpwy7h2x42w12"))
               (modules '((guix build utils)))
               (snippet
                #~(begin
@@ -1038,6 +1039,18 @@ (define-public xfdesktop
     (build-system gnu-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'patch-configure
+                    (lambda _
+                      (substitute* "configure"
+                        ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+                        (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                         "type -p gdbus-codegen")
+                        (("\\$PKG_CONFIG --variable=glib_compile_resources gio-2.0")
+                         "type -p glib-compile-resources")
+                        (("\\$PKG_CONFIG --variable=glib_genmarshal glib-2.0")
+                         "type -p glib-genmarshal")
+                        (("\\$PKG_CONFIG --variable=glib_mkenums glib-2.0")
+                         "type -p glib-mkenums"))))
                   (add-before 'configure 'prepare-background-image
                     (lambda _
                       ;; Stick a Guix logo in the background image.  XXX: It
@@ -1051,23 +1064,26 @@ (define-public xfdesktop
                                           "/tmp/guix.png" image
                                           "/tmp/final.jpg")
                                   (copy-file "/tmp/final.jpg" image))
-                                '(;; "backgrounds/xfce-blue.jpg"
-                                  "backgrounds/xfce-stripes.png"
-                                  "backgrounds/xfce-teal.jpg"
-                                  "backgrounds/xfce-verticals.png"))
+                                '( ;; "backgrounds/xfce-blue.jpg"
+                                  "backgrounds/xfce-stripes.svg"
+                                  "backgrounds/xfce-teal.svg"
+                                  "backgrounds/xfce-verticals.svg"))
                       #t)))
 
        #:disallowed-references (,inkscape/stable ,imagemagick)))
     (native-inputs
-     (list pkg-config intltool
+     (list (list glib "bin") pkg-config intltool
            ;; For our own ‘prepare-background-image’ phase.
            inkscape/stable imagemagick))
     (inputs
      (list exo
            garcon
+           gtk-layer-shell
            libnotify
            libwnck
            libxfce4ui
+           libxfce4windowing
+           libyaml
            thunar))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce desktop manager")
-- 
2.46.0

[bug#74989] [PATCH 12/23] gnu: xfce4-session: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-session): Update to 4.20.0.
[source]: Adjust snippet.
[arguments]: Remove 'patch-xflock phase.  Add 'patch-configure phase.
Pass "--with-wayland-session-prefix" to configure.
[inputs]: Add gtk-layer-shell and libxfce4windowing.  Remove xset.

Change-Id: I0b33e30976ef44da5f505cd2cbd486fd025ec270
---
 gnu/packages/xfce.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 4a502d75a4..925ea17d71 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -687,11 +687,11 @@ (define-public xfce4-session
                                   "xfce4-session-" version ".tar.bz2"))
               (sha256
                (base32
-                "05k5w3n3hyb93a74f0qc6q0lky4vc51vdlsra8d8i2rkqxs5174s"))
+                "11agss7x749i4wnw82czv0b053mhqn34hwi8rihj6sgfwqzj6aaj"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-                  (substitute* "xfsm-shutdown-helper/main.c"
+                  (substitute* "libxfsm/xfsm-shutdown-common.h"
                     (("/sbin/shutdown -h now")  "halt")
                     (("/sbin/shutdown -r now")  "restart")
                     (("/usr/sbin/pm-suspend")   "pm-suspend")
@@ -700,27 +700,30 @@ (define-public xfce4-session
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
-       (list (string-append "--with-xsession-prefix=" %output))
+       (list (string-append "--with-xsession-prefix=" %output)
+             (string-append "--with-wayland-session-prefix=" %output))
        ;; Disable icon cache update.
        #:make-flags
        '("gtk_update_icon_cache=true")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-xflock
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xset (assoc-ref inputs "xset")))
-               (substitute* "scripts/xflock4"
-                 (("xset") (string-append xset "/bin/xset")))))))))
+         (add-before 'configure 'patch-configure
+           (lambda _
+             (substitute* "configure"
+               ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+               (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                "type -p gdbus-codegen")))))))
     (native-inputs
-     (list pkg-config intltool))
+     (list (list glib "bin") pkg-config intltool))
     (inputs
      (list iceauth
+           gtk-layer-shell
            upower
            polkit
            libsm
            libwnck
            libxfce4ui
-           xset))
+           libxfce4windowing))
     (home-page "https://www.xfce.org/")
     (synopsis "Xfce session manager")
     (description
-- 
2.46.0

[bug#74989] [PATCH 13/23] gnu: xfce4-settings: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/patches/xfce4-settings-defaults.patch: Adjust patch.
* gnu/packages/xfce.scm (xfce4-settings): Update to 4.20.0.
[arguments]: Use G-Expressions.  Add 'patch-configure phase.
[inputs]: Add gtk-layer-shell.
[native-inputs]: Add glib:bin.

Change-Id: I114e9605dafec5f3ab2b09618cfacd071464e5f7
---
 .../patches/xfce4-settings-defaults.patch     | 14 +++++------
 gnu/packages/xfce.scm                         | 24 +++++++++++++------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/patches/xfce4-settings-defaults.patch b/gnu/packages/patches/xfce4-settings-defaults.patch
index ce5865c481..63976f4334 100644
--- a/gnu/packages/patches/xfce4-settings-defaults.patch
+++ b/gnu/packages/patches/xfce4-settings-defaults.patch
@@ -1,16 +1,14 @@
 This patch make Xfce use "elementary-xfce-dark" as the default icon theme, "Greybird" as
 the default GTK theme and enable font antialias.
 
-
-diff -upr xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml xfce4-settings-4.18.2/xfsettingsd/xsettings.xml
---- xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml	2023-02-11 16:55:53.000000000 +0800
-+++ xfce4-settings-4.18.2/xfsettingsd/xsettings.xml	2023-05-14 19:20:43.919701586 +0800
+--- xfce4-settings-4.20.0/xfsettingsd/xsettings.xml.orig	2024-12-20 09:53:09.518493612 +0800
++++ xfce4-settings-4.20.0/xfsettingsd/xsettings.xml	2024-12-20 09:55:15.506496473 +0800
 @@ -6,8 +6,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="ThemeName" type="string" value="Greybird"/>
 +    <property name="IconThemeName" type="string" value="elementary-xfce-dark"/>
      <property name="DoubleClickTime" type="int" value="400"/>
@@ -19,12 +17,12 @@ diff -upr xfce4-settings-4.18.2.orig/xfsettingsd/xsettings.xml xfce4-settings-4.
 @@ -19,9 +19,9 @@
    </property>
    <property name="Xft" type="empty">
-     <property name="DPI" type="empty"/>
+     <property name="DPI" type="int" value="-1"/>
 -    <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>
+   <property name="Gtk" type="empty">
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 925ea17d71..5fa84b4063 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -734,7 +734,7 @@ (define-public xfce4-session
 (define-public xfce4-settings
   (package
     (name "xfce4-settings")
-    (version "4.18.6")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -742,20 +742,30 @@ (define-public xfce4-settings
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1zkvcsgx3bnk8gwcgwg7656pw5p9a4xl1fv4divddv96c0dhbafr"))
+                "1ag5pimprxc12zgdbs27vngin97fc6l9ig7xzc0naacs8aiqsm13"))
               (patches (search-patches "xfce4-settings-defaults.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--enable-pluggable-dialogs"
-                           "--enable-sound-settings"
-                           "--enable-upower-glib"
-                           "--enable-xrandr")))
+     (list #:configure-flags
+           #~(list "--enable-pluggable-dialogs"
+                   "--enable-sound-settings"
+                   "--enable-upower-glib"
+                   "--enable-xrandr")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'patch-configure
+                 (lambda _
+                   (substitute* "configure"
+                     ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+                     (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                      "type -p gdbus-codegen")))))))
     (native-inputs
-     (list pkg-config intltool))
+     (list (list glib "bin") pkg-config intltool))
     (inputs
      (list colord
            exo
            garcon
+           gtk-layer-shell
            libnotify
            libxcursor
            libxi
-- 
2.46.0

[bug#74989] [PATCH 14/23] gnu: xfce4-power-manager: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.20.0.
[arguments]: Add 'patch-configure phase.
[native-inputs]: Add glib:bin.

Change-Id: I094a7ae49dab6f8a8f380d033766eccff2142807
---
 gnu/packages/xfce.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5fa84b4063..bcb5334d04 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1348,7 +1348,7 @@ (define-public xfce
 (define-public xfce4-power-manager
   (package
     (name "xfce4-power-manager")
-    (version "4.18.4")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -1356,10 +1356,19 @@ (define-public xfce4-power-manager
                                   "xfce4-power-manager-" version ".tar.bz2"))
               (sha256
                (base32
-                "0x6qychcgqxc5dwwxzypqw2da35y6cd25ngg42zxndnrvixqz4bn"))))
+                "0agdsq2d4kr9aw7nqj1x5cgpxqcjffajipwjvlxq6likyv7924wp"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'configure 'patch-configure
+                 (lambda _
+                   (substitute* "configure"
+                     ;; XDG_CHECK_PACKAGE_BINARY requires an absolute path.
+                     (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                      "type -p gdbus-codegen")))))))
     (native-inputs
-     (list pkg-config intltool))
+     (list (list glib "bin") pkg-config intltool))
     (inputs
      (list libxrandr gtk+ upower libnotify libxfce4ui))
     (home-page "https://www.xfce.org/")
-- 
2.46.0

[bug#74989] [PATCH 15/23] gnu: xfce4-pulseaudio-plugin: Update to 0.4.9.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.9.

Change-Id: I16d3c40c07a9d7c2c2a3ad4bdf1a044c78617b1a
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bcb5334d04..5f95fe252d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -548,7 +548,7 @@ (define-public xfce4-clipman-plugin
 (define-public xfce4-pulseaudio-plugin
   (package
     (name "xfce4-pulseaudio-plugin")
-    (version "0.4.8")
+    (version "0.4.9")
     (source
      (origin
        (method url-fetch)
@@ -557,7 +557,7 @@ (define-public xfce4-pulseaudio-plugin
                            (version-major+minor version) "/"
                            "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
        (sha256
-        (base32 "0j037wnx0z22nw11mq0y3cnq1srr52zckjap3klj3hirghh2nx5x"))))
+        (base32 "16n9vnzwi1j90yxcf4c0lkyqkl969yj6hiby3cvd0j18zcapd050"))))
     (build-system gnu-build-system)
     (native-inputs
      (list intltool pkg-config dbus-glib dbus))
-- 
2.46.0

[bug#74989] [PATCH 16/23] gnu: xfce4-appfinder: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.20.0.

Change-Id: Ic78aaf9f7c1c1df22dec137281c3af79c57142a1
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5f95fe252d..c3e02259d9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -654,7 +654,7 @@ (define-public xfce4-xkb-plugin
 (define-public xfce4-appfinder
   (package
     (name "xfce4-appfinder")
-    (version "4.18.1")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -663,7 +663,7 @@ (define-public xfce4-appfinder
                                   "/" name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "1yck11y86d45yxsppd1yqk894k3cf5vh91a5sm559gl175jylm4q"))))
+                "013kkspy9gma5yzzwvwqm9452i6z67zc4f2lnifjhgn8gpvq5jl2"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool))
-- 
2.46.0

[bug#74989] [PATCH 17/23] gnu: xfce4-session: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-session): Update to 4.20.0.

Change-Id: Ie276c343e49f7d4d2ab6ac891fda00070d73a8ad
---
 gnu/packages/xfce.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c3e02259d9..86d6aa9860 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -679,7 +679,7 @@ (define-public xfce4-appfinder
 (define-public xfce4-session
   (package
     (name "xfce4-session")
-    (version "4.18.4")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
-- 
2.46.0

[bug#74989] [PATCH 18/23] gnu: thunar: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (thunar): Update to 4.20.0.

Change-Id: Iff3ea1e93fc9e23a087582e236eb95951cd644b3
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 86d6aa9860..2faacb8599 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -789,7 +789,7 @@ (define-public xfce4-settings
 (define-public thunar
   (package
     (name "thunar")
-    (version "4.18.11")                           ;stable version = even minor
+    (version "4.20.0")                           ;stable version = even minor
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -797,7 +797,7 @@ (define-public thunar
                                   "thunar-" version ".tar.bz2"))
               (sha256
                (base32
-                "04nnfnm1913vva3d8515l3vs99q61rhbafj0gl9qqmka0zidl2vx"))))
+                "1c28fnhx8zah6gcq607p8hicar72i6nsydfan593gkxfydv1lwr7"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:configure-flags '("--with-custom-thunarx-dirs-enabled")))
-- 
2.46.0

[bug#74989] [PATCH 19/23] gnu: thunar-volman: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (thunar-volman): Update to 4.20.0.

Change-Id: I3f37bc6c37f1fce8fea3636eaa6c7831466c4ebd
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2faacb8599..d7210849b5 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -828,7 +828,7 @@ (define-public thunar
 (define-public thunar-volman
   (package
     (name "thunar-volman")
-    (version "4.18.0")
+    (version "4.20.0")
     (source
      (origin
        (method url-fetch)
@@ -836,7 +836,7 @@ (define-public thunar-volman
                            (version-major+minor version) "/"
                            "thunar-volman-" version ".tar.bz2"))
        (sha256
-        (base32 "0rgwhxp6f3cd4ldl6zirvzl4n64f2k65lach84gs4ip2zdzmrdwk"))))
+        (base32 "1nmi3q9jfc4p3dznw96m4ryk8h136qp5bvfipy7mnlcvjm9dinmh"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool))
-- 
2.46.0

[bug#74989] [PATCH 20/23] gnu: xfwm4: Update to 4.20.0.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfwm4): Update to 4.20.0.

Change-Id: Ic6acaae40ecd1d3c90a84c99e8a5336e21e27e7c
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d7210849b5..5817fde3eb 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -984,7 +984,7 @@ (define-public thunarx-python
 (define-public xfwm4
   (package
     (name "xfwm4")
-    (version "4.18.0")
+    (version "4.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/xfce/"
@@ -992,7 +992,7 @@ (define-public xfwm4
                                   "xfwm4-" version ".tar.bz2"))
               (sha256
                (base32
-                "0gy1bxp9va6hz9vrysvh3sffg5ld4dn77in10syb8p5jkf41pkcj"))))
+                "01ng1lcr0a45w1jm3vwsfwk5kfy8jfz3c1ng3n6hvalpjgj672x5"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config intltool))
-- 
2.46.0

[bug#74989] [PATCH 21/23] gnu: xfce4-dict: Update to 0.8.8.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-dict): Update to 0.8.8.

Change-Id: I2d0bc7088533e8cc46fb81701ba37f09ba76c0a5
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5817fde3eb..35d898e701 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1213,7 +1213,7 @@ (define-public xfce4-terminal
 (define-public xfce4-dict
   (package
     (name "xfce4-dict")
-    (version "0.8.6")
+    (version "0.8.8")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
@@ -1221,7 +1221,7 @@ (define-public xfce4-dict
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0h8adjgb7126hafik7r1k9wr3g6d835ggsh8zj9k4k9mf35bfpdf"))))
+                "05p9xbjzhqg2a13c9vsva854kpqjvzj4xjaj98bjrn3ns9wv030d"))))
     (build-system gnu-build-system)
     (native-inputs
      (list intltool pkg-config))
-- 
2.46.0

[bug#74989] [PATCH 22/23] gnu: mousepad: Update to 0.6.3.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (mousepad): Update to 0.6.3.
[inputs]: Remove gtk+; add gspell and libxfce4ui.

Change-Id: Id19145a649fef4c1aab7b306afeaab12c3960180
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 35d898e701..f637ceab21 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1551,7 +1551,7 @@ (define-public xfburn
 (define-public mousepad
   (package
     (name "mousepad")
-    (version "0.6.2")
+    (version "0.6.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/apps/mousepad/"
@@ -1559,7 +1559,7 @@ (define-public mousepad
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "17fi33mkdz1nfmsgqlfa20l06wwy0s8lcj21cfg6ikdiihxwpjp7"))))
+                "1f99p6f0pw17xs87cph0n07a5yz4zhnsrhl2kjmi907ihp0n5w9g"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '(;; Use the GSettings keyfile backend rather than
@@ -1580,7 +1580,7 @@ (define-public mousepad
            `(,glib "bin") ; for glib-compile-schemas.
            pkg-config))
     (inputs
-     (list bash-minimal gtk+ gtksourceview-4 xfconf))
+     (list bash-minimal gspell gtksourceview-4 libxfce4ui xfconf))
     (home-page "https://git.xfce.org/apps/mousepad/")
     (synopsis "Simple text editor for Xfce")
     (description
-- 
2.46.0

[bug#74989] [PATCH 23/23] gnu: xfce4-weather-plugin: Update to 0.11.3.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/xfce.scm (xfce4-weather-plugin): Update to 0.11.3.

Change-Id: Icd93cd9b981d552b40412b14a53cb845e9f5081f
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f637ceab21..0c03b08f80 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2283,7 +2283,7 @@ (define-public xfce4-wavelan-plugin
 (define-public xfce4-weather-plugin
   (package
    (name "xfce4-weather-plugin")
-   (version "0.11.2")
+   (version "0.11.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
@@ -2292,7 +2292,7 @@ (define-public xfce4-weather-plugin
                                   "/xfce4-weather-plugin-" version ".tar.bz2"))
               (sha256
                (base32
-                "0sw7p8xsgyc7b5w92abigqz9mii79w2vdlprm5c0hmb3g3zhmm35"))))
+                "0mywq00xs0rvdp3kd7kmcv2brpzixz65ijzk2ahg7lh677k1yb80"))))
     (build-system gnu-build-system)
     (native-inputs
      (list intltool pkg-config))
-- 
2.46.0