[PATCH v0 00/15] XFCE: Move source from generated archive to git.

Done

Details

3 participants

Ashvith Shetty
???
Zheng Junjie

Owner: unassigned

Submitted by: Ashvith Shetty

Severity: normal

Ashvith Shetty wrote 6 days ago

Recipients:(address . guix-patches@gnu.org)(name . Ashvith Shetty)(address . ashvith@noreply.codeberg.org)

Message-ID:20241227194602.25785-1-ashvith@noreply.codeberg.org

This patch series moves the source for XFCE applications and plugins 
from the pre-generated archive file to their git source for quality 
reasons (inconsistency between git and archive builds, 
missing files in generated archive, etc).

This patch series also removes gtk-xfce-engine, a long-abandoned package,
which had no dependant packages. Patch series also includes some applications 
and plugins updated to their newer versions.

Ashvith Shetty (15):
  gnu: gtk-xfce-engine: Remove variable.
  gnu: xfce4-dev-tools: Update variable fields.
  gnu: libxfce4util: Update variable fields.
  gnu: xfconf: Update variable fields.
  gnu: libxfce4ui: Update variable fields.
  gnu: libxfce4windowing: Update variable fields.
  gnu: catfish: Update to 4.20.0.
  gnu: elementary-xfce-icon-theme: Use new style.
  gnu: exo: Update variable fields.
  gnu: garcon: Update variable fields.
  gnu: tumbler: Update variable fields.
  gnu: xfce4-panel: Update variable fields.
  gnu: xfce4-battery-plugin: Update to 1.1.6.
  gnu: xfce4-clipman-plugin: Update to 1.6.7.
  gnu: xfce4-pulseaudio-plugin: Update variable fields.

 gnu/packages/xfce.scm | 735 +++++++++++++++++++++++-------------------
 1 file changed, 401 insertions(+), 334 deletions(-)

-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 01/15] gnu: gtk-xfce-engine: Remove variable.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195116.26953-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (gtk-xfce-engine): Upstream archived this

project and it is not used by any other packages.

Change-Id: I65a7ed0e0cc597df7fa02c9e0471a90865de9085

---

gnu/packages/xfce.scm | 23 +----------------------

1 file changed, 1 insertion(+), 22 deletions(-)

Toggle diff (43 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a36612dd3a..35abb08c5f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 André A. Gomes <andremegafone@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -88,28 +89,6 @@ (define-module (gnu packages xfce)
   #:use-module (guix packages)
   #:use-module (guix utils))
 
-(define-public gtk-xfce-engine
-  (package
-    (name "gtk-xfce-engine")
-    (version "2.10.1")
-    (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
-                "0g86ywkx0ghzhhn96k88p67bbzlm1aqckly85izp07w80l1934ja"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
-    (inputs (list gtk+-2))
-    (home-page "https://www.xfce.org/")
-    (synopsis "GTK+ theme engine for Xfce")
-    (description
-     "Default GTK+ engine and themes for Xfce Desktop Environment.")
-    (license gpl2+)))
-
 (define-public libxfce4util
   (package
     (name "libxfce4util")
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 02/15] gnu: xfce4-dev-tools: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195143.27045-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-dev-tools):

[source]: Update to XFCE's GitLab URL.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl and libtool.

Change-Id: Ib94dc5750888de8674409363131e89944ad1e7d1

---

gnu/packages/xfce.scm | 39 +++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 35abb08c5f..de6d0935a0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -37,11 +37,13 @@ (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
+  #:use-module (gnu packages autotools)
   #: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 docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -2289,23 +2291,28 @@ (define-public xfce4-dev-tools
   (package
     (name "xfce4-dev-tools")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-dev-tools/" (version-major+minor version) "/"
-                                  "xfce4-dev-tools-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1ak68k6r0q6dh3knc3vxqvkvkw54f916wfrsm8g7gk0fiah3kfhz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-dev-tools")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k7qj7vka2ys1ld4bfkdvsbxhpjnvb8lc0awnn5b1c34zxmwsivr"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list meson
-           pkg-config
-           libxslt))
-    (inputs
-     (list glib python))
-    (propagated-inputs
-     (list `(,glib "bin")))    ; 'glib-genmarshal' required by 'xdt-depends.m4'
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         libtool
+                         libxslt
+                         meson
+                         pkg-config))
+    (inputs (list glib python))
+    (propagated-inputs (list (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

Ashvith Shetty wrote 6 days ago

[PATCH v0 03/15] gnu: libxfce4util: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195205.27176-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (libxfce4util):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: I3acb4b9237f26e50702c28139f68a7a2082ab60b

---

gnu/packages/xfce.scm | 35 +++++++++++++++++++++++------------

1 file changed, 23 insertions(+), 12 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index de6d0935a0..e3a746dee9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -95,19 +95,30 @@ (define-public libxfce4util
   (package
     (name "libxfce4util")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "libxfce4util/" (version-major+minor version)
-                                  "/" name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "14mml8rdj16gkax92h89vcgf6sphp7v3jf5r7n1858lmk6f3yj91"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0r24hx200jvixn8rhcg0cbvv6b3jc4hj1iw2bkvmrcf74m4ck9nj"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config gobject-introspection intltool vala))
-    (propagated-inputs (list glib)) ; required by libxfce4util-1.0.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         vala
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by libxfce4util-1.0.pc
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Basic utility library for Xfce")
     (description
      "A general-purpose utility library with core application support for the
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 04/15] gnu: xfconf: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195219.27224-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfconf):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Undo delete of phase 'check.

Replace 'custom-check with 'check.

[native-inputs]: Add autoconf, automake, gtk-doc, libtool,

and xfce4-dev-tools.

Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf

---

gnu/packages/xfce.scm | 84 +++++++++++++++++++++----------------------

1 file changed, 42 insertions(+), 42 deletions(-)

Toggle diff (102 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e3a746dee9..a60f4515b1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -129,53 +129,53 @@ (define-public xfconf
   (package
     (name "xfconf")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfconf/" (version-major+minor version) "/"
-                                  "xfconf-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfconf")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k4d2gg77p3jdr0rankz2mv50hy7ddf5xl32si1mdby1wvpa9r2k"))))
     (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 _
-             (substitute* "tests/Makefile.in"
-               (("tests-end") ""))))
-         (add-after 'install 'custom-check
-           (lambda _
-             (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
-             ;; Run test-suite under a dbus session.
-             (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
-                     (string-append %output "/share"))
-             ;; For the missing '/etc/machine-id'.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             (invoke "dbus-launch" "make" "check")))
-         (delete 'check))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin") ;; for gdbus-codegen
-           gobject-introspection
-           vala
-           dbus))
+     (list
+      #: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"))))
+          (replace 'check
+            (lambda _
+              (setenv "HOME"
+                      (getenv "TMPDIR")) ;xfconfd requires a writable HOME
+              ;; Run test-suite under a dbus session.
+              (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
+                      (string-append %output "/share"))
+              ;; For the missing '/etc/machine-id'.
+              (setenv "DBUS_FATAL_WARNINGS" "0")
+              (invoke "dbus-launch" "make" "check"))))))
+    (native-inputs (list autoconf
+                         automake
+                         dbus
+                         (list glib "bin") ;for gdbus-codegen
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         vala
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      (list glib))
-    (inputs
-     (list libxfce4util))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4util))
+    (home-page "https://docs.xfce.org/xfce/xfconf/")
     (synopsis "Configuration storage and query system for Xfce")
     (description
      "Settings daemon for Xfce, implemented as a D-Bus-based configuration
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 05/15] gnu: libxfce4ui: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195233.27310-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (libxfce4ui):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: I9ca360cec30660b85cea95b494df9dae1767f3ab

---

gnu/packages/xfce.scm | 43 +++++++++++++++++++++++++------------------

1 file changed, 25 insertions(+), 18 deletions(-)

Toggle diff (59 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a60f4515b1..8587d2d8c1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -186,27 +186,34 @@ (define-public libxfce4ui
   (package
     (name "libxfce4ui")
     (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
-                "1vpafvmn2x95n0d8dmr6pp81w8bw2ksicp6dvsm7a0zjhilrks3m"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4ui")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ps8sq8g43dx12qp0shrdb45bjrfhhgkziscj5jnrzfhy6j9mqrk"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--with-vendor-info=GNU Guix")))
-    (native-inputs
-     (list pkg-config intltool gobject-introspection))
-    (propagated-inputs
-     (list gtk+    ; required by libxfce4ui-2.pc
-           ;; libxfce4kbd-private-3.pc refers to all these.
-           libxfce4util
-           xfconf))
+     `(#:configure-flags (list "--with-vendor-info=GNU Guix"
+                               "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gobject-introspection
+                         gtk-doc
+                         libtool
+                         intltool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list
+                        ;; required by libxfce4ui-2.pc
+                        gtk+
+                        ;; libxfce4kbd-private-3.pc refers to all these.
+                        libxfce4util xfconf))
     (inputs (list libgtop libice libsm startup-notification))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Widgets library for Xfce")
     (description
      "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 06/15] gnu: libxfce4windowing: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195249.27358-1-ashvith@noreply.codeberg.org

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

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[inputs]: Add wlr-protocols.

[native-inputs]: Add autoconf, automake, gtk-doc, intltool

libtool and xfce4-dev-tools.

Change-Id: I995433864b2de45cabcafd541ef39af4c6aab320

---

gnu/packages/xfce.scm | 38 ++++++++++++++++++++++----------------

1 file changed, 22 insertions(+), 16 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8587d2d8c1..152da5c12d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -414,23 +414,29 @@ (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"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4windowing")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "158jhw5kq3dzmgmy9wr9fgspwcdq84r6hjfnvbn48wx9d2q9pwdp"))))
     (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/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+)) ;required by libxfce4windowing-0.pc
+    (inputs (list libdisplay-info libwnck libxrandr wayland wayland-protocols wlr-protocols))
+    (home-page "https://docs.xfce.org/xfce/libxfce4windowing/")
     (synopsis "Windowing concept abstraction library for X11 and Wayland")
     (description
      "Libxfce4windowing is an abstraction library that attempts to present
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 07/15] gnu: catfish: Update to 4.20.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195320.27450-1-ashvith@noreply.codeberg.org

From: Ashvith Shetty <Ashvith@noreply.codeberg.org>

* gnu/packages/xfce.scm (catfish): Update to 4.20.0.
[source]: Update to XFCE's GitLab URL.
[home-page]: Set to docs.xfce.org.
[build-system]: Switch to meson-build-system
[arguments]: Enable tests
Do not replace phase 'install.
Do not delete 'sanity-check.
[native-inputs]: Add cmake, desktop-file-utils, (list gtk+ "bin")
and python.
Remove python-distutils-extra.

Change-Id: Ifc922b45308718b1a5586c15a0025f3e6d20ea4b
---
 gnu/packages/xfce.scm | 88 +++++++++++++++++++++----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

Toggle diff (116 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 152da5c12d..22557bd241 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
@@ -82,7 +83,7 @@ (define-module (gnu packages xfce)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -223,50 +224,49 @@ (define-public libxfce4ui
 (define-public catfish
   (package
     (name "catfish")
-    (version "4.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "catfish/" (version-major+minor version)
-                                  "/catfish-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx"))))
-    (build-system python-build-system)
+    (version "4.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/apps/catfish")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-command-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "catfish/CatfishSearchEngine.py"
-               (("'which'") (string-append "'" (which "which") "'")))
-             (substitute* "catfish/CatfishWindow.py"
-               (("xdg-mime") (which "xdg-mime"))
-               (("xdg-open") (which "xdg-open")))))
-         ;; setup.py script does not support one of the Python build
-         ;; system's default flags, "--single-version-externally-managed".
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "python" "setup.py" "install"
-                     (string-append "--prefix=" (assoc-ref outputs "out"))
-                     "--root=/")))
-         ;; The check failed to spawn a message bus without /etc/machine-id.
-         (delete 'sanity-check)
-         (add-after 'install 'wrap-program
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/bin/catfish")
-                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
-                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config python-distutils-extra intltool))
-    (inputs
-     (list bash-minimal which xfconf xdg-utils))
-    (propagated-inputs
-     (list gtk+ python-dbus python-pexpect python-pycairo
-           python-pygobject))
-    (home-page "https://docs.xfce.org/apps/catfish/start")
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-command-paths
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "catfish/CatfishSearchEngine.py"
+                         (("'which'")
+                          (string-append "'"
+                                         (which "which") "'")))
+                       (substitute* "catfish/CatfishWindow.py"
+                         (("xdg-mime")
+                          (which "xdg-mime"))
+                         (("xdg-open")
+                          (which "xdg-open")))))
+                   (add-after 'install 'wrap-program
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out")))
+                         (wrap-program (string-append out "/bin/catfish")
+                           `("GUIX_PYTHONPATH" =
+                             (,(getenv "GUIX_PYTHONPATH")))
+                           `("GI_TYPELIB_PATH" =
+                             (,(getenv "GI_TYPELIB_PATH"))))))))))
+    (native-inputs (list cmake
+                         desktop-file-utils
+                         (list gtk+ "bin")
+                         pkg-config
+                         python
+                         intltool))
+    (inputs (list bash-minimal which xfconf xdg-utils))
+    (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo
+                             python-pygobject))
+    (home-page "https://docs.xfce.org/apps/catfish/")
     (synopsis "File searching tool for Xfce")
     (description
      "Catfish is a file searching tool for Linux and Unix.  The interface is
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 08/15] gnu: elementary-xfce-icon-theme: Use new style.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195334.27497-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (elementary-xfce-icon-theme): Use new style.

Change-Id: I70ad49c16c30d519c0745462e33c86ad459c5b1b

---

gnu/packages/xfce.scm | 41 ++++++++++++++++++++---------------------

1 file changed, 20 insertions(+), 21 deletions(-)

Toggle diff (58 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 22557bd241..114f23ccc4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -278,31 +278,30 @@ (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
     (version "0.20")
-    (source (origin
-              (method git-fetch)
-              (uri
-               (git-reference
-                (url "https://github.com/shimmerproject/elementary-xfce")
-                (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shimmerproject/elementary-xfce")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no check target
-       #:make-flags '("CC=gcc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t)))))
-    (native-inputs
-     (list gtk+ optipng pkg-config))
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list "CC=gcc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'make-git-checkout-writable
+                     (lambda _
+                       (for-each make-file-writable
+                                 (find-files ".")) #t)))))
+    (native-inputs (list gtk+ optipng pkg-config))
     (home-page "https://shimmerproject.org/")
     (synopsis "Elementary icons extended and maintained for Xfce")
-    (description "This is a fork of the upstream elementary project.  This icon
+    (description
+     "This is a fork of the upstream elementary project. This icon
 theme is supposed to keep everything working for Xfce, but gets updates from
 upstream occasionally.")
     (license gpl2+)))
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 09/15] gnu: exo: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195348.27543-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (exo):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl,

(list glib "bin"), gtk-doc, libtool, libxslt and

xfce4-dev-tools.

Change-Id: Ic32658dfba670e44916d63e186fc61f0e73f3124

---

gnu/packages/xfce.scm | 37 ++++++++++++++++++++++++-------------

1 file changed, 24 insertions(+), 13 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 114f23ccc4..dd09923739 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -310,23 +310,34 @@ (define-public exo
   (package
     (name "exo")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "exo/" (version-major+minor version) "/"
-                                  "exo-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1387xib59z9m43z772lz3kwjrcd6id9zs5yr3khgs7jz4jczfxs2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/exo")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zbj5q0ih5kvxvays4ajjsmxm2938jmn4648062agxxjl8asqlcs"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         (list glib "bin")
+                         gtk-doc
+                         intltool
+                         libtool
+                         libxslt
+                         pkg-config
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; exo-2.pc refers to all these.
      (list gtk+ libxfce4util))
-    (inputs
-     (list libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4ui))
+    (home-page "https://docs.xfce.org/xfce/exo/")
     (synopsis "Extension library for Xfce")
     (description
      "An extension library to Xfce.  While Xfce comes with quite a few libraries
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 10/15] gnu: garcon: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195400.27632-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (garcon):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl, gtk-doc,

libtool, libxslt and xfce4-dev-tools.

Change-Id: Ic0175d67858c0a1d43174c77079bab8ebfa5d489

---

gnu/packages/xfce.scm | 40 ++++++++++++++++++++++++++--------------

1 file changed, 26 insertions(+), 14 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index dd09923739..c9ea04e91e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -350,21 +350,33 @@ (define-public garcon
   (package
     (name "garcon")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "garcon/" (version-major+minor version) "/"
-                                  "garcon-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "13ysx9gl22a5rjzl4m3v0zm3hpii1jy38b5lz3fs971h29y53f3z"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/garcon")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "076pdyssl5lhm88s2xx94w3rk6glcc4kgfl3jqd6704hpl6n9rii"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list `(,glib "bin") gobject-introspection intltool pkg-config))
-    (propagated-inputs
-     (list gtk+ ; required by garcon-gtk3-1.pc
-           libxfce4ui))     ; required by garcon-gtk3-1.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         `(,glib "bin")
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         libxslt
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by garcon-gtk3-1.pc
+                             libxfce4ui)) ;required by garcon-gtk3-1.pc
+    (home-page "https://docs.xfce.org/xfce/garcon/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
      "Garcon is a freedesktop.org compliant menu implementation based on
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 11/15] gnu: tumbler: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195411.27679-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (tumbler):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool,

and xfce4-dev-tools.

Change-Id: I993fda97eeea44c529cc04359f2e2ab36068962c

---

gnu/packages/xfce.scm | 73 +++++++++++++++++++++++--------------------

1 file changed, 39 insertions(+), 34 deletions(-)

Toggle diff (88 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c9ea04e91e..eecc855648 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -389,42 +389,47 @@ (define-public tumbler
   (package
     (name "tumbler")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "tumbler/" (version-major+minor version) "/"
-                                  "tumbler-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "102qwa8an7wdqf0hrqd5k51aiib3zww0iizsigllfrcjamyn9cbl"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/tumbler")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18bp1ckv6mzbxhbk7aqp2mxbni1pw8hv8rzxmc9xx488dxs0qq8s"))))
     (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 and gdbus-codegen
-    (propagated-inputs
-     (list glib))                 ; required by tumbler-1.pc
-    (inputs
-     (list dbus
-           gdk-pixbuf
-           cairo ;; Needed for pdf thumbnails (poppler-glibc.pc)
-           freetype
-           libjpeg-turbo
-           libgsf
-           libxfce4util
-           poppler
-           ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
-           ;; ("gstreamer" ,gstreamer)
-           ))
-    (home-page "https://www.xfce.org/")
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'configure 'patch-configure
+                     (lambda _
+                       (substitute* "configure"
+                         (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                          "type -p gdbus-codegen")))))))
+    (native-inputs (list autoconf
+                         automake
+                         dbus-glib
+                         (list glib "bin") ;need glib-genmarshal
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by tumbler-1.pc
+    (inputs (list dbus
+                  gdk-pixbuf
+                  cairo ;Needed for pdf thumbnails (poppler-glibc.pc)
+                  freetype
+                  libjpeg-turbo
+                  libgsf
+                  libxfce4util
+                  poppler
+                  ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+                  ;; ("gstreamer" ,gstreamer)
+                  ))
+    (home-page "https://docs.xfce.org/xfce/tumbler/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
      "Tumbler is a D-Bus service for applications to request thumbnails for
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 12/15] gnu: xfce4-panel: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195421.27729-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-panel):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: Ic5b4a82b1d14e24b11efac7f655ddb8f43a0b9da

---

gnu/packages/xfce.scm | 80 +++++++++++++++++++++++--------------------

1 file changed, 42 insertions(+), 38 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index eecc855648..c457d9d065 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -475,50 +475,54 @@ (define-public xfce4-panel
   (package
     (name "xfce4-panel")
     (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
-                "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-panel")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "049dhis9106zig5awr9ppnxm357d93z842h015pd8rni9sayc7m0"))))
     (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")
-               (("/usr/share/zoneinfo")
-                (search-input-directory inputs "share/zoneinfo"))))))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin")))
-    (propagated-inputs
-     (list gtk+ ; required by libxfce4panel-2.0.pc
-           libxfce4util)) ; required by libxfce4panel-2.0.pc
-    (inputs
-     (list tzdata ;; For fix-tzdata-path phase only.
-           exo
-           xfconf
-           garcon
-           gtk-layer-shell
-           libwnck
-           libxfce4ui
-           libxfce4windowing))
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")
+      #: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")
+                         (("/usr/share/zoneinfo")
+                          (search-input-directory inputs "share/zoneinfo"))))))))
+    (native-inputs (list autoconf
+                         automake
+                         (list glib "bin")
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by libxfce4panel-2.0.pc
+                             libxfce4util)) ;required by libxfce4panel-2.0.pc
+    (inputs (list tzdata ;For fix-tzdata-path phase only.
+                  exo
+                  xfconf
+                  garcon
+                  gtk-layer-shell
+                  libwnck
+                  libxfce4ui
+                  libxfce4windowing))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DATA_DIRS")
             (files '("share")))))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-panel/")
     (synopsis "Xfce desktop panel")
     (description
      "Desktop panel for Xfce, which contains program launchers, window buttons,
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 13/15] gnu: xfce4-battery-plugin: Update to 1.1.6.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195433.27780-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.6.

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Change-Id: I9359731b564a225450cf314b762d51564cce370e

---

gnu/packages/xfce.scm | 33 +++++++++++++++++++++------------

1 file changed, 21 insertions(+), 12 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c457d9d065..0cff15566e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -533,20 +533,29 @@ (define-public xfce4-panel
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "04z2bic6c2cgl6wy4qrhfdigb6c2hsxnqraa20k1xvi0nfzk68km"))))
+    (version "1.1.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bd912j22pf6rmqvkc80g5axjil88pbzxqa68krw65l11v73icmm"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
     (inputs (list glib gtk+ libxfce4util libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/")
     (synopsis "Battery monitor panel plugin for Xfce4")
     (description
      "A battery monitor panel plugin for Xfce4, compatible with APM and ACPI.")
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 14/15] gnu: xfce4-clipman-plugin: Update to 1.6.7.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195444.27827-1-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.7.

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[inputs]: Add wlr-protocols.

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Change-Id: Ic3835b31ac0db45b372cc679b48f17d6fd0b79e1

---

gnu/packages/xfce.scm | 37 ++++++++++++++++++++++---------------

1 file changed, 22 insertions(+), 15 deletions(-)

Toggle diff (51 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0cff15566e..e2228cea8d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -566,22 +566,29 @@ (define-public xfce4-battery-plugin
 (define-public xfce4-clipman-plugin
   (package
     (name "xfce4-clipman-plugin")
-    (version "1.6.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-clipman-plugin/" (version-major+minor version) "/"
-                                  "xfce4-clipman-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "083i9pbcqjkdzzjx055ld4gd4gn3xnc3rn10vpsqv1vg01dlgb88"))))
+    (version "1.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0spg9mdlcx98kjisv0c9axp7knhh8am5dqfa2lspj1jbgvah1dwi"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config))
-    (inputs
-     (list exo libxfce4ui libxtst xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (inputs (list exo libxfce4ui libxtst wlr-protocols xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/")
     (synopsis "Clipboard manager for Xfce")
     (description
      "Clipman is a clipboard manager for Xfce.  It keeps the clipboard contents
-- 
2.46.0

Ashvith Shetty wrote 6 days ago

[PATCH v0 15/15] gnu: xfce4-pulseaudio-plugin: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241227195455.27877-1-ashvith@noreply.codeberg.org

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

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Remove pavucontrol.

Change-Id: Ib633e09831f195d03e4c1a1ed4c7d6e080595b5e

---

gnu/packages/xfce.scm | 44 ++++++++++++++++++++++++++-----------------

1 file changed, 27 insertions(+), 17 deletions(-)

Toggle diff (59 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e2228cea8d..6687cd5340 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -603,25 +603,35 @@ (define-public xfce4-pulseaudio-plugin
     (version "0.4.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-pulseaudio-plugin/"
-                           (version-major+minor version) "/"
-                           "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "16n9vnzwi1j90yxcf4c0lkyqkl969yj6hiby3cvd0j18zcapd050"))))
+        (base32 "1hmajys3g56xlpja9hx0rvap54bw0g6vmirh068zn5004wg7i6kc"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config dbus-glib dbus))
-    (inputs
-     (list exo
-           keybinder
-           libnotify
-           libxfce4ui
-           pavucontrol
-           pulseaudio
-           xfce4-panel))
-    (home-page "https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         dbus
+                         dbus-glib
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (inputs (list exo
+                  keybinder
+                  libnotify
+                  libxfce4ui
+                  pulseaudio
+                  xfce4-panel))
+    (home-page
+     "https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
     (synopsis "PulseAudio panel plugin for Xfce")
     (description
      "Xfce PulseAudio plugin is a plugin for the Xfce panel which provides a
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 00/15] XFCE: Move source from archive to git.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-1-ashvith@noreply.codeberg.org

Second version of the patch. Re-disables check for catfish, since 
there is nothing to check. Also uses new style for garcon's input.

Ashvith Shetty (15):
  gnu: gtk-xfce-engine: Remove variable.
  gnu: xfce4-dev-tools: Update variable fields.
  gnu: libxfce4util: Update variable fields.
  gnu: xfconf: Update variable fields.
  gnu: libxfce4ui: Update variable fields.
  gnu: libxfce4windowing: Update variable fields.
  gnu: catfish: Update to 4.20.0.
  gnu: elementary-xfce-icon-theme: Use new style.
  gnu: exo: Update variable fields.
  gnu: garcon: Update variable fields.
  gnu: tumbler: Update variable fields.
  gnu: xfce4-panel: Update variable fields.
  gnu: xfce4-battery-plugin: Update to 1.1.6.
  gnu: xfce4-clipman-plugin: Update to 1.6.7.
  gnu: xfce4-pulseaudio-plugin: Update variable fields.

 gnu/packages/xfce.scm | 736 +++++++++++++++++++++++-------------------
 1 file changed, 402 insertions(+), 334 deletions(-)

-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 01/15] gnu: gtk-xfce-engine: Remove variable.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-2-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (gtk-xfce-engine): Upstream archived this

project and it is not used by any other packages.

Change-Id: I65a7ed0e0cc597df7fa02c9e0471a90865de9085

---

gnu/packages/xfce.scm | 23 +----------------------

1 file changed, 1 insertion(+), 22 deletions(-)

Toggle diff (43 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a36612dd3a..35abb08c5f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021 André A. Gomes <andremegafone@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -88,28 +89,6 @@ (define-module (gnu packages xfce)
   #:use-module (guix packages)
   #:use-module (guix utils))
 
-(define-public gtk-xfce-engine
-  (package
-    (name "gtk-xfce-engine")
-    (version "2.10.1")
-    (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
-                "0g86ywkx0ghzhhn96k88p67bbzlm1aqckly85izp07w80l1934ja"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
-    (inputs (list gtk+-2))
-    (home-page "https://www.xfce.org/")
-    (synopsis "GTK+ theme engine for Xfce")
-    (description
-     "Default GTK+ engine and themes for Xfce Desktop Environment.")
-    (license gpl2+)))
-
 (define-public libxfce4util
   (package
     (name "libxfce4util")
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 02/15] gnu: xfce4-dev-tools: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-3-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-dev-tools):

[source]: Update to XFCE's GitLab URL.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl and libtool.

Change-Id: Ib94dc5750888de8674409363131e89944ad1e7d1

---

gnu/packages/xfce.scm | 39 +++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 35abb08c5f..de6d0935a0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -37,11 +37,13 @@ (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
+  #:use-module (gnu packages autotools)
   #: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 docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -2289,23 +2291,28 @@ (define-public xfce4-dev-tools
   (package
     (name "xfce4-dev-tools")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-dev-tools/" (version-major+minor version) "/"
-                                  "xfce4-dev-tools-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1ak68k6r0q6dh3knc3vxqvkvkw54f916wfrsm8g7gk0fiah3kfhz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-dev-tools")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k7qj7vka2ys1ld4bfkdvsbxhpjnvb8lc0awnn5b1c34zxmwsivr"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list meson
-           pkg-config
-           libxslt))
-    (inputs
-     (list glib python))
-    (propagated-inputs
-     (list `(,glib "bin")))    ; 'glib-genmarshal' required by 'xdt-depends.m4'
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         libtool
+                         libxslt
+                         meson
+                         pkg-config))
+    (inputs (list glib python))
+    (propagated-inputs (list (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

Ashvith Shetty wrote 5 days ago

[PATCH v1 03/15] gnu: libxfce4util: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-4-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (libxfce4util):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: I3acb4b9237f26e50702c28139f68a7a2082ab60b

---

gnu/packages/xfce.scm | 35 +++++++++++++++++++++++------------

1 file changed, 23 insertions(+), 12 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index de6d0935a0..e3a746dee9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -95,19 +95,30 @@ (define-public libxfce4util
   (package
     (name "libxfce4util")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "libxfce4util/" (version-major+minor version)
-                                  "/" name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "14mml8rdj16gkax92h89vcgf6sphp7v3jf5r7n1858lmk6f3yj91"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0r24hx200jvixn8rhcg0cbvv6b3jc4hj1iw2bkvmrcf74m4ck9nj"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config gobject-introspection intltool vala))
-    (propagated-inputs (list glib)) ; required by libxfce4util-1.0.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         vala
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by libxfce4util-1.0.pc
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Basic utility library for Xfce")
     (description
      "A general-purpose utility library with core application support for the
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 04/15] gnu: xfconf: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-5-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfconf):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Undo delete of phase 'check.

Replace 'custom-check with 'check.

[native-inputs]: Add autoconf, automake, gtk-doc, libtool,

and xfce4-dev-tools.

Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf

---

gnu/packages/xfce.scm | 84 +++++++++++++++++++++----------------------

1 file changed, 42 insertions(+), 42 deletions(-)

Toggle diff (102 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e3a746dee9..a60f4515b1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -129,53 +129,53 @@ (define-public xfconf
   (package
     (name "xfconf")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfconf/" (version-major+minor version) "/"
-                                  "xfconf-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfconf")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k4d2gg77p3jdr0rankz2mv50hy7ddf5xl32si1mdby1wvpa9r2k"))))
     (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 _
-             (substitute* "tests/Makefile.in"
-               (("tests-end") ""))))
-         (add-after 'install 'custom-check
-           (lambda _
-             (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
-             ;; Run test-suite under a dbus session.
-             (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
-                     (string-append %output "/share"))
-             ;; For the missing '/etc/machine-id'.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             (invoke "dbus-launch" "make" "check")))
-         (delete 'check))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin") ;; for gdbus-codegen
-           gobject-introspection
-           vala
-           dbus))
+     (list
+      #: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"))))
+          (replace 'check
+            (lambda _
+              (setenv "HOME"
+                      (getenv "TMPDIR")) ;xfconfd requires a writable HOME
+              ;; Run test-suite under a dbus session.
+              (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service
+                      (string-append %output "/share"))
+              ;; For the missing '/etc/machine-id'.
+              (setenv "DBUS_FATAL_WARNINGS" "0")
+              (invoke "dbus-launch" "make" "check"))))))
+    (native-inputs (list autoconf
+                         automake
+                         dbus
+                         (list glib "bin") ;for gdbus-codegen
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         vala
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      (list glib))
-    (inputs
-     (list libxfce4util))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4util))
+    (home-page "https://docs.xfce.org/xfce/xfconf/")
     (synopsis "Configuration storage and query system for Xfce")
     (description
      "Settings daemon for Xfce, implemented as a D-Bus-based configuration
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 05/15] gnu: libxfce4ui: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-6-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (libxfce4ui):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: I9ca360cec30660b85cea95b494df9dae1767f3ab

---

gnu/packages/xfce.scm | 43 +++++++++++++++++++++++++------------------

1 file changed, 25 insertions(+), 18 deletions(-)

Toggle diff (59 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a60f4515b1..8587d2d8c1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -186,27 +186,34 @@ (define-public libxfce4ui
   (package
     (name "libxfce4ui")
     (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
-                "1vpafvmn2x95n0d8dmr6pp81w8bw2ksicp6dvsm7a0zjhilrks3m"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4ui")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ps8sq8g43dx12qp0shrdb45bjrfhhgkziscj5jnrzfhy6j9mqrk"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--with-vendor-info=GNU Guix")))
-    (native-inputs
-     (list pkg-config intltool gobject-introspection))
-    (propagated-inputs
-     (list gtk+    ; required by libxfce4ui-2.pc
-           ;; libxfce4kbd-private-3.pc refers to all these.
-           libxfce4util
-           xfconf))
+     `(#:configure-flags (list "--with-vendor-info=GNU Guix"
+                               "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gobject-introspection
+                         gtk-doc
+                         libtool
+                         intltool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list
+                        ;; required by libxfce4ui-2.pc
+                        gtk+
+                        ;; libxfce4kbd-private-3.pc refers to all these.
+                        libxfce4util xfconf))
     (inputs (list libgtop libice libsm startup-notification))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Widgets library for Xfce")
     (description
      "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 06/15] gnu: libxfce4windowing: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-7-ashvith@noreply.codeberg.org

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

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[inputs]: Add wlr-protocols.

[native-inputs]: Add autoconf, automake, gtk-doc, intltool

libtool and xfce4-dev-tools.

Change-Id: I995433864b2de45cabcafd541ef39af4c6aab320

---

gnu/packages/xfce.scm | 38 ++++++++++++++++++++++----------------

1 file changed, 22 insertions(+), 16 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8587d2d8c1..152da5c12d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -414,23 +414,29 @@ (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"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4windowing")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "158jhw5kq3dzmgmy9wr9fgspwcdq84r6hjfnvbn48wx9d2q9pwdp"))))
     (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/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+)) ;required by libxfce4windowing-0.pc
+    (inputs (list libdisplay-info libwnck libxrandr wayland wayland-protocols wlr-protocols))
+    (home-page "https://docs.xfce.org/xfce/libxfce4windowing/")
     (synopsis "Windowing concept abstraction library for X11 and Wayland")
     (description
      "Libxfce4windowing is an abstraction library that attempts to present
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 07/15] gnu: catfish: Update to 4.20.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-8-ashvith@noreply.codeberg.org

From: Ashvith Shetty <Ashvith@noreply.codeberg.org>

* gnu/packages/xfce.scm (catfish): Update to 4.20.0.
[source]: Update to XFCE's GitLab URL.
[home-page]: Set to docs.xfce.org.
[build-system]: Switch to meson-build-system
[arguments]: Do not replace phase 'install.
Do not delete 'sanity-check.
[native-inputs]: Add cmake, desktop-file-utils, (list gtk+ "bin")
and python.
Remove python-distutils-extra.

Change-Id: Ieca091640912cfbe50d13623bcc0866aa5e3514c
---
 gnu/packages/xfce.scm | 89 ++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

Toggle diff (117 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 152da5c12d..921f3e09f0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -43,6 +43,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
@@ -82,7 +83,7 @@ (define-module (gnu packages xfce)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -223,50 +224,50 @@ (define-public libxfce4ui
 (define-public catfish
   (package
     (name "catfish")
-    (version "4.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "catfish/" (version-major+minor version)
-                                  "/catfish-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx"))))
-    (build-system python-build-system)
+    (version "4.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/apps/catfish")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-command-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "catfish/CatfishSearchEngine.py"
-               (("'which'") (string-append "'" (which "which") "'")))
-             (substitute* "catfish/CatfishWindow.py"
-               (("xdg-mime") (which "xdg-mime"))
-               (("xdg-open") (which "xdg-open")))))
-         ;; setup.py script does not support one of the Python build
-         ;; system's default flags, "--single-version-externally-managed".
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "python" "setup.py" "install"
-                     (string-append "--prefix=" (assoc-ref outputs "out"))
-                     "--root=/")))
-         ;; The check failed to spawn a message bus without /etc/machine-id.
-         (delete 'sanity-check)
-         (add-after 'install 'wrap-program
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/bin/catfish")
-                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
-                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config python-distutils-extra intltool))
-    (inputs
-     (list bash-minimal which xfconf xdg-utils))
-    (propagated-inputs
-     (list gtk+ python-dbus python-pexpect python-pycairo
-           python-pygobject))
-    (home-page "https://docs.xfce.org/apps/catfish/start")
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-command-paths
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "catfish/CatfishSearchEngine.py"
+                         (("'which'")
+                          (string-append "'"
+                                         (which "which") "'")))
+                       (substitute* "catfish/CatfishWindow.py"
+                         (("xdg-mime")
+                          (which "xdg-mime"))
+                         (("xdg-open")
+                          (which "xdg-open")))))
+                   (add-after 'install 'wrap-program
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out")))
+                         (wrap-program (string-append out "/bin/catfish")
+                           `("GUIX_PYTHONPATH" =
+                             (,(getenv "GUIX_PYTHONPATH")))
+                           `("GI_TYPELIB_PATH" =
+                             (,(getenv "GI_TYPELIB_PATH"))))))))
+      #:tests? #f))
+    (native-inputs (list cmake
+                         desktop-file-utils
+                         (list gtk+ "bin")
+                         pkg-config
+                         python
+                         intltool))
+    (inputs (list bash-minimal which xfconf xdg-utils))
+    (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo
+                             python-pygobject))
+    (home-page "https://docs.xfce.org/apps/catfish/")
     (synopsis "File searching tool for Xfce")
     (description
      "Catfish is a file searching tool for Linux and Unix.  The interface is
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 08/15] gnu: elementary-xfce-icon-theme: Use new style.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-9-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (elementary-xfce-icon-theme): Use new style.

Change-Id: I70ad49c16c30d519c0745462e33c86ad459c5b1b

---

gnu/packages/xfce.scm | 41 ++++++++++++++++++++---------------------

1 file changed, 20 insertions(+), 21 deletions(-)

Toggle diff (58 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 921f3e09f0..b78a2ade46 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -279,31 +279,30 @@ (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
     (version "0.20")
-    (source (origin
-              (method git-fetch)
-              (uri
-               (git-reference
-                (url "https://github.com/shimmerproject/elementary-xfce")
-                (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shimmerproject/elementary-xfce")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no check target
-       #:make-flags '("CC=gcc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t)))))
-    (native-inputs
-     (list gtk+ optipng pkg-config))
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list "CC=gcc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'make-git-checkout-writable
+                     (lambda _
+                       (for-each make-file-writable
+                                 (find-files ".")) #t)))))
+    (native-inputs (list gtk+ optipng pkg-config))
     (home-page "https://shimmerproject.org/")
     (synopsis "Elementary icons extended and maintained for Xfce")
-    (description "This is a fork of the upstream elementary project.  This icon
+    (description
+     "This is a fork of the upstream elementary project. This icon
 theme is supposed to keep everything working for Xfce, but gets updates from
 upstream occasionally.")
     (license gpl2+)))
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 09/15] gnu: exo: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-10-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (exo):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl,

(list glib "bin"), gtk-doc, libtool, libxslt and

xfce4-dev-tools.

Change-Id: Ic32658dfba670e44916d63e186fc61f0e73f3124

---

gnu/packages/xfce.scm | 37 ++++++++++++++++++++++++-------------

1 file changed, 24 insertions(+), 13 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b78a2ade46..b3a9ce3e8f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -311,23 +311,34 @@ (define-public exo
   (package
     (name "exo")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "exo/" (version-major+minor version) "/"
-                                  "exo-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1387xib59z9m43z772lz3kwjrcd6id9zs5yr3khgs7jz4jczfxs2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/exo")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zbj5q0ih5kvxvays4ajjsmxm2938jmn4648062agxxjl8asqlcs"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         (list glib "bin")
+                         gtk-doc
+                         intltool
+                         libtool
+                         libxslt
+                         pkg-config
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; exo-2.pc refers to all these.
      (list gtk+ libxfce4util))
-    (inputs
-     (list libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4ui))
+    (home-page "https://docs.xfce.org/xfce/exo/")
     (synopsis "Extension library for Xfce")
     (description
      "An extension library to Xfce.  While Xfce comes with quite a few libraries
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 10/15] gnu: garcon: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-11-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (garcon):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, docbook-xsl, gtk-doc,

libtool, libxslt and xfce4-dev-tools.

Change-Id: I2eeb20ad8bbbeb9fc7e38b1dff89974c0d5b31f0

---

gnu/packages/xfce.scm | 40 ++++++++++++++++++++++++++--------------

1 file changed, 26 insertions(+), 14 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b3a9ce3e8f..09badb88da 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -351,21 +351,33 @@ (define-public garcon
   (package
     (name "garcon")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "garcon/" (version-major+minor version) "/"
-                                  "garcon-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "13ysx9gl22a5rjzl4m3v0zm3hpii1jy38b5lz3fs971h29y53f3z"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/garcon")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "076pdyssl5lhm88s2xx94w3rk6glcc4kgfl3jqd6704hpl6n9rii"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list `(,glib "bin") gobject-introspection intltool pkg-config))
-    (propagated-inputs
-     (list gtk+ ; required by garcon-gtk3-1.pc
-           libxfce4ui))     ; required by garcon-gtk3-1.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         (list glib "bin")
+                         gobject-introspection
+                         gtk-doc
+                         intltool
+                         libtool
+                         libxslt
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by garcon-gtk3-1.pc
+                             libxfce4ui)) ;required by garcon-gtk3-1.pc
+    (home-page "https://docs.xfce.org/xfce/garcon/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
      "Garcon is a freedesktop.org compliant menu implementation based on
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 11/15] gnu: tumbler: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-12-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (tumbler):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool,

and xfce4-dev-tools.

Change-Id: I993fda97eeea44c529cc04359f2e2ab36068962c

---

gnu/packages/xfce.scm | 73 +++++++++++++++++++++++--------------------

1 file changed, 39 insertions(+), 34 deletions(-)

Toggle diff (88 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 09badb88da..3f1c03f048 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -390,42 +390,47 @@ (define-public tumbler
   (package
     (name "tumbler")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "tumbler/" (version-major+minor version) "/"
-                                  "tumbler-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "102qwa8an7wdqf0hrqd5k51aiib3zww0iizsigllfrcjamyn9cbl"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/tumbler")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18bp1ckv6mzbxhbk7aqp2mxbni1pw8hv8rzxmc9xx488dxs0qq8s"))))
     (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 and gdbus-codegen
-    (propagated-inputs
-     (list glib))                 ; required by tumbler-1.pc
-    (inputs
-     (list dbus
-           gdk-pixbuf
-           cairo ;; Needed for pdf thumbnails (poppler-glibc.pc)
-           freetype
-           libjpeg-turbo
-           libgsf
-           libxfce4util
-           poppler
-           ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
-           ;; ("gstreamer" ,gstreamer)
-           ))
-    (home-page "https://www.xfce.org/")
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")
+      #:phases #~(modify-phases %standard-phases
+                   (add-before 'configure 'patch-configure
+                     (lambda _
+                       (substitute* "configure"
+                         (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
+                          "type -p gdbus-codegen")))))))
+    (native-inputs (list autoconf
+                         automake
+                         dbus-glib
+                         (list glib "bin") ;need glib-genmarshal
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by tumbler-1.pc
+    (inputs (list dbus
+                  gdk-pixbuf
+                  cairo ;Needed for pdf thumbnails (poppler-glibc.pc)
+                  freetype
+                  libjpeg-turbo
+                  libgsf
+                  libxfce4util
+                  poppler
+                  ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+                  ;; ("gstreamer" ,gstreamer)
+                  ))
+    (home-page "https://docs.xfce.org/xfce/tumbler/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
      "Tumbler is a D-Bus service for applications to request thumbnails for
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 12/15] gnu: xfce4-panel: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-13-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-panel):

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool

and xfce4-dev-tools.

Change-Id: Ic5b4a82b1d14e24b11efac7f655ddb8f43a0b9da

---

gnu/packages/xfce.scm | 80 +++++++++++++++++++++++--------------------

1 file changed, 42 insertions(+), 38 deletions(-)

Toggle diff (99 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3f1c03f048..87aa619861 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -476,50 +476,54 @@ (define-public xfce4-panel
   (package
     (name "xfce4-panel")
     (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
-                "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-panel")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "049dhis9106zig5awr9ppnxm357d93z842h015pd8rni9sayc7m0"))))
     (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")
-               (("/usr/share/zoneinfo")
-                (search-input-directory inputs "share/zoneinfo"))))))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin")))
-    (propagated-inputs
-     (list gtk+ ; required by libxfce4panel-2.0.pc
-           libxfce4util)) ; required by libxfce4panel-2.0.pc
-    (inputs
-     (list tzdata ;; For fix-tzdata-path phase only.
-           exo
-           xfconf
-           garcon
-           gtk-layer-shell
-           libwnck
-           libxfce4ui
-           libxfce4windowing))
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")
+      #: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")
+                         (("/usr/share/zoneinfo")
+                          (search-input-directory inputs "share/zoneinfo"))))))))
+    (native-inputs (list autoconf
+                         automake
+                         (list glib "bin")
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by libxfce4panel-2.0.pc
+                             libxfce4util)) ;required by libxfce4panel-2.0.pc
+    (inputs (list tzdata ;For fix-tzdata-path phase only.
+                  exo
+                  xfconf
+                  garcon
+                  gtk-layer-shell
+                  libwnck
+                  libxfce4ui
+                  libxfce4windowing))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DATA_DIRS")
             (files '("share")))))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-panel/")
     (synopsis "Xfce desktop panel")
     (description
      "Desktop panel for Xfce, which contains program launchers, window buttons,
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 13/15] gnu: xfce4-battery-plugin: Update to 1.1.6.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-14-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.6.

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Change-Id: I9359731b564a225450cf314b762d51564cce370e

---

gnu/packages/xfce.scm | 33 +++++++++++++++++++++------------

1 file changed, 21 insertions(+), 12 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 87aa619861..cde2178e34 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -534,20 +534,29 @@ (define-public xfce4-panel
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "04z2bic6c2cgl6wy4qrhfdigb6c2hsxnqraa20k1xvi0nfzk68km"))))
+    (version "1.1.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bd912j22pf6rmqvkc80g5axjil88pbzxqa68krw65l11v73icmm"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
     (inputs (list glib gtk+ libxfce4util libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/")
     (synopsis "Battery monitor panel plugin for Xfce4")
     (description
      "A battery monitor panel plugin for Xfce4, compatible with APM and ACPI.")
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 14/15] gnu: xfce4-clipman-plugin: Update to 1.6.7.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-15-ashvith@noreply.codeberg.org

* gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.7.

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[inputs]: Add wlr-protocols.

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Change-Id: Ic3835b31ac0db45b372cc679b48f17d6fd0b79e1

---

gnu/packages/xfce.scm | 37 ++++++++++++++++++++++---------------

1 file changed, 22 insertions(+), 15 deletions(-)

Toggle diff (51 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index cde2178e34..541fd8426d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -567,22 +567,29 @@ (define-public xfce4-battery-plugin
 (define-public xfce4-clipman-plugin
   (package
     (name "xfce4-clipman-plugin")
-    (version "1.6.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-clipman-plugin/" (version-major+minor version) "/"
-                                  "xfce4-clipman-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "083i9pbcqjkdzzjx055ld4gd4gn3xnc3rn10vpsqv1vg01dlgb88"))))
+    (version "1.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0spg9mdlcx98kjisv0c9axp7knhh8am5dqfa2lspj1jbgvah1dwi"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config))
-    (inputs
-     (list exo libxfce4ui libxtst xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (inputs (list exo libxfce4ui libxtst wlr-protocols xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/")
     (synopsis "Clipboard manager for Xfce")
     (description
      "Clipman is a clipboard manager for Xfce.  It keeps the clipboard contents
-- 
2.46.0

Ashvith Shetty wrote 5 days ago

[PATCH v1 15/15] gnu: xfce4-pulseaudio-plugin: Update variable fields.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:20241228115320.24218-16-ashvith@noreply.codeberg.org

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

[source]: Update to XFCE's GitLab URL.

[home-page]: Set to docs.xfce.org.

[arguments]: Set configure flag "--enable-maintainer-mode".

[native-inputs]: Add autoconf, automake, gtk-doc, libtool and

xfce4-dev-tools.

Remove pavucontrol.

Change-Id: Ib633e09831f195d03e4c1a1ed4c7d6e080595b5e

---

gnu/packages/xfce.scm | 44 ++++++++++++++++++++++++++-----------------

1 file changed, 27 insertions(+), 17 deletions(-)

Toggle diff (59 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 541fd8426d..151cdd37d9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -604,25 +604,35 @@ (define-public xfce4-pulseaudio-plugin
     (version "0.4.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-pulseaudio-plugin/"
-                           (version-major+minor version) "/"
-                           "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "16n9vnzwi1j90yxcf4c0lkyqkl969yj6hiby3cvd0j18zcapd050"))))
+        (base32 "1hmajys3g56xlpja9hx0rvap54bw0g6vmirh068zn5004wg7i6kc"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config dbus-glib dbus))
-    (inputs
-     (list exo
-           keybinder
-           libnotify
-           libxfce4ui
-           pavucontrol
-           pulseaudio
-           xfce4-panel))
-    (home-page "https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list autoconf
+                         automake
+                         dbus
+                         dbus-glib
+                         gtk-doc
+                         intltool
+                         libtool
+                         pkg-config
+                         xfce4-dev-tools))
+    (inputs (list exo
+                  keybinder
+                  libnotify
+                  libxfce4ui
+                  pulseaudio
+                  xfce4-panel))
+    (home-page
+     "https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
     (synopsis "PulseAudio panel plugin for Xfce")
     (description
      "Xfce PulseAudio plugin is a plugin for the Xfce panel which provides a
-- 
2.46.0

??? wrote 4 days ago

Re: [bug#75146] [PATCH v0 00/15] XFCE: Move source from generated archive to git.

Recipients:(name . Ashvith Shetty)(address . ashvithshetty10@gmail.com)

Message-ID:87o70topa7.fsf@envs.net

Ashvith Shetty <ashvithshetty10@gmail.com> writes:

Toggle quote (5 lines)

> This patch series moves the source for XFCE applications and plugins

> from the pre-generated archive file to their git source for quality

> reasons (inconsistency between git and archive builds,

> missing files in generated archive, etc).

Hello, could you explain more about those inconsistency and missing

files? Build from git is more expensive than tarballs, as it download

more and need more dependencies, so I think we should avoid it if

possible. We can switch some packages to git if their tarballs is

lacking functions, also report to upstream to fix them.

Toggle quote (3 lines)

> This patch series also removes gtk-xfce-engine, a long-abandoned package,

> which had no dependant packages.

This package is still useful for GTK2 applications, we could update its

description and move it into 'gtk.scm' to avoid some confusions.

Thanks for the contributions!

Ashvith Shetty wrote 3 days ago

Recipients:(name . ???)(address . iyzsong@envs.net)

Message-ID:CA+n6Bx9xN_cdmO2yrDRh0ghesyXCouH8ef+grhVpg9sk7Gh0zw@mail.gmail.com

Hello,

On Mon, Dec 30, 2024 at 2:49?AM ??? <iyzsong@envs.net> wrote:

Toggle quote (3 lines)

> Hello, could you explain more about those inconsistency and missing

> files?

For example, Thunar's `make check`
https://gitlab.xfce.org/xfce/thunar/-/issues/1516 did not run tests for
the archive, as
opposed to git as the source. Only after switching to git was I able to
catch how one of  the abicheck tests were broken. Now, this has been
resolved in a future version, but given how it would be highly unlikely to
catch these issues via archive as the source, I thought that it was better
if
we made use of git instead.

Toggle quote (3 lines)

> Build from git is more expensive than tarballs, as it download

> more and need more dependencies.

Another issue with archive as the source is that the archive includes files
that
have been generated on another system via the git repository. For git,
since
we are building directly from the repo itself, I believe that it would be a
right
pick. Or maybe we can switch to downloading the tag-specific archive from
git itself?

Toggle quote (3 lines)

> This package is still useful for GTK2 applications, we could update its

> description and move it into 'gtk.scm' to avoid some confusions.

From the data on Repology, it looks like this package has been removed

from most of the other distributions out there. I've also come across other

gtk2 engines that could be used in its place, like murrine, pixbuf and

aurora.

What do you think?

Regards,

Ashvith

Attachment: file

Zheng Junjie wrote 3 days ago

Recipients:(name . ??? via Guix-patches via)(address . guix-patches@gnu.org)

Message-ID:87msgdshdl.fsf@iscas.ac.cn

??? via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (11 lines)> Ashvith Shetty <ashvithshetty10@gmail.com> writes:
>
>> This patch series moves the source for XFCE applications and plugins 
>> from the pre-generated archive file to their git source for quality 
>> reasons (inconsistency between git and archive builds, 
>> missing files in generated archive, etc).
>
> Hello, could you explain more about those inconsistency and missing
> files?  Build from git is more expensive than tarballs, as it download
> more and need more dependencies, so I think we should avoid it if

I think using git sources makes it easier to test and develop xfce, likes

test pr, and to avoid things like XZ Utils backdoor.

Toggle quote (12 lines)> possible.  We can switch some packages to git if their tarballs is
> lacking functions, also report to upstream to fix them.
>
>
>> This patch series also removes gtk-xfce-engine, a long-abandoned package,
>> which had no dependant packages.
>
> This package is still useful for GTK2 applications, we could update its
> description and move it into 'gtk.scm' to avoid some confusions.
>
>
> Thanks for the contributions!

??? wrote 3 days ago

Re: bug#75146: [PATCH v0 00/15] XFCE: Move source from generated archive to git.

Recipients:(name . Ashvith Shetty)(address . ashvithshetty10@gmail.com)

Message-ID:87bjwto0g0.fsf_-_@envs.net

Ashvith Shetty <ashvithshetty10@gmail.com> writes:

Toggle quote (22 lines)> Hello,
>
> On Mon, Dec 30, 2024 at 2:49?AM ??? <iyzsong@envs.net> wrote:
>
>> Hello, could you explain more about those inconsistency and missing
>> files?
>
> For example, Thunar's `make check` did not run tests for the archive, as 
> opposed to git as the source. Only after switching to git was I able to 
> catch how one of  the abicheck tests were broken. Now, this has been 
> resolved in a future version, but given how it would be highly unlikely to 
> catch these issues via archive as the source, I thought that it was better if 
> we made use of git instead.
>
>> Build from git is more expensive than tarballs, as it download
>> more and need more dependencies.
>
> Another issue with archive as the source is that the archive includes files that 
> have been generated on another system via the git repository. For git, since 
> we are building directly from the repo itself, I believe that it would be a right 
> pick. 

So switch from generated talballs to git sources will enable us to:

- run more tests

- test versions easier (with guix build --with-commit=...)

- trust more (generate manpages and gtk documents ourselves etc.)

I'll do some rework (split commits, adjust commit message) based on your

patches later, thanks!

Toggle quote (3 lines)

> Or maybe we can switch to downloading the tag-specific archive from

> git itself?

We shouldn't download tag-specific archive though, as they are unstable.

Toggle quote (10 lines)>
>> This package is still useful for GTK2 applications, we could update its
>> description and move it into 'gtk.scm' to avoid some confusions.
>
> From the data on Repology, it looks like this package has been removed 
> from most of the other distributions out there. I've also come across other 
> gtk2 engines that could be used in its place, like murrine, pixbuf and aurora.
>
> What do you think?

Okay, according to "Package removal" Deprecation Policy (info guix), we

can remove this unmaintained 'gtk-xfce-engine' package one-month later.

iyzsong wrote 3 days ago

[PATCH v3 01/16] gnu: xfce4-dev-tools: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)

Message-ID:9998f582163c7c335786b23bd282a43c60734652.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools):

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add autoconf, automake, docbook-xsl and libtool.

Change-Id: Ib94dc5750888de8674409363131e89944ad1e7d1

Signed-off-by: ??? <iyzsong@member.fsf.org>

---

gnu/packages/xfce.scm | 39 +++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)

Toggle diff (67 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a36612dd3a..8c86972f6e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -36,11 +36,13 @@ (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
+  #:use-module (gnu packages autotools)
   #: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 docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -2310,23 +2312,28 @@ (define-public xfce4-dev-tools
   (package
     (name "xfce4-dev-tools")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-dev-tools/" (version-major+minor version) "/"
-                                  "xfce4-dev-tools-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1ak68k6r0q6dh3knc3vxqvkvkw54f916wfrsm8g7gk0fiah3kfhz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-dev-tools")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k7qj7vka2ys1ld4bfkdvsbxhpjnvb8lc0awnn5b1c34zxmwsivr"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list meson
-           pkg-config
-           libxslt))
-    (inputs
-     (list glib python))
-    (propagated-inputs
-     (list `(,glib "bin")))    ; 'glib-genmarshal' required by 'xdt-depends.m4'
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode"))) ;for xdt-csource.1
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         libtool
+                         libxslt
+                         meson
+                         pkg-config))
+    (inputs (list glib python))
+    (propagated-inputs (list (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

base-commit: 121e96dca273ab407df11725da0026ee34abdf79
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 02/16] gnu: xfce4-dev-tools: Add more propagated inputs.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:b5cdc8a55b46f9d2f880b6f6233ed2ea518fc338.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools)[propagated-inputs]: Add

autoconf, automake, gtk-doc, intltool, libtool and pkg-config.

Change-Id: Iaf5830d3948720641f30f28aa415c884fbfba8aa

---

gnu/packages/xfce.scm | 8 +++++++-

1 file changed, 7 insertions(+), 1 deletion(-)

Toggle diff (21 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8c86972f6e..83d78bfc19 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2333,7 +2333,13 @@ (define-public xfce4-dev-tools
                          meson
                          pkg-config))
     (inputs (list glib python))
-    (propagated-inputs (list (list glib "bin"))) ;'glib-genmarshal' required by 'xdt-depends.m4'
+    (propagated-inputs
+     (list
+      ;; required by 'xdt-autogen'
+      autoconf automake gtk-doc intltool libtool
+      ;; required by 'xdt-depends.m4'
+      (list glib "bin") ;for glib-genmarshal
+      pkg-config))
     (home-page "https://docs.xfce.org/xfce/xfce4-dev-tools/")
     (synopsis "Xfce developer tools")
     (description
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 03/16] gnu: xfce4-dev-tools: Fix XDT_CHECK_PACKAGE_BINARY for non-absolute paths.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:d80ed99c824224f1d46837ad2736162dcb5b05b7.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools)[arguments]: Add

'fix-XDT_CHECK_PACKAGE_BINARY phase.

Change-Id: I944428764b821da2958b42df3ae743e79f25ce0e

---

gnu/packages/xfce.scm | 9 +++++++++

1 file changed, 9 insertions(+)

Toggle diff (22 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 83d78bfc19..7c1f9cf3a8 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2325,6 +2325,15 @@ (define-public xfce4-dev-tools
     (arguments
      (list
       #:configure-flags #~(list "--enable-maintainer-mode"))) ;for xdt-csource.1
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-XDT_CHECK_PACKAGE_BINARY
+            (lambda _
+              (substitute* "m4macros/xdt-depends.m4"
+                ;; Our pkg-config doesn't report absolute paths for this
+                ;; executable check.
+                (("-a -x \"\\$\\$1\"")
+                 "-a -x `command -v \"$$1\"`")))))))
     (native-inputs (list autoconf
                          automake
                          docbook-xsl
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 04/16] gnu: libxfce4util: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:f7f12600d8c2631ee8056b69f389d59d62731a57.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4util)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I3acb4b9237f26e50702c28139f68a7a2082ab60b

---

gnu/packages/xfce.scm | 31 +++++++++++++++++++------------

1 file changed, 19 insertions(+), 12 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7c1f9cf3a8..25f7a539b8 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -116,19 +116,26 @@ (define-public libxfce4util
   (package
     (name "libxfce4util")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "libxfce4util/" (version-major+minor version)
-                                  "/" name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "14mml8rdj16gkax92h89vcgf6sphp7v3jf5r7n1858lmk6f3yj91"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0r24hx200jvixn8rhcg0cbvv6b3jc4hj1iw2bkvmrcf74m4ck9nj"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config gobject-introspection intltool vala))
-    (propagated-inputs (list glib)) ; required by libxfce4util-1.0.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for libxfce4util-visibility.c
+              "--enable-gtk-doc")))
+    (native-inputs (list gobject-introspection
+                         vala
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by libxfce4util-1.0.pc
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Basic utility library for Xfce")
     (description
      "A general-purpose utility library with core application support for the
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 05/16] gnu: xfconf: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:ed5e5849ad874e6011baa1eba299b173c7680cc8.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfconf)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Remove 'patch-configure phase. Simpify 'check phase.

Add '--enable-gtk-doc' to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf

---

gnu/packages/xfce.scm | 69 +++++++++++++++++--------------------------

1 file changed, 27 insertions(+), 42 deletions(-)

Toggle diff (87 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 25f7a539b8..25065f769a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -146,53 +146,38 @@ (define-public xfconf
   (package
     (name "xfconf")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfconf/" (version-major+minor version) "/"
-                                  "xfconf-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfconf")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k4d2gg77p3jdr0rankz2mv50hy7ddf5xl32si1mdby1wvpa9r2k"))))
     (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 _
-             (substitute* "tests/Makefile.in"
-               (("tests-end") ""))))
-         (add-after 'install 'custom-check
-           (lambda _
-             (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
-             ;; Run test-suite under a dbus session.
-             (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
-                     (string-append %output "/share"))
-             ;; For the missing '/etc/machine-id'.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             (invoke "dbus-launch" "make" "check")))
-         (delete 'check))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin") ;; for gdbus-codegen
-           gobject-introspection
-           vala
-           dbus))
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda _
+              (setenv "HOME"
+                      (getenv "TMPDIR")) ;xfconfd requires a writable HOME
+              ;; For the missing '/etc/machine-id'.
+              (setenv "DBUS_FATAL_WARNINGS" "0")
+              ;; Run test-suite under a dbus session.
+              (invoke "dbus-launch" "make" "check"))))))
+    (native-inputs (list dbus
+                         gobject-introspection
+                         vala
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      (list glib))
-    (inputs
-     (list libxfce4util))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4util))
+    (home-page "https://docs.xfce.org/xfce/xfconf/")
     (synopsis "Configuration storage and query system for Xfce")
     (description
      "Settings daemon for Xfce, implemented as a D-Bus-based configuration
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 07/16] gnu: libxfce4windowing: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:639f79f22388cee3e12d281d3401e0c943a27843.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4windowing)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-gtk-doc" to configure-flags.

[inputs]: Add wlr-protocols.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I995433864b2de45cabcafd541ef39af4c6aab320

---

gnu/packages/xfce.scm | 29 +++++++++++++++++------------

1 file changed, 17 insertions(+), 12 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 4b6045b64f..3a10c8fa80 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -411,23 +411,28 @@ (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"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4windowing")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "158jhw5kq3dzmgmy9wr9fgspwcdq84r6hjfnvbn48wx9d2q9pwdp"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config xfce4-dev-tools))
-    (propagated-inputs (list gtk+))     ; required by libxfce4windowing-0.pc
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")))
+    (native-inputs (list 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/")
+                  wayland-protocols
+                  wlr-protocols))
+    (home-page "https://docs.xfce.org/xfce/libxfce4windowing/")
     (synopsis "Windowing concept abstraction library for X11 and Wayland")
     (description
      "Libxfce4windowing is an abstraction library that attempts to present
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 06/16] gnu: libxfce4ui: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:1fd22103e9f015573743d9cb8a66344d6e0859fa.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4ui)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I9ca360cec30660b85cea95b494df9dae1767f3ab

---

gnu/packages/xfce.scm | 38 ++++++++++++++++++++------------------

1 file changed, 20 insertions(+), 18 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 25065f769a..4b6045b64f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -188,27 +188,29 @@ (define-public libxfce4ui
   (package
     (name "libxfce4ui")
     (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
-                "1vpafvmn2x95n0d8dmr6pp81w8bw2ksicp6dvsm7a0zjhilrks3m"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4ui")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ps8sq8g43dx12qp0shrdb45bjrfhhgkziscj5jnrzfhy6j9mqrk"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--with-vendor-info=GNU Guix")))
-    (native-inputs
-     (list pkg-config intltool gobject-introspection))
-    (propagated-inputs
-     (list gtk+    ; required by libxfce4ui-2.pc
-           ;; libxfce4kbd-private-3.pc refers to all these.
-           libxfce4util
-           xfconf))
+     (list #:configure-flags
+           #~(list "--with-vendor-info=GNU Guix"
+                   "--enable-maintainer-mode" ; for about-dialog-ui.h, etc.
+                   "--enable-gtk-doc")))
+    (native-inputs (list gobject-introspection xfce4-dev-tools))
+    (propagated-inputs (list
+                        ;; required by libxfce4ui-2.pc
+                        gtk+
+                        ;; libxfce4kbd-private-3.pc refers to all these.
+                        libxfce4util xfconf))
     (inputs (list libgtop libice libsm startup-notification))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/libxfce4ui/")
     (synopsis "Widgets library for Xfce")
     (description
      "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 08/16] gnu: exo: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:a84c12677ce7e53d63f247f81a42c67ba5619427.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (exo)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

Change-Id: Ic32658dfba670e44916d63e186fc61f0e73f3124

---

gnu/packages/xfce.scm | 32 +++++++++++++++++++-------------

1 file changed, 19 insertions(+), 13 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3a10c8fa80..fb562f6557 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -308,23 +308,29 @@ (define-public exo
   (package
     (name "exo")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "exo/" (version-major+minor version) "/"
-                                  "exo-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1387xib59z9m43z772lz3kwjrcd6id9zs5yr3khgs7jz4jczfxs2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/exo")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zbj5q0ih5kvxvays4ajjsmxm2938jmn4648062agxxjl8asqlcs"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for exo-enum-types.c, etc.
+              "--enable-gtk-doc")))
+    (native-inputs (list docbook-xsl
+                         libxslt
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; exo-2.pc refers to all these.
      (list gtk+ libxfce4util))
-    (inputs
-     (list libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4ui))
+    (home-page "https://docs.xfce.org/xfce/exo/")
     (synopsis "Extension library for Xfce")
     (description
      "An extension library to Xfce.  While Xfce comes with quite a few libraries
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 09/16] gnu: garcon: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:e46e001845e4803ba52f18881090e0e2d3f1701d.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (garcon)[source]: Use git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-gtk-doc" to configure-flags.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

Change-Id: I2eeb20ad8bbbeb9fc7e38b1dff89974c0d5b31f0

---

gnu/packages/xfce.scm | 33 +++++++++++++++++++--------------

1 file changed, 19 insertions(+), 14 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fb562f6557..71836970ba 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -343,21 +343,26 @@ (define-public garcon
   (package
     (name "garcon")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "garcon/" (version-major+minor version) "/"
-                                  "garcon-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "13ysx9gl22a5rjzl4m3v0zm3hpii1jy38b5lz3fs971h29y53f3z"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/garcon")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "076pdyssl5lhm88s2xx94w3rk6glcc4kgfl3jqd6704hpl6n9rii"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list `(,glib "bin") gobject-introspection intltool pkg-config))
-    (propagated-inputs
-     (list gtk+ ; required by garcon-gtk3-1.pc
-           libxfce4ui))     ; required by garcon-gtk3-1.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")))
+    (native-inputs (list docbook-xsl
+                         gobject-introspection
+                         libxslt
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by garcon-gtk3-1.pc
+                             libxfce4ui)) ;required by garcon-gtk3-1.pc
+    (home-page "https://docs.xfce.org/xfce/garcon/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
      "Garcon is a freedesktop.org compliant menu implementation based on
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 11/16] gnu: xfce4-panel: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:9ca5f44daf6349d1d7904de615b4dfec2eee29b6.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-panel)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ic5b4a82b1d14e24b11efac7f655ddb8f43a0b9da

---

gnu/packages/xfce.scm | 69 +++++++++++++++++++------------------------

1 file changed, 31 insertions(+), 38 deletions(-)

Toggle diff (88 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0dbde8b08e..7aa739d0d1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -443,50 +443,43 @@ (define-public xfce4-panel
   (package
     (name "xfce4-panel")
     (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
-                "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-panel")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "049dhis9106zig5awr9ppnxm357d93z842h015pd8rni9sayc7m0"))))
     (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")
-               (("/usr/share/zoneinfo")
-                (search-input-directory inputs "share/zoneinfo"))))))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin")))
-    (propagated-inputs
-     (list gtk+ ; required by libxfce4panel-2.0.pc
-           libxfce4util)) ; required by libxfce4panel-2.0.pc
-    (inputs
-     (list tzdata ;; For fix-tzdata-path phase only.
-           exo
-           xfconf
-           garcon
-           gtk-layer-shell
-           libwnck
-           libxfce4ui
-           libxfce4windowing))
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for panel-marshal.h, etc
+              "--enable-gtk-doc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'fix-tzdata-path
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* (string-append "plugins/clock/clock.c")
+                         (("/usr/share/zoneinfo")
+                          (search-input-directory inputs "share/zoneinfo"))))))))
+    (native-inputs (list xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by libxfce4panel-2.0.pc
+                             libxfce4util)) ;required by libxfce4panel-2.0.pc
+    (inputs (list tzdata ;For fix-tzdata-path phase only.
+                  exo
+                  xfconf
+                  garcon
+                  gtk-layer-shell
+                  libwnck
+                  libxfce4ui
+                  libxfce4windowing))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DATA_DIRS")
             (files '("share")))))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-panel/")
     (synopsis "Xfce desktop panel")
     (description
      "Desktop panel for Xfce, which contains program launchers, window buttons,
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 10/16] gnu: tumbler: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:c659e930b6ed1aba94e8a793a3fdb731a85ed10e.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (tumbler)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I993fda97eeea44c529cc04359f2e2ab36068962c

---

gnu/packages/xfce.scm | 58 +++++++++++++++++--------------------------

1 file changed, 23 insertions(+), 35 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 71836970ba..0dbde8b08e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -375,42 +375,30 @@ (define-public tumbler
   (package
     (name "tumbler")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "tumbler/" (version-major+minor version) "/"
-                                  "tumbler-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "102qwa8an7wdqf0hrqd5k51aiib3zww0iizsigllfrcjamyn9cbl"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/tumbler")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18bp1ckv6mzbxhbk7aqp2mxbni1pw8hv8rzxmc9xx488dxs0qq8s"))))
     (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 and gdbus-codegen
-    (propagated-inputs
-     (list glib))                 ; required by tumbler-1.pc
-    (inputs
-     (list dbus
-           gdk-pixbuf
-           cairo ;; Needed for pdf thumbnails (poppler-glibc.pc)
-           freetype
-           libjpeg-turbo
-           libgsf
-           libxfce4util
-           poppler
-           ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
-           ;; ("gstreamer" ,gstreamer)
-           ))
-    (home-page "https://www.xfce.org/")
+    (native-inputs (list xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by tumbler-1.pc
+    (inputs (list dbus
+                  gdk-pixbuf
+                  cairo ;Needed for pdf thumbnails (poppler-glibc.pc)
+                  freetype
+                  libjpeg-turbo
+                  libgsf
+                  libxfce4util
+                  poppler
+                  ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+                  ;; ("gstreamer" ,gstreamer)
+                  ))
+    (home-page "https://docs.xfce.org/xfce/tumbler/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
      "Tumbler is a D-Bus service for applications to request thumbnails for
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 13/16] gnu: xfce4-clipman-plugin: Update to 1.6.7.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:7c7ba02f6d00917f9a30372d78690833da324dfd.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.7.

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[inputs]: Add wlr-protocols.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ic3835b31ac0db45b372cc679b48f17d6fd0b79e1

---

gnu/packages/xfce.scm | 31 ++++++++++++++++---------------

1 file changed, 16 insertions(+), 15 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a68600d2d2..d065020f9a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -517,22 +517,23 @@ (define-public xfce4-battery-plugin
 (define-public xfce4-clipman-plugin
   (package
     (name "xfce4-clipman-plugin")
-    (version "1.6.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-clipman-plugin/" (version-major+minor version) "/"
-                                  "xfce4-clipman-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "083i9pbcqjkdzzjx055ld4gd4gn3xnc3rn10vpsqv1vg01dlgb88"))))
+    (version "1.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0spg9mdlcx98kjisv0c9axp7knhh8am5dqfa2lspj1jbgvah1dwi"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config))
-    (inputs
-     (list exo libxfce4ui libxtst xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list xfce4-dev-tools))
+    (inputs (list exo libxfce4ui libxtst wlr-protocols xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/")
     (synopsis "Clipboard manager for Xfce")
     (description
      "Clipman is a clipboard manager for Xfce.  It keeps the clipboard contents
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 12/16] gnu: xfce4-battery-plugin: Update to 1.1.6.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:e3869bb495e06c2b2a0563431b1601c838053985.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.6.

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I9359731b564a225450cf314b762d51564cce370e

---

gnu/packages/xfce.scm | 27 +++++++++++++++------------

1 file changed, 15 insertions(+), 12 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7aa739d0d1..a68600d2d2 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -490,20 +490,23 @@ (define-public xfce4-panel
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "04z2bic6c2cgl6wy4qrhfdigb6c2hsxnqraa20k1xvi0nfzk68km"))))
+    (version "1.1.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bd912j22pf6rmqvkc80g5axjil88pbzxqa68krw65l11v73icmm"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list glib gtk+ libxfce4util libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/")
     (synopsis "Battery monitor panel plugin for Xfce4")
     (description
      "A battery monitor panel plugin for Xfce4, compatible with APM and ACPI.")
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 14/16] gnu: xfce4-pulseaudio-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:02e7185d4b511bc218a58266ba7b5188777b2a1f.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Remove pavucontrol.

Change-Id: Ib633e09831f195d03e4c1a1ed4c7d6e080595b5e

---

gnu/packages/xfce.scm | 38 +++++++++++++++++++++-----------------

1 file changed, 21 insertions(+), 17 deletions(-)

Toggle diff (53 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d065020f9a..167002d3cb 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -548,25 +548,29 @@ (define-public xfce4-pulseaudio-plugin
     (version "0.4.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-pulseaudio-plugin/"
-                           (version-major+minor version) "/"
-                           "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "16n9vnzwi1j90yxcf4c0lkyqkl969yj6hiby3cvd0j18zcapd050"))))
+        (base32 "1hmajys3g56xlpja9hx0rvap54bw0g6vmirh068zn5004wg7i6kc"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config dbus-glib dbus))
-    (inputs
-     (list exo
-           keybinder
-           libnotify
-           libxfce4ui
-           pavucontrol
-           pulseaudio
-           xfce4-panel))
-    (home-page "https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list dbus
+                         dbus-glib
+                         xfce4-dev-tools))
+    (inputs (list exo
+                  keybinder
+                  libnotify
+                  libxfce4ui
+                  pulseaudio
+                  xfce4-panel))
+    (home-page
+     "https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
     (synopsis "PulseAudio panel plugin for Xfce")
     (description
      "Xfce PulseAudio plugin is a plugin for the Xfce panel which provides a
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 15/16] gnu: elementary-xfce-icon-theme: Use new style.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:e6748963541e7baf5dd50ba2bdcb12086b6df310.1735568455.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (elementary-xfce-icon-theme)[arguments]: Use G-Expressions.

Change-Id: I70ad49c16c30d519c0745462e33c86ad459c5b1b

---

gnu/packages/xfce.scm | 41 ++++++++++++++++++++---------------------

1 file changed, 20 insertions(+), 21 deletions(-)

Toggle diff (58 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 167002d3cb..4d34d6930f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -275,31 +275,30 @@ (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
     (version "0.20")
-    (source (origin
-              (method git-fetch)
-              (uri
-               (git-reference
-                (url "https://github.com/shimmerproject/elementary-xfce")
-                (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shimmerproject/elementary-xfce")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no check target
-       #:make-flags '("CC=gcc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t)))))
-    (native-inputs
-     (list gtk+ optipng pkg-config))
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list "CC=gcc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'make-git-checkout-writable
+                     (lambda _
+                       (for-each make-file-writable
+                                 (find-files ".")) #t)))))
+    (native-inputs (list gtk+ optipng pkg-config))
     (home-page "https://shimmerproject.org/")
     (synopsis "Elementary icons extended and maintained for Xfce")
-    (description "This is a fork of the upstream elementary project.  This icon
+    (description
+     "This is a fork of the upstream elementary project. This icon
 theme is supposed to keep everything working for Xfce, but gets updates from
 upstream occasionally.")
     (license gpl2+)))
-- 
2.46.0

iyzsong wrote 3 days ago

[PATCH v3 16/16] gnu: catfish: Update to 4.20.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:3727f43bdf685e7f1e539833e99942468f387807.1735568455.git.iyzsong@member.fsf.org

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

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[build-system]: Switch to meson-build-system

[arguments]: Simpify phases.

[native-inputs]: Add desktop-file-utils, gettext-minil (list gtk+ "bin") and python.

Remove intltool and python-distutils-extra.

Change-Id: Ieca091640912cfbe50d13623bcc0866aa5e3514c

---

gnu/packages/xfce.scm | 87 +++++++++++++++++++++----------------------

1 file changed, 43 insertions(+), 44 deletions(-)

Toggle diff (108 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 4d34d6930f..6873aa3d4a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -81,7 +81,7 @@ (define-module (gnu packages xfce)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -220,50 +220,49 @@ (define-public libxfce4ui
 (define-public catfish
   (package
     (name "catfish")
-    (version "4.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "catfish/" (version-major+minor version)
-                                  "/catfish-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx"))))
-    (build-system python-build-system)
+    (version "4.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/apps/catfish")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-command-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "catfish/CatfishSearchEngine.py"
-               (("'which'") (string-append "'" (which "which") "'")))
-             (substitute* "catfish/CatfishWindow.py"
-               (("xdg-mime") (which "xdg-mime"))
-               (("xdg-open") (which "xdg-open")))))
-         ;; setup.py script does not support one of the Python build
-         ;; system's default flags, "--single-version-externally-managed".
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "python" "setup.py" "install"
-                     (string-append "--prefix=" (assoc-ref outputs "out"))
-                     "--root=/")))
-         ;; The check failed to spawn a message bus without /etc/machine-id.
-         (delete 'sanity-check)
-         (add-after 'install 'wrap-program
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/bin/catfish")
-                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
-                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config python-distutils-extra intltool))
-    (inputs
-     (list bash-minimal which xfconf xdg-utils))
-    (propagated-inputs
-     (list gtk+ python-dbus python-pexpect python-pycairo
-           python-pygobject))
-    (home-page "https://docs.xfce.org/apps/catfish/start")
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-command-paths
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "catfish/CatfishSearchEngine.py"
+                         (("'which'")
+                          (string-append "'"
+                                         (which "which") "'")))
+                       (substitute* "catfish/CatfishWindow.py"
+                         (("xdg-mime")
+                          (which "xdg-mime"))
+                         (("xdg-open")
+                          (which "xdg-open")))))
+                   (add-after 'install 'wrap-program
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out")))
+                         (wrap-program (string-append out "/bin/catfish")
+                           `("GUIX_PYTHONPATH" =
+                             (,(getenv "GUIX_PYTHONPATH")))
+                           `("GI_TYPELIB_PATH" =
+                             (,(getenv "GI_TYPELIB_PATH"))))))))
+      #:tests? #f))
+    (native-inputs (list desktop-file-utils ;for update-desktop-database
+                         gettext-minimal
+                         (list gtk+ "bin") ;for gtk-update-icon-cache
+                         pkg-config
+                         python))
+    (inputs (list bash-minimal which xfconf xdg-utils))
+    (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo
+                             python-pygobject))
+    (home-page "https://docs.xfce.org/apps/catfish/")
     (synopsis "File searching tool for Xfce")
     (description
      "Catfish is a file searching tool for Linux and Unix.  The interface is
-- 
2.46.0

??? wrote 3 days ago

Re: [bug#75146] [PATCH v0 00/15] XFCE: Move source from generated archive to git.

Recipients:(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)

Message-ID:877c7hntay.fsf@envs.net

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (16 lines)> ??? via Guix-patches via <guix-patches@gnu.org> writes:
>
>> Ashvith Shetty <ashvithshetty10@gmail.com> writes:
>>
>>> This patch series moves the source for XFCE applications and plugins 
>>> from the pre-generated archive file to their git source for quality 
>>> reasons (inconsistency between git and archive builds, 
>>> missing files in generated archive, etc).
>>
>> Hello, could you explain more about those inconsistency and missing
>> files?  Build from git is more expensive than tarballs, as it download
>> more and need more dependencies, so I think we should avoid it if
>
> I think using git sources makes it easier to test and develop xfce, likes
> test pr, and to avoid things like XZ Utils backdoor.

Good points, thanks.

??? wrote 3 days ago

Recipients:(name . Ashvith Shetty)(address . ashvithshetty10@gmail.com)

Message-ID:8734i5nt44.fsf@envs.net

??? <iyzsong@envs.net> writes:

Toggle quote (32 lines)> Ashvith Shetty <ashvithshetty10@gmail.com> writes:
>
>> Hello,
>>
>> On Mon, Dec 30, 2024 at 2:49?AM ??? <iyzsong@envs.net> wrote:
>>
>>> Hello, could you explain more about those inconsistency and missing
>>> files?
>>
>> For example, Thunar's `make check` did not run tests for the archive, as 
>> opposed to git as the source. Only after switching to git was I able to 
>> catch how one of  the abicheck tests were broken. Now, this has been 
>> resolved in a future version, but given how it would be highly unlikely to 
>> catch these issues via archive as the source, I thought that it was better if 
>> we made use of git instead.
>>
>>> Build from git is more expensive than tarballs, as it download
>>> more and need more dependencies.
>>
>> Another issue with archive as the source is that the archive includes files that 
>> have been generated on another system via the git repository. For git, since 
>> we are building directly from the repo itself, I believe that it would be a right 
>> pick. 
>
> So switch from generated talballs to git sources will enable us to:
> - run more tests
> - test versions easier (with guix build --with-commit=...)
> - trust more (generate manpages and gtk documents ourselves etc.)
>
> I'll do some rework (split commits, adjust commit message) based on your
> patches later, thanks!

I had sent updates via v3, which add autotools, automake, etc. to
propagated-inputs of xfce4-dev-tools to avoid add them to every
packages.  There are still many xfce packages remain to
be updated.  @Ashvith do you want to continue the work?  or I can
do them later..

iyzsong wrote 2 days ago

[PATCH v4 00/68] xfce updates

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:cover.1735627083.git.iyzsong@member.fsf.org

From: ??? <iyzsong@member.fsf.org>

Hello, I had:
  * update xfce packages to their latest version
  * update home-page to docs.xfce.org
  * switch source to use git-fetch instead of tarballs
  * mark xfce4-statusnotifier-plugin superseded by xfce4-panel,
    we can remove it 1 month later with gtk-xfce-engine.


Ashvith Shetty (14):
  gnu: xfce4-dev-tools: Switch to git source.
  gnu: libxfce4util: Switch to git source.
  gnu: xfconf: Switch to git source.
  gnu: libxfce4ui: Switch to git source.
  gnu: libxfce4windowing: Switch to git source.
  gnu: exo: Switch to git source.
  gnu: garcon: Switch to git source.
  gnu: tumbler: Switch to git source.
  gnu: xfce4-panel: Switch to git source.
  gnu: xfce4-battery-plugin: Update to 1.1.6.
  gnu: xfce4-clipman-plugin: Update to 1.6.7.
  gnu: xfce4-pulseaudio-plugin: Switch to git source.
  gnu: elementary-xfce-icon-theme: Use new style.
  gnu: catfish: Update to 4.20.0.

Sou Bunnbu (???) (54):
  gnu: xfce4-dev-tools: Add more propagated inputs.
  gnu: xfce4-dev-tools: Fix XDT_CHECK_PACKAGE_BINARY for non-absolute
    paths.
  gnu: xfce4-whiskermenu-plugin: Switch to git source.
  gnu: xfce4-xkb-plugin: Update to 0.8.5.
  gnu: xfce4-appfinder: Switch to git source.
  gnu: xfce4-session: Switch to git source.
  gnu: xfce4-settings: Switch to git source.
  gnu: thunar: Switch to git source.
  gnu: thunar-volman: Switch to git source.
  gnu: thunar-archive-plugin: Update to 0.5.3.
  gnu: thunar-shares-plugin: Switch to git source.
  gnu: thunar-media-tags-plugin: Update to 0.5.0.
  gnu: thunar-vcs-plugin: Update to 0.3.0.
  gnu: thunarx-python: Switch to git source.
  gnu: xfwm4: Switch to git source.
  gnu: xfdesktop: Switch to git source.
  gnu: gigolo: Update to 0.5.4.
  gnu: parole: Update to 4.18.2.
  gnu: xfce4-terminal: Update to 1.1.4.
  gnu: xfce4-dict: Switch to git source.
  gnu: xfdashboard: Switch to git source.
  gnu: xfce4-power-manager: Switch to git source.
  gnu: ristretto: Update to 0.13.3.
  gnu: xfce4-taskmanager: Update to 1.5.8.
  gnu: orage: Switch to git source.
  gnu: xfce4-notifyd: Switch to git source.
  gnu: xfce4-notifyd: Enable sound and wayland support.
  gnu: xfburn: Switch to git source.
  gnu: mousepad: Switch to git source.
  gnu: xfce4-screenshooter: Switch to git source.
  gnu: xfce4-screensaver: Update to 4.18.4.
  gnu: xfce4-volumed-pulse: Update to 0.2.5.
  gnu: xfce4-cpugraph-plugin: Update to 1.2.11.
  gnu: xfce4-eyes-plugin: Update to 4.6.2.
  gnu: xfce4-datetime-plugin: Switch to git source.
  gnu: xfce4-calculator-plugin: Update to 0.7.3.
  gnu: xfce4-cpufreq-plugin: Update to 1.2.9.
  gnu: xfce4-diskperf-plugin: Update to 2.7.1.
  gnu: xfce4-fsguard-plugin: Update to 1.1.4.
  gnu: xfce4-genmon-plugin: Update to 4.2.1.
  gnu: xfce4-mailwatch-plugin: Update to 1.3.2.
  gnu: xfce4-mpc-plugin: Update to 0.5.5.
  gnu: xfce4-mount-plugin: Update to 1.1.7.
  gnu: xfce4-netload-plugin: Update to 1.4.2.
  gnu: xfce4-places-plugin: Update to 1.8.4.
  gnu: xfce4-smartbookmark-plugin: Update to 0.5.3.
  gnu: xfce4-statusnotifier-plugin: Superseded by xfce4-panel.
  gnu: xfce4-stopwatch-plugin: Update to 0.5.2.
  gnu: xfce4-systemload-plugin: Update to 1.3.3.
  gnu: xfce4-time-out-plugin: Update to 1.1.4.
  gnu: xfce4-timer-plugin: Update to 1.7.3.
  gnu: xfce4-verve-plugin: Update to 2.0.4.
  gnu: xfce4-wavelan-plugin: Update to 0.6.4.
  gnu: xfce4-weather-plugin: Switch to git source.

 gnu/packages/xfce.scm | 2007 +++++++++++++++++++++--------------------
 1 file changed, 1014 insertions(+), 993 deletions(-)


base-commit: 121e96dca273ab407df11725da0026ee34abdf79
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 01/68] gnu: xfce4-dev-tools: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)

Message-ID:9998f582163c7c335786b23bd282a43c60734652.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools):

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add autoconf, automake, docbook-xsl and libtool.

Change-Id: Ib94dc5750888de8674409363131e89944ad1e7d1

Signed-off-by: ??? <iyzsong@member.fsf.org>

---

gnu/packages/xfce.scm | 39 +++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a36612dd3a..8c86972f6e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -36,11 +36,13 @@ (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages apr)
+  #:use-module (gnu packages autotools)
   #: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 docbook)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages freedesktop)
@@ -2310,23 +2312,28 @@ (define-public xfce4-dev-tools
   (package
     (name "xfce4-dev-tools")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-dev-tools/" (version-major+minor version) "/"
-                                  "xfce4-dev-tools-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1ak68k6r0q6dh3knc3vxqvkvkw54f916wfrsm8g7gk0fiah3kfhz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-dev-tools")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k7qj7vka2ys1ld4bfkdvsbxhpjnvb8lc0awnn5b1c34zxmwsivr"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list meson
-           pkg-config
-           libxslt))
-    (inputs
-     (list glib python))
-    (propagated-inputs
-     (list `(,glib "bin")))    ; 'glib-genmarshal' required by 'xdt-depends.m4'
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode"))) ;for xdt-csource.1
+    (native-inputs (list autoconf
+                         automake
+                         docbook-xsl
+                         libtool
+                         libxslt
+                         meson
+                         pkg-config))
+    (inputs (list glib python))
+    (propagated-inputs (list (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

iyzsong wrote 2 days ago

[PATCH v4 02/68] gnu: xfce4-dev-tools: Add more propagated inputs.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:b5cdc8a55b46f9d2f880b6f6233ed2ea518fc338.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools)[propagated-inputs]: Add

autoconf, automake, gtk-doc, intltool, libtool and pkg-config.

Change-Id: Iaf5830d3948720641f30f28aa415c884fbfba8aa

---

gnu/packages/xfce.scm | 8 +++++++-

1 file changed, 7 insertions(+), 1 deletion(-)

Toggle diff (21 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8c86972f6e..83d78bfc19 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2333,7 +2333,13 @@ (define-public xfce4-dev-tools
                          meson
                          pkg-config))
     (inputs (list glib python))
-    (propagated-inputs (list (list glib "bin"))) ;'glib-genmarshal' required by 'xdt-depends.m4'
+    (propagated-inputs
+     (list
+      ;; required by 'xdt-autogen'
+      autoconf automake gtk-doc intltool libtool
+      ;; required by 'xdt-depends.m4'
+      (list glib "bin") ;for glib-genmarshal
+      pkg-config))
     (home-page "https://docs.xfce.org/xfce/xfce4-dev-tools/")
     (synopsis "Xfce developer tools")
     (description
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 03/68] gnu: xfce4-dev-tools: Fix XDT_CHECK_PACKAGE_BINARY for non-absolute paths.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:f8be9f8046517584e594d626cdfafc99ebf1b444.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dev-tools)[arguments]: Add

'fix-XDT_CHECK_PACKAGE_BINARY phase.

Change-Id: I944428764b821da2958b42df3ae743e79f25ce0e

---

gnu/packages/xfce.scm | 11 ++++++++++-

1 file changed, 10 insertions(+), 1 deletion(-)

Toggle diff (24 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 83d78bfc19..175c613a16 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2324,7 +2324,16 @@ (define-public xfce4-dev-tools
     (build-system gnu-build-system)
     (arguments
      (list
-      #:configure-flags #~(list "--enable-maintainer-mode"))) ;for xdt-csource.1
+      #:configure-flags #~(list "--enable-maintainer-mode") ;for xdt-csource.1
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-XDT_CHECK_PACKAGE_BINARY
+            (lambda _
+              (substitute* "m4macros/xdt-depends.m4"
+                ;; Our pkg-config doesn't report absolute paths for this
+                ;; executable check.
+                (("-a -x \"\\$\\$1\"")
+                 "-a -x `command -v \"$$1\"`")))))))
     (native-inputs (list autoconf
                          automake
                          docbook-xsl
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 04/68] gnu: libxfce4util: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:5353f24b246f2a8567dff1aa9cae4d0d9eaabe7e.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4util)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I3acb4b9237f26e50702c28139f68a7a2082ab60b

---

gnu/packages/xfce.scm | 31 +++++++++++++++++++------------

1 file changed, 19 insertions(+), 12 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 175c613a16..cce60feeca 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -116,19 +116,26 @@ (define-public libxfce4util
   (package
     (name "libxfce4util")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "libxfce4util/" (version-major+minor version)
-                                  "/" name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "14mml8rdj16gkax92h89vcgf6sphp7v3jf5r7n1858lmk6f3yj91"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0r24hx200jvixn8rhcg0cbvv6b3jc4hj1iw2bkvmrcf74m4ck9nj"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config gobject-introspection intltool vala))
-    (propagated-inputs (list glib)) ; required by libxfce4util-1.0.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for libxfce4util-visibility.c
+              "--enable-gtk-doc")))
+    (native-inputs (list gobject-introspection
+                         vala
+                         xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by libxfce4util-1.0.pc
+    (home-page "https://docs.xfce.org/xfce/libxfce4util/")
     (synopsis "Basic utility library for Xfce")
     (description
      "A general-purpose utility library with core application support for the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 05/68] gnu: xfconf: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:6b771bf34112b9929d7b85a27eb279e1b95126cb.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfconf)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Remove 'patch-configure phase. Simpify 'check phase.

Add '--enable-gtk-doc' to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ib7ea144d0c788a287479ebd8a22c3f9504fe8ebf

---

gnu/packages/xfce.scm | 69 +++++++++++++++++--------------------------

1 file changed, 27 insertions(+), 42 deletions(-)

Toggle diff (87 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index cce60feeca..35ce1b20f6 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -146,53 +146,38 @@ (define-public xfconf
   (package
     (name "xfconf")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfconf/" (version-major+minor version) "/"
-                                  "xfconf-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1zbyar9hzvqf498z1a3q6kf6r77a6qm9x2gw6p7i6sviy5h3ri4b"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfconf")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1k4d2gg77p3jdr0rankz2mv50hy7ddf5xl32si1mdby1wvpa9r2k"))))
     (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 _
-             (substitute* "tests/Makefile.in"
-               (("tests-end") ""))))
-         (add-after 'install 'custom-check
-           (lambda _
-             (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
-             ;; Run test-suite under a dbus session.
-             (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
-                     (string-append %output "/share"))
-             ;; For the missing '/etc/machine-id'.
-             (setenv "DBUS_FATAL_WARNINGS" "0")
-             (invoke "dbus-launch" "make" "check")))
-         (delete 'check))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin") ;; for gdbus-codegen
-           gobject-introspection
-           vala
-           dbus))
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda _
+              (setenv "HOME"
+                      (getenv "TMPDIR")) ;xfconfd requires a writable HOME
+              ;; For the missing '/etc/machine-id'.
+              (setenv "DBUS_FATAL_WARNINGS" "0")
+              ;; Run test-suite under a dbus session.
+              (invoke "dbus-launch" "make" "check"))))))
+    (native-inputs (list dbus
+                         gobject-introspection
+                         vala
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      (list glib))
-    (inputs
-     (list libxfce4util))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4util))
+    (home-page "https://docs.xfce.org/xfce/xfconf/")
     (synopsis "Configuration storage and query system for Xfce")
     (description
      "Settings daemon for Xfce, implemented as a D-Bus-based configuration
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 06/68] gnu: libxfce4ui: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:6dbfe138274e85c6c44867d00dc3b470cac9f4bd.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4ui)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I9ca360cec30660b85cea95b494df9dae1767f3ab

---

gnu/packages/xfce.scm | 38 ++++++++++++++++++++------------------

1 file changed, 20 insertions(+), 18 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 35ce1b20f6..6705abb273 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -188,27 +188,29 @@ (define-public libxfce4ui
   (package
     (name "libxfce4ui")
     (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
-                "1vpafvmn2x95n0d8dmr6pp81w8bw2ksicp6dvsm7a0zjhilrks3m"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4ui")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ps8sq8g43dx12qp0shrdb45bjrfhhgkziscj5jnrzfhy6j9mqrk"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--with-vendor-info=GNU Guix")))
-    (native-inputs
-     (list pkg-config intltool gobject-introspection))
-    (propagated-inputs
-     (list gtk+    ; required by libxfce4ui-2.pc
-           ;; libxfce4kbd-private-3.pc refers to all these.
-           libxfce4util
-           xfconf))
+     (list #:configure-flags
+           #~(list "--with-vendor-info=GNU Guix"
+                   "--enable-maintainer-mode" ; for about-dialog-ui.h, etc.
+                   "--enable-gtk-doc")))
+    (native-inputs (list gobject-introspection xfce4-dev-tools))
+    (propagated-inputs (list
+                        ;; required by libxfce4ui-2.pc
+                        gtk+
+                        ;; libxfce4kbd-private-3.pc refers to all these.
+                        libxfce4util xfconf))
     (inputs (list libgtop libice libsm startup-notification))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/libxfce4ui/")
     (synopsis "Widgets library for Xfce")
     (description
      "Libxfce4ui is the replacement of the old libxfcegui4 library.  It is used
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 07/68] gnu: libxfce4windowing: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:fc38817e1636f7f314ae09461ff1b8b4464f4d4d.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (libxfce4windowing)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-gtk-doc" to configure-flags.

[inputs]: Add wlr-protocols.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I995433864b2de45cabcafd541ef39af4c6aab320

---

gnu/packages/xfce.scm | 29 +++++++++++++++++------------

1 file changed, 17 insertions(+), 12 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6705abb273..bd6cc83a19 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -411,23 +411,28 @@ (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"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/libxfce4windowing")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "158jhw5kq3dzmgmy9wr9fgspwcdq84r6hjfnvbn48wx9d2q9pwdp"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config xfce4-dev-tools))
-    (propagated-inputs (list gtk+))     ; required by libxfce4windowing-0.pc
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")))
+    (native-inputs (list 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/")
+                  wayland-protocols
+                  wlr-protocols))
+    (home-page "https://docs.xfce.org/xfce/libxfce4windowing/")
     (synopsis "Windowing concept abstraction library for X11 and Wayland")
     (description
      "Libxfce4windowing is an abstraction library that attempts to present
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 08/68] gnu: exo: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:2fe0496349338329f1859ca597dae29c99e1c8c9.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (exo)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

Change-Id: Ic32658dfba670e44916d63e186fc61f0e73f3124

---

gnu/packages/xfce.scm | 32 +++++++++++++++++++-------------

1 file changed, 19 insertions(+), 13 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bd6cc83a19..fcd5363957 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -308,23 +308,29 @@ (define-public exo
   (package
     (name "exo")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "exo/" (version-major+minor version) "/"
-                                  "exo-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1387xib59z9m43z772lz3kwjrcd6id9zs5yr3khgs7jz4jczfxs2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/exo")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zbj5q0ih5kvxvays4ajjsmxm2938jmn4648062agxxjl8asqlcs"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for exo-enum-types.c, etc.
+              "--enable-gtk-doc")))
+    (native-inputs (list docbook-xsl
+                         libxslt
+                         xfce4-dev-tools))
     (propagated-inputs
      ;; exo-2.pc refers to all these.
      (list gtk+ libxfce4util))
-    (inputs
-     (list libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (inputs (list libxfce4ui))
+    (home-page "https://docs.xfce.org/xfce/exo/")
     (synopsis "Extension library for Xfce")
     (description
      "An extension library to Xfce.  While Xfce comes with quite a few libraries
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 09/68] gnu: garcon: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:0529bd18e54562db3d253859b398fb5b63c38dfa.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (garcon)[source]: Use git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-gtk-doc" to configure-flags.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

Change-Id: I2eeb20ad8bbbeb9fc7e38b1dff89974c0d5b31f0

---

gnu/packages/xfce.scm | 33 +++++++++++++++++++--------------

1 file changed, 19 insertions(+), 14 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fcd5363957..9cdf67b75c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -343,21 +343,26 @@ (define-public garcon
   (package
     (name "garcon")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "garcon/" (version-major+minor version) "/"
-                                  "garcon-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "13ysx9gl22a5rjzl4m3v0zm3hpii1jy38b5lz3fs971h29y53f3z"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/garcon")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "076pdyssl5lhm88s2xx94w3rk6glcc4kgfl3jqd6704hpl6n9rii"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list `(,glib "bin") gobject-introspection intltool pkg-config))
-    (propagated-inputs
-     (list gtk+ ; required by garcon-gtk3-1.pc
-           libxfce4ui))     ; required by garcon-gtk3-1.pc
-    (home-page "https://www.xfce.org/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-gtk-doc")))
+    (native-inputs (list docbook-xsl
+                         gobject-introspection
+                         libxslt
+                         xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by garcon-gtk3-1.pc
+                             libxfce4ui)) ;required by garcon-gtk3-1.pc
+    (home-page "https://docs.xfce.org/xfce/garcon/")
     (synopsis "Implementation of the freedesktop.org menu specification")
     (description
      "Garcon is a freedesktop.org compliant menu implementation based on
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 10/68] gnu: tumbler: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:682aef2de2b325fa8aea9f4694d37b0bc5a85dca.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (tumbler)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I993fda97eeea44c529cc04359f2e2ab36068962c

---

gnu/packages/xfce.scm | 58 +++++++++++++++++--------------------------

1 file changed, 23 insertions(+), 35 deletions(-)

Toggle diff (72 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 9cdf67b75c..230a2788a9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -375,42 +375,30 @@ (define-public tumbler
   (package
     (name "tumbler")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "tumbler/" (version-major+minor version) "/"
-                                  "tumbler-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "102qwa8an7wdqf0hrqd5k51aiib3zww0iizsigllfrcjamyn9cbl"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/tumbler")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18bp1ckv6mzbxhbk7aqp2mxbni1pw8hv8rzxmc9xx488dxs0qq8s"))))
     (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 and gdbus-codegen
-    (propagated-inputs
-     (list glib))                 ; required by tumbler-1.pc
-    (inputs
-     (list dbus
-           gdk-pixbuf
-           cairo ;; Needed for pdf thumbnails (poppler-glibc.pc)
-           freetype
-           libjpeg-turbo
-           libgsf
-           libxfce4util
-           poppler
-           ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
-           ;; ("gstreamer" ,gstreamer)
-           ))
-    (home-page "https://www.xfce.org/")
+    (native-inputs (list xfce4-dev-tools))
+    (propagated-inputs (list glib)) ;required by tumbler-1.pc
+    (inputs (list dbus
+                  gdk-pixbuf
+                  cairo ;Needed for pdf thumbnails (poppler-glibc.pc)
+                  freetype
+                  libjpeg-turbo
+                  libgsf
+                  libxfce4util
+                  poppler
+                  ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+                  ;; ("gstreamer" ,gstreamer)
+                  ))
+    (home-page "https://docs.xfce.org/xfce/tumbler/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
      "Tumbler is a D-Bus service for applications to request thumbnails for
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 11/68] gnu: xfce4-panel: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:47d2a57cffcbc40dfc7b989c23f78a2a109da8d5.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-panel)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to configure-flags.

Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ic5b4a82b1d14e24b11efac7f655ddb8f43a0b9da

---

gnu/packages/xfce.scm | 69 +++++++++++++++++++------------------------

1 file changed, 31 insertions(+), 38 deletions(-)

Toggle diff (88 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 230a2788a9..28d2a8478c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -443,50 +443,43 @@ (define-public xfce4-panel
   (package
     (name "xfce4-panel")
     (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
-                "1f235lwmqavvsay9899gm7p2z3fdha6qgx05wczikhhnbmgwsczz"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/xfce/xfce4-panel")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "049dhis9106zig5awr9ppnxm357d93z842h015pd8rni9sayc7m0"))))
     (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")
-               (("/usr/share/zoneinfo")
-                (search-input-directory inputs "share/zoneinfo"))))))))
-    (native-inputs
-     (list pkg-config
-           intltool
-           `(,glib "bin")))
-    (propagated-inputs
-     (list gtk+ ; required by libxfce4panel-2.0.pc
-           libxfce4util)) ; required by libxfce4panel-2.0.pc
-    (inputs
-     (list tzdata ;; For fix-tzdata-path phase only.
-           exo
-           xfconf
-           garcon
-           gtk-layer-shell
-           libwnck
-           libxfce4ui
-           libxfce4windowing))
+     (list
+      #:configure-flags
+      #~(list "--enable-maintainer-mode" ;for panel-marshal.h, etc
+              "--enable-gtk-doc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'fix-tzdata-path
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* (string-append "plugins/clock/clock.c")
+                         (("/usr/share/zoneinfo")
+                          (search-input-directory inputs "share/zoneinfo"))))))))
+    (native-inputs (list xfce4-dev-tools))
+    (propagated-inputs (list gtk+ ;required by libxfce4panel-2.0.pc
+                             libxfce4util)) ;required by libxfce4panel-2.0.pc
+    (inputs (list tzdata ;For fix-tzdata-path phase only.
+                  exo
+                  xfconf
+                  garcon
+                  gtk-layer-shell
+                  libwnck
+                  libxfce4ui
+                  libxfce4windowing))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DATA_DIRS")
             (files '("share")))))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-panel/")
     (synopsis "Xfce desktop panel")
     (description
      "Desktop panel for Xfce, which contains program launchers, window buttons,
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 13/68] gnu: xfce4-clipman-plugin: Update to 1.6.7.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:0bf8b00f1d2f197622d2991bbf4d71ca79c7e1ed.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-clipman-plugin): Update to 1.6.7.

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[inputs]: Add wlr-protocols.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ic3835b31ac0db45b372cc679b48f17d6fd0b79e1

---

gnu/packages/xfce.scm | 31 ++++++++++++++++---------------

1 file changed, 16 insertions(+), 15 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 1e7917917d..e9e44df395 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -517,22 +517,23 @@ (define-public xfce4-battery-plugin
 (define-public xfce4-clipman-plugin
   (package
     (name "xfce4-clipman-plugin")
-    (version "1.6.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-clipman-plugin/" (version-major+minor version) "/"
-                                  "xfce4-clipman-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "083i9pbcqjkdzzjx055ld4gd4gn3xnc3rn10vpsqv1vg01dlgb88"))))
+    (version "1.6.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0spg9mdlcx98kjisv0c9axp7knhh8am5dqfa2lspj1jbgvah1dwi"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config))
-    (inputs
-     (list exo libxfce4ui libxtst xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list xfce4-dev-tools))
+    (inputs (list exo libxfce4ui libxtst wlr-protocols xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/")
     (synopsis "Clipboard manager for Xfce")
     (description
      "Clipman is a clipboard manager for Xfce.  It keeps the clipboard contents
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 12/68] gnu: xfce4-battery-plugin: Update to 1.1.6.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:7ea0f36053e8dd7dde3204a7f2db8eace591e917.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.6.

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I9359731b564a225450cf314b762d51564cce370e

---

gnu/packages/xfce.scm | 27 +++++++++++++++------------

1 file changed, 15 insertions(+), 12 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 28d2a8478c..1e7917917d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -490,20 +490,23 @@ (define-public xfce4-panel
 (define-public xfce4-battery-plugin
   (package
     (name "xfce4-battery-plugin")
-    (version "1.1.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "04z2bic6c2cgl6wy4qrhfdigb6c2hsxnqraa20k1xvi0nfzk68km"))))
+    (version "1.1.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bd912j22pf6rmqvkc80g5axjil88pbzxqa68krw65l11v73icmm"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list glib gtk+ libxfce4util libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/")
     (synopsis "Battery monitor panel plugin for Xfce4")
     (description
      "A battery monitor panel plugin for Xfce4, compatible with APM and ACPI.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 14/68] gnu: xfce4-pulseaudio-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:2458f40949c399525bd52fee59f58f1ac380c469.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin)[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Remove pavucontrol.

Change-Id: Ib633e09831f195d03e4c1a1ed4c7d6e080595b5e

---

gnu/packages/xfce.scm | 38 +++++++++++++++++++++-----------------

1 file changed, 21 insertions(+), 17 deletions(-)

Toggle diff (53 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e9e44df395..3520ceaba4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -548,25 +548,29 @@ (define-public xfce4-pulseaudio-plugin
     (version "0.4.9")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-pulseaudio-plugin/"
-                           (version-major+minor version) "/"
-                           "xfce4-pulseaudio-plugin-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url
+              "https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "16n9vnzwi1j90yxcf4c0lkyqkl969yj6hiby3cvd0j18zcapd050"))))
+        (base32 "1hmajys3g56xlpja9hx0rvap54bw0g6vmirh068zn5004wg7i6kc"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list intltool pkg-config dbus-glib dbus))
-    (inputs
-     (list exo
-           keybinder
-           libnotify
-           libxfce4ui
-           pavucontrol
-           pulseaudio
-           xfce4-panel))
-    (home-page "https://git.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
+    (arguments
+     (list
+      #:configure-flags #~(list "--enable-maintainer-mode")))
+    (native-inputs (list dbus
+                         dbus-glib
+                         xfce4-dev-tools))
+    (inputs (list exo
+                  keybinder
+                  libnotify
+                  libxfce4ui
+                  pulseaudio
+                  xfce4-panel))
+    (home-page
+     "https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/")
     (synopsis "PulseAudio panel plugin for Xfce")
     (description
      "Xfce PulseAudio plugin is a plugin for the Xfce panel which provides a
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 15/68] gnu: elementary-xfce-icon-theme: Use new style.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:4c2d829af2445cf0b46af0b151f8a899e1834020.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (elementary-xfce-icon-theme)[arguments]: Use G-Expressions.

Change-Id: I70ad49c16c30d519c0745462e33c86ad459c5b1b

---

gnu/packages/xfce.scm | 41 ++++++++++++++++++++---------------------

1 file changed, 20 insertions(+), 21 deletions(-)

Toggle diff (58 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3520ceaba4..61377e2f16 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -275,31 +275,30 @@ (define-public elementary-xfce-icon-theme
   (package
     (name "elementary-xfce-icon-theme")
     (version "0.20")
-    (source (origin
-              (method git-fetch)
-              (uri
-               (git-reference
-                (url "https://github.com/shimmerproject/elementary-xfce")
-                (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/shimmerproject/elementary-xfce")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdfqf98rk3z30qcs5ca3i3ybwg4icvq6yrxwv8i3yl0ikw6rc4k"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no check target
-       #:make-flags '("CC=gcc")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'make-git-checkout-writable
-           (lambda _
-             (for-each make-file-writable (find-files "."))
-             #t)))))
-    (native-inputs
-     (list gtk+ optipng pkg-config))
+     (list
+      #:tests? #f ;no check target
+      #:make-flags #~(list "CC=gcc")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'make-git-checkout-writable
+                     (lambda _
+                       (for-each make-file-writable
+                                 (find-files ".")) #t)))))
+    (native-inputs (list gtk+ optipng pkg-config))
     (home-page "https://shimmerproject.org/")
     (synopsis "Elementary icons extended and maintained for Xfce")
-    (description "This is a fork of the upstream elementary project.  This icon
+    (description
+     "This is a fork of the upstream elementary project. This icon
 theme is supposed to keep everything working for Xfce, but gets updates from
 upstream occasionally.")
     (license gpl2+)))
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 16/68] gnu: catfish: Update to 4.20.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . Ashvith Shetty)(address . Ashvith@noreply.codeberg.org)

Message-ID:52dc2a0f3a11b2da95e83c448067f7a4b3e32727.1735627083.git.iyzsong@member.fsf.org

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

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[build-system]: Switch to meson-build-system

[arguments]: Simpify phases.

[native-inputs]: Add desktop-file-utils, gettext-minimal, gtk+:bin and python.

Remove intltool and python-distutils-extra.

Change-Id: Ieca091640912cfbe50d13623bcc0866aa5e3514c

---

gnu/packages/xfce.scm | 87 +++++++++++++++++++++----------------------

1 file changed, 43 insertions(+), 44 deletions(-)

Toggle diff (108 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 61377e2f16..73bf34cd80 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -81,7 +81,7 @@ (define-module (gnu packages xfce)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
-  #:use-module (guix build-system python)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -220,50 +220,49 @@ (define-public libxfce4ui
 (define-public catfish
   (package
     (name "catfish")
-    (version "4.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "catfish/" (version-major+minor version)
-                                  "/catfish-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "16cbsnki7qragwhbfs3h0ja7xg8xlf59ajxhddqm0jkmrirrpbpx"))))
-    (build-system python-build-system)
+    (version "4.20.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.xfce.org/apps/catfish")
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vyf62n8j2pgxd30j8hf1x6d0yz8r86ng39p9smfpq7m3vll8i7c"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-command-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "catfish/CatfishSearchEngine.py"
-               (("'which'") (string-append "'" (which "which") "'")))
-             (substitute* "catfish/CatfishWindow.py"
-               (("xdg-mime") (which "xdg-mime"))
-               (("xdg-open") (which "xdg-open")))))
-         ;; setup.py script does not support one of the Python build
-         ;; system's default flags, "--single-version-externally-managed".
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "python" "setup.py" "install"
-                     (string-append "--prefix=" (assoc-ref outputs "out"))
-                     "--root=/")))
-         ;; The check failed to spawn a message bus without /etc/machine-id.
-         (delete 'sanity-check)
-         (add-after 'install 'wrap-program
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/bin/catfish")
-                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
-                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
-       #:tests? #f))
-    (native-inputs
-     (list pkg-config python-distutils-extra intltool))
-    (inputs
-     (list bash-minimal which xfconf xdg-utils))
-    (propagated-inputs
-     (list gtk+ python-dbus python-pexpect python-pycairo
-           python-pygobject))
-    (home-page "https://docs.xfce.org/apps/catfish/start")
+     (list
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-command-paths
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "catfish/CatfishSearchEngine.py"
+                         (("'which'")
+                          (string-append "'"
+                                         (which "which") "'")))
+                       (substitute* "catfish/CatfishWindow.py"
+                         (("xdg-mime")
+                          (which "xdg-mime"))
+                         (("xdg-open")
+                          (which "xdg-open")))))
+                   (add-after 'install 'wrap-program
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let ((out (assoc-ref outputs "out")))
+                         (wrap-program (string-append out "/bin/catfish")
+                           `("GUIX_PYTHONPATH" =
+                             (,(getenv "GUIX_PYTHONPATH")))
+                           `("GI_TYPELIB_PATH" =
+                             (,(getenv "GI_TYPELIB_PATH"))))))))
+      #:tests? #f))
+    (native-inputs (list desktop-file-utils ;for update-desktop-database
+                         gettext-minimal
+                         (list gtk+ "bin") ;for gtk-update-icon-cache
+                         pkg-config
+                         python))
+    (inputs (list bash-minimal which xfconf xdg-utils))
+    (propagated-inputs (list gtk+ python-dbus python-pexpect python-pycairo
+                             python-pygobject))
+    (home-page "https://docs.xfce.org/apps/catfish/")
     (synopsis "File searching tool for Xfce")
     (description
      "Catfish is a file searching tool for Linux and Unix.  The interface is
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 17/68] gnu: xfce4-whiskermenu-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:9497bd398773b6ff3af26adafafafc3f6f2170c1.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-whiskermenu-plugin)[source]: Switch to git-fetch.

[native-inputs]: Remove intltool. Add gettext-minimal.

[inputs]: Remove gettext-minimal and gtk.

[home-page]: Set to docs.xfce.org.

Change-Id: I38e2ca59104f243afb698eb80de1b57310040208

---

gnu/packages/xfce.scm | 18 +++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)

Toggle diff (43 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 73bf34cd80..b7410cbc7b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -583,27 +583,27 @@ (define-public xfce4-whiskermenu-plugin
     (version "2.8.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                           "xfce4-whiskermenu-plugin/" (version-major+minor version) "/"
-                           "xfce4-whiskermenu-plugin-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1l4wzirqk754cliwyhl28f460xkqzqi9a9s7jirx164gcn3w4xp7"))))
+        (base32 "025nnf1h361a4nl8l28rk7w37d3jajr8dm359lnfq8xz3f6yy4n5"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list pkg-config intltool))
+     (list gettext-minimal pkg-config))
     (inputs
      (list accountsservice
            xfce4-panel
            garcon
-           gettext-minimal
            exo
-           gtk
            gtk-layer-shell
            libxfce4ui))
     (arguments
      (list #:tests? #f))                ; no tests
-    (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/")
     (synopsis "Application menu panel plugin for Xfce")
     (description
      "This package provides an alternative to the default application menu
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 18/68] gnu: xfce4-xkb-plugin: Update to 0.8.5.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:96383ba9c66e9358ab7f620bc983f5103335075f.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-xkb-plugin): Update to 0.8.5.

[source]: Switch to git-fetch.

[home-page]: Set to docs.xfce.org.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: I386b5e0b57a3553a648b5065dccffdb45496e3ea

---

gnu/packages/xfce.scm | 24 +++++++++++++-----------

1 file changed, 13 insertions(+), 11 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index b7410cbc7b..e959e0c31e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -616,18 +616,20 @@ (define-public xfce4-whiskermenu-plugin
 (define-public xfce4-xkb-plugin
   (package
     (name "xfce4-xkb-plugin")
-    (version "0.8.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "11s9s0634g9rf5hcj6nga6hsv71wcq9c7ym6nsis077gfmwfkgzh"))))
+    (version "0.8.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1iai2myz1zj5vvbl3lz8r50bhv103avfjdc233gqa933wwxgwvd0"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list garcon
            (librsvg-for-system)
@@ -636,7 +638,7 @@ (define-public xfce4-xkb-plugin
            libxfce4ui
            libxklavier
            xfce4-panel))
-    (home-page "https://git.xfce.org/panel-plugins/xfce4-xkb-plugin/")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/")
     (synopsis "XKB layout switching panel plug-in for Xfce")
     (description
      "Xfce XKB plugin makes it possible to set up and use multiple
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 19/68] gnu: xfce4-appfinder: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:5fc169c5942fb6715c02d7434bcc2f3cb34539ad.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-appfinder)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[home-page]: Set to docs.xfce.org.

Change-Id: I5c0760162e1f1c566f1b13571035f7fb9708f89b

---

gnu/packages/xfce.scm | 25 ++++++++++++++-----------

1 file changed, 14 insertions(+), 11 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e959e0c31e..8fa5f3a0a3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -656,21 +656,24 @@ (define-public xfce4-appfinder
   (package
     (name "xfce4-appfinder")
     (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
-                "013kkspy9gma5yzzwvwqm9452i6z67zc4f2lnifjhgn8gpvq5jl2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1irqbabdgj5ybns55g92548jcr0i1k4q0c7s8jn17r7g8ygd12qy"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for appfinder-preferences-ui.h
     (native-inputs
-     (list pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
      (list garcon gtk+ libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-appfinder/")
     (synopsis "Xfce application finder")
     (description
      "Application finder for Xfce, it will show the applications installed on
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 21/68] gnu: xfce4-settings: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:babf9c01e8be54fa5929fd7911670572435cbe2a.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-settings)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Add wlr-protocols.

[home-page]: Set to docs.xfce.org.

Change-Id: I1646b8b93003406ec330be5524a4643d2de65109

---

gnu/packages/xfce.scm | 37 ++++++++++++++++---------------------

1 file changed, 16 insertions(+), 21 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 235c4e69a8..52124d1d82 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -733,32 +733,26 @@ (define-public xfce4-settings
   (package
     (name "xfce4-settings")
     (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
-                "1ag5pimprxc12zgdbs27vngin97fc6l9ig7xzc0naacs8aiqsm13"))
-              (patches (search-patches "xfce4-settings-defaults.patch"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xv8fcrrk54r6naxhwj9ff8f1q9g08fh0ailazvbmi1jww12xwyi"))
+       (patches (search-patches "xfce4-settings-defaults.patch"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-           #~(list "--enable-pluggable-dialogs"
+           #~(list "--enable-maintainer-mode" ;for appearance-dialog_ui.h
+                   "--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")))))))
+                   "--enable-xrandr")))
     (native-inputs
-     (list (list glib "bin") pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
      (list colord
            exo
@@ -772,12 +766,13 @@ (define-public xfce4-settings
            libxfce4ui
            upower
            python ;; for xfce4-compose-mail
+           wlr-protocols
            xf86-input-libinput))
     (propagated-inputs
      ;; Some operations, such as changing icon themes, require these schemas
      ;; to be in the search path.
      (list gsettings-desktop-schemas))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-settings/")
     (synopsis "Xfce settings manager")
     (description
      "Settings manager for Xfce, it can control various aspects of the desktop
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 20/68] gnu: xfce4-session: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:a7485d99aae22c5a014a7424816d073eecce4c77.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-session)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Id234bc39d803f616d386771896347a7a8185fe81

---

gnu/packages/xfce.scm | 52 +++++++++++++++++++------------------------

1 file changed, 23 insertions(+), 29 deletions(-)

Toggle diff (79 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 8fa5f3a0a3..235c4e69a8 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -684,41 +684,35 @@ (define-public xfce4-session
   (package
     (name "xfce4-session")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-session/" (version-major+minor version) "/"
-                                  "xfce4-session-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "11agss7x749i4wnw82czv0b053mhqn34hwi8rihj6sgfwqzj6aaj"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* "libxfsm/xfsm-shutdown-common.h"
-                    (("/sbin/shutdown -h now")  "halt")
-                    (("/sbin/shutdown -r now")  "restart")
-                    (("/usr/sbin/pm-suspend")   "pm-suspend")
-                    (("/usr/sbin/pm-hibernate") "pm-hibernate"))
-                  #t))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0zzmszwm22nnwybagnvan62qbqcgcr7fnp288qcr9bkkag5y8zcs"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (substitute* "libxfsm/xfsm-shutdown-common.h"
+             (("/sbin/shutdown -h now")  "halt")
+             (("/sbin/shutdown -r now")  "restart")
+             (("/usr/sbin/pm-suspend")   "pm-suspend")
+             (("/usr/sbin/pm-hibernate") "pm-hibernate"))
+           #t))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
-       (list (string-append "--with-xsession-prefix=" %output)
+       (list "--enable-maintainer-mode" ;for xfce4-session-settings_ui.h
+        (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-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")))))))
+       '("gtk_update_icon_cache=true")))
     (native-inputs
-     (list (list glib "bin") pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
      (list iceauth
            gtk-layer-shell
@@ -728,7 +722,7 @@ (define-public xfce4-session
            libwnck
            libxfce4ui
            libxfce4windowing))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfce4-session/")
     (synopsis "Xfce session manager")
     (description
      "Session manager for Xfce, it will restore your session on startup and
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 22/68] gnu: thunar: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:930e7ea1d1893262f7a5422e4bc8af423fd356db.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode --enable-gtk-doc" to

configure-flags. Disable tests.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I4c3794c3cac79230c1f7ceb29cac215acd83c3da

---

gnu/packages/xfce.scm | 28 +++++++++++++++++-----------

1 file changed, 17 insertions(+), 11 deletions(-)

Toggle diff (51 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 52124d1d82..98673eddd3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -783,19 +783,25 @@ (define-public thunar
   (package
     (name "thunar")
     (version "4.20.0")                           ;stable version = even minor
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "thunar/" (version-major+minor version) "/"
-                                  "thunar-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1c28fnhx8zah6gcq607p8hicar72i6nsydfan593gkxfydv1lwr7"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "078jiydbqa7m86bls224cnqh876lbn5s5vnp345443q5xcayhajc"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:configure-flags '("--with-custom-thunarx-dirs-enabled")))
+     '(#:configure-flags '("--enable-maintainer-mode" ;for thunar-marshal.c
+                           "--enable-gtk-doc"
+                           "--with-custom-thunarx-dirs-enabled")
+       ;; XXX: abicheck.sh FAIL, will be fixed in next version.
+       ;; See <https://gitlab.xfce.org/xfce/thunar/-/issues/1516>.
+       #:tests? #f))
     (native-inputs
-     (list pkg-config intltool))
+     (list docbook-xsl libxslt xfce4-dev-tools))
     (inputs
      (list exo
            gobject-introspection
@@ -811,7 +817,7 @@ (define-public thunar
      (list (search-path-specification
             (variable "THUNARX_DIRS")
             (files (list "lib/thunarx-3")))))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar/")
     (synopsis "Xfce file manager")
     (description
      "A modern file manager for graphical desktop, aiming to be easy-to-use and
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 23/68] gnu: thunar-volman: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:01ba6226f96c05aaa7af0ce13f8f9371ad3e192a.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar-volman)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I1b8e6d828183457ecce1fe76a1a033fe716c4081

---

gnu/packages/xfce.scm | 15 ++++++++-------

1 file changed, 8 insertions(+), 7 deletions(-)

Toggle diff (33 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 98673eddd3..a6ceb0b56a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -830,18 +830,19 @@ (define-public thunar-volman
     (version "4.20.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/xfce/thunar-volman/"
-                           (version-major+minor version) "/"
-                           "thunar-volman-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1nmi3q9jfc4p3dznw96m4ryk8h136qp5bvfipy7mnlcvjm9dinmh"))))
+        (base32 "14cs5hscjrgxvmkxr1d5ank76rxwq7ifvm3g844p9jvhykz6r1aw"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
      (list exo libgudev libnotify libxfce4ui))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar-volman/")
     (synopsis "Removable media manager for Thunar")
     (description
      "Thunar-volman is an extension for the Thunar File Manager, which enables
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 24/68] gnu: thunar-archive-plugin: Update to 0.5.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:930a1d7c8507d679c987f35aab0bea6b2d52dcb6.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar-archive-plugin): Update to 0.5.3.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ib7d14f5aad18aa7aa4575652c7d1cf26c008c75a

---

gnu/packages/xfce.scm | 18 ++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)

Toggle diff (36 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a6ceb0b56a..fce53a764d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -855,19 +855,21 @@ (define-public thunar-volman
 (define-public thunar-archive-plugin
   (package
     (name "thunar-archive-plugin")
-    (version "0.5.2")
+    (version "0.5.3")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/thunar-plugins/"
-                           name "/" (version-major+minor version)
-                           "/" name "-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/thunar-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1qxdsnwjy8z358yd0avi1h2r6y1izfv26dzlp5fsh3pwpivzhyb3"))))
+        (base32 "1aqvfgn2www5m9764ldafcv5wsknhsdy2hibikzxhpbzd51c8j7l"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list exo thunar gtk+))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar/archive")
     (synopsis "Archive plugin for Thunar file manager")
     (description "The Thunar Archive Plugin allows you to create and extract
 archive files using the file context menus in the Thunar file manager.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 25/68] gnu: thunar-shares-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:38b010c4aa81d978fef1e60b52f60a3bb5a07312.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar-shares-plugin)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ifff0e53899a4b748c408c711768695d627a22815

---

gnu/packages/xfce.scm | 16 +++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fce53a764d..1424fd8893 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -881,16 +881,18 @@ (define-public thunar-shares-plugin
     (version "0.3.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/thunar-plugins/"
-                           name "/" (version-major+minor version)
-                           "/" name "-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/thunar-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "01rzmjj673sjhzkdh24d8bha57dbahycb44hlr4zld0mr7kda28h"))))
+        (base32 "0agq4f16mlrri84n81wgrhipvg55gh527jw42wiv6ac9vnqlcnw8"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list thunar gtk+))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar/thunar-shares-plugin")
     (synopsis "Folder share plugin for Thunar file manager")
     (description
      "The Thunar Shares Plugin allows you to quickly share a folder using
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 26/68] gnu: thunar-media-tags-plugin: Update to 0.5.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:dbb4ea52544cf2798359943af75d9de1e0208c56.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar-media-tags-plugin): Update to 0.5.0.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I82fe726d536536cdf3f9b062a64e66248a85c858

---

gnu/packages/xfce.scm | 18 ++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)

Toggle diff (36 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 1424fd8893..a64b5b923d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -902,19 +902,21 @@ (define-public thunar-shares-plugin
 (define-public thunar-media-tags-plugin
   (package
     (name "thunar-media-tags-plugin")
-    (version "0.4.0")
+    (version "0.5.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/thunar-plugins/"
-                           name "/" (version-major+minor version)
-                           "/" name "-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/thunar-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "02n99ymqs8msa798r63sy409pwrycg8p4pxx3yf497k924g134lm"))))
+        (base32 "091i975aazkhkxyh0h0msyqkkr1z2dfy068syaawcisyaw1h2mpg"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list exo gtk+ thunar taglib))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar/media-tags")
     (synopsis "Media tags plugin for Thunar file manager")
     (description
      "Media tags plugin allows tags editing from Thunar file manager and
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 27/68] gnu: thunar-vcs-plugin: Update to 0.3.0.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:60e05a4e3ddf959c86ae51e8dca6aa66ce4a31de.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunar-vcs-plugin): Update to 0.3.0.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ia3708e205691bc7d6fb2d1c54657c13c65caa282

---

gnu/packages/xfce.scm | 18 ++++++++++--------

1 file changed, 10 insertions(+), 8 deletions(-)

Toggle diff (47 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a64b5b923d..a3ea1e08b6 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -926,22 +926,24 @@ (define-public thunar-media-tags-plugin
 (define-public thunar-vcs-plugin
   (package
     (name "thunar-vcs-plugin")
-    (version "0.2.0")
+    (version "0.3.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/thunar-plugins/"
-                           name "/" (version-major+minor version)
-                           "/" name "-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/thunar-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "1f2d1dwfyi6xv3qkd8l8xh0vhz8wh0601cyigjzn426lqga1d29n"))))
+        (base32 "0n07d8v7spn2ys1nz9yb5szj9jkd1y7frzq203v5ys9gifa7mnvv"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
            #~(list (string-append "CPPFLAGS=-I"
                                   #$(this-package-input "apr-util")
                                   "/include/apr-1"))))
-    (native-inputs (list pkg-config intltool utf8proc))
+    (native-inputs (list xfce4-dev-tools utf8proc))
     (inputs
      (list exo
            gtk+
@@ -951,7 +953,7 @@ (define-public thunar-vcs-plugin
            apr-util
            subversion
            git))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/thunar/thunar-vcs-plugin")
     (synopsis "VCS plugin for Thunar file manager")
     (description
      "Thunar VCS Plugin (formerly known as Thunar SVN Plugin) gives SVN and
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 28/68] gnu: thunarx-python: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:da2eb9eaa341f6c71cf6e525a0c6d459879db3d9.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (thunarx-python)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools. Remove which.

Change-Id: Ia16aeaaf9c7aebec9c36d26470fb3077c342be9e

---

gnu/packages/xfce.scm | 14 ++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a3ea1e08b6..269099e3fc 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -967,15 +967,17 @@ (define-public thunarx-python
     (version "0.5.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://archive.xfce.org/src/bindings/"
-                           name "/" (version-major+minor version)
-                           "/" name "-" version ".tar.bz2"))
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/bindings/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "08lz9pvx006a2fypg2q38p61jbhy0yswz8cizlxpiwfcqsvhpnln"))))
+        (base32 "1x39pbdx4186f7bkrc9ab5q7qs783mivm2j1msyf9m1nh09y617f"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list pkg-config which))
+     (list xfce4-dev-tools))
     (inputs
      (list exo
            thunar
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 29/68] gnu: xfwm4: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:09d4bc120029fcfabce9abfbc3036ddd39be90a4.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfwm4)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I4f650c49983cd12ecf54e204a8ca9ac81a4cc02b

---

gnu/packages/xfce.scm | 24 ++++++++++++++----------

1 file changed, 14 insertions(+), 10 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 269099e3fc..4ea06ba4a8 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -995,17 +995,21 @@ (define-public xfwm4
   (package
     (name "xfwm4")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfwm4/" (version-major+minor version) "/"
-                                  "xfwm4-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "01ng1lcr0a45w1jm3vwsfwk5kfy8jfz3c1ng3n6hvalpjgj672x5"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "153zfjw6z9nvlw05xjjws9f95097qci5qbxpzf33z8zl06n50ip5"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for xfwm4-dialog_ui.h, etc.
     (native-inputs
-     (list pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
      (list libdrm
            libwnck
@@ -1014,7 +1018,7 @@ (define-public xfwm4
            libxfce4ui
            libxpresent
            libxrandr))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfwm4/")
     (synopsis "Xfce window manager")
     (description
      "Window manager for Xfce, it handles the placement of windows
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 30/68] gnu: xfdesktop: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:92cce034e4d32780bb0f447a5e41d874168238b6.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfdesktop)[source]: Switch to git-fetch.

[arguments]: Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I6981395966bd54d2b42879df97e2317ada55ac5d

---

gnu/packages/xfce.scm | 45 ++++++++++++++++---------------------------

1 file changed, 17 insertions(+), 28 deletions(-)

Toggle diff (75 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 4ea06ba4a8..6bc29fc8c1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1049,35 +1049,24 @@ (define-public xfdesktop
   (package
     (name "xfdesktop")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfdesktop/" (version-major+minor version) "/"
-                                  "xfdesktop-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0cjnsrf7788vyq1mfcx4qypdhd9b2gqigj6yk6ffpwy7h2x42w12"))
-              (modules '((guix build utils)))
-              (snippet
-               #~(begin
-                   (copy-file #$(file-append %artwork-repository "/logo/Guix.svg")
-                              "backgrounds/guix-logo.svg")
-                   #t))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0z3ps7n1ilsgx83phk46aqzfp96zxisxl7xngls054ak9nb3fj7k"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            (copy-file #$(file-append %artwork-repository "/logo/Guix.svg")
+                       "backgrounds/guix-logo.svg")
+            #t))))
     (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
@@ -1099,7 +1088,7 @@ (define-public xfdesktop
 
        #:disallowed-references (,inkscape/stable ,imagemagick)))
     (native-inputs
-     (list (list glib "bin") pkg-config intltool
+     (list xfce4-dev-tools
            ;; For our own ‘prepare-background-image’ phase.
            inkscape/stable imagemagick))
     (inputs
@@ -1112,7 +1101,7 @@ (define-public xfdesktop
            libxfce4windowing
            libyaml
            thunar))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/xfce/xfdesktop/")
     (synopsis "Xfce desktop manager")
     (description
      "Desktop manager for Xfce, it sets the background color or image with
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 31/68] gnu: gigolo: Update to 0.5.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:b58f94cc9ae145fb22e6397c3476317014644157.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (gigolo): Update to 0.5.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[home-page]: Set to docs.xfce.org.

Change-Id: Id6fcd761535ff14cb4357c19d214b44462845b8b

---

gnu/packages/xfce.scm | 27 ++++++++++++++++-----------

1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6bc29fc8c1..eb5fdb0c3b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1112,19 +1112,24 @@ (define-public xfdesktop
 (define-public gigolo
   (package
     (name "gigolo")
-    (version "0.5.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name "/" (version-major+minor version)
-                                  "/" name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1l1g9ljvyzir1jpjf0248nnwwf3sakwljlik6cj5wrj4azv88nfj"))))
+    (version "0.5.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1688j4c7d1vzglx9a8a32gy17yfqwrha7p0r272hrhz009jza6w1"))))
     (build-system gnu-build-system)
-    (native-inputs (list pkg-config intltool))
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for gigolo_ui.h
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list gtk+))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/apps/gigolo/")
     (synopsis "Manage connections to remote file systems")
     (description
      "Gigolo is a graphical user interface to easily manage connections to
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 32/68] gnu: parole: Update to 4.18.2.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:146593aebf03cf8f0e6b04c52d8dc07060795b63.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (parole): Update to 4.18.2.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Remove glib:bin.

[home-page]: Set to docs.xfce.org.

Change-Id: Ida4ad17e4990b62ab63a83e49ad5660382b0ba41

---

gnu/packages/xfce.scm | 25 +++++++++++++------------

1 file changed, 13 insertions(+), 12 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index eb5fdb0c3b..c2c53c68d4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1140,15 +1140,17 @@ (define-public gigolo
 (define-public parole
   (package
     (name "parole")
-    (version "4.18.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0rjsqm582c8i3lyi1n2ghp638cr0chw358i05g7njbw1hjj68wqc"))))
+    (version "4.18.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yzqry3pbgn413nflw7a8cm3xdq96w5pj41b04p5drr7qs44d1qb"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1165,11 +1167,10 @@ (define-public parole
                   #:sh (search-input-file inputs "bin/bash")
                   `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
     (native-inputs
-     (list pkg-config intltool gobject-introspection))
+     (list gobject-introspection xfce4-dev-tools))
     (inputs
      (list bash-minimal                           ;for 'wrap-program'
            dbus-glib
-           (list glib "bin")
            gstreamer
            gst-plugins-base
            gst-plugins-good
@@ -1177,7 +1178,7 @@ (define-public parole
            libxfce4ui
            libxfce4util
            taglib))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/apps/parole/")
     (synopsis "Media player based on the GStreamer framework")
     (description "Parole is a modern simple media player based on the
 GStreamer framework and written to fit well in the Xfce desktop.  Parole
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 33/68] gnu: xfce4-terminal: Update to 1.1.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:620856565f9a5b540bebe3dea0d9bc6efe8f48b0.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-terminal): Update to 1.1.4.

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags. Remove CFLAGS.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I9790d6478c9fc774fdec27e57e2c6569ccb64d2d

---

gnu/packages/xfce.scm | 31 +++++++++++++++----------------

1 file changed, 15 insertions(+), 16 deletions(-)

Toggle diff (49 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c2c53c68d4..e1876b14b4 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1188,27 +1188,26 @@ (define-public parole
 (define-public xfce4-terminal
   (package
     (name "xfce4-terminal")
-    (version "1.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0i9xgd0rgw0j59hlp9kyxndw2b35nhxjls09c20rzdj1sj4dak91"))))
+    (version "1.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16rcp2f6wh8vdzppkv2xgqlqffg85azi3vdvl90xn2r4ixyrzfas"))))
     (build-system gnu-build-system)
     (arguments
-     (list
-      #:configure-flags
-      #~(list (string-append "CFLAGS=-I"
-                             #$(this-package-input "libxfce4ui")
-                             "/include/xfce4"))))
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for xfce4-terminal.1
     (native-inputs
-     (list pkg-config intltool))
+     (list docbook-xsl libxslt xfce4-dev-tools))
     (inputs
      (list libxfce4ui vte))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/apps/xfce4-terminal/")
     (synopsis "Xfce terminal emulator")
     (description
      "A lightweight and easy to use terminal emulator for Xfce.  Features
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 34/68] gnu: xfce4-dict: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:3d1f9505112569dbb42b09ee925540aec5275c2d.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-dict)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I3d184bc65f1d6347e148dd153202974567c8831c

---

gnu/packages/xfce.scm | 22 ++++++++++++----------

1 file changed, 12 insertions(+), 10 deletions(-)

Toggle diff (39 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e1876b14b4..70ab93069f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1222,20 +1222,22 @@ (define-public xfce4-dict
   (package
     (name "xfce4-dict")
     (version "0.8.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "05p9xbjzhqg2a13c9vsva854kpqjvzj4xjaj98bjrn3ns9wv030d"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y9ggn3c0ngn621ljmb2ahavr27sksld48z2qs470zcjwiw48nlx"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/apps/xfce4-dict/")
     (synopsis "Dictionary of Xfce desktop")
     (description
      "Xfce4-dict allows you to search different kinds of dictionary services
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 35/68] gnu: xfdashboard: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:dbc4943f08ffe0b651ff74314db6996209405a24.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfdashboard)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I2f9341f850c7ee4cfc0246f3f9117ec1549c5289

---

gnu/packages/xfce.scm | 31 +++++++++++++++----------------

1 file changed, 15 insertions(+), 16 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 70ab93069f..6a2c6c905d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1253,22 +1253,21 @@ (define-public xfdashboard
   (package
     (name "xfdashboard")
     (version "1.0.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name
-                                  "/"
-                                  (version-major+minor version)
-                                  "/"
-                                  name
-                                  "-"
-                                  version
-                                  ".tar.bz2"))
-              (sha256
-               (base32
-                "19a8xz6zv039j2m595v4wld3x4inidc7idfkk0pp42ffwm1l6a55"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/"
+                                 name))
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1blydl57xzqndcj1dkfxbmsaad27s7mqwwj3mmidz2dx9cikabl8"))))
     (build-system gnu-build-system)
-    (native-inputs (list intltool pkg-config `(,glib "bin")))
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for enums.c, etc.
+    (native-inputs (list xfce4-dev-tools))
     (inputs (list clutter
                   garcon
                   gtk+
@@ -1279,7 +1278,7 @@ (define-public xfdashboard
                   libxfce4ui
                   libxinerama
                   xfconf))
-    (home-page "https://www.xfce.org/")
+    (home-page "https://docs.xfce.org/apps/xfdashboard/")
     (synopsis "Gnome shell like dashboard for Xfce")
     (description
      "Xfdashboard provides a GNOME shell dashboard and MacOS Mission Control
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 36/68] gnu: xfce4-power-manager: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:beb26878db6dee6bd2e25e2c0a01a10494ca0071.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-power-manager)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Add wlr-protocols.

[home-page]: Set to docs.xfce.org.

Change-Id: Ief7a7b05516ad535f4417aa4f927bca6d039e034

---

gnu/packages/xfce.scm | 34 +++++++++++++++-------------------

1 file changed, 15 insertions(+), 19 deletions(-)

Toggle diff (51 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6a2c6c905d..a35ba85661 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1358,29 +1358,25 @@ (define-public xfce4-power-manager
   (package
     (name "xfce4-power-manager")
     (version "4.20.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/xfce/"
-                                  "xfce4-power-manager/" (version-major+minor version) "/"
-                                  "xfce4-power-manager-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0agdsq2d4kr9aw7nqj1x5cgpxqcjffajipwjvlxq6likyv7924wp"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/xfce/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "089qv5704y5dk2jddl3rij4d591q5i2dqlv8gb6vr250pyp1v9d8"))))
     (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")))))))
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for xfpm-dbus-marshal.h, etc.
     (native-inputs
-     (list (list glib "bin") pkg-config intltool))
+     (list xfce4-dev-tools))
     (inputs
-     (list libxrandr gtk+ upower libnotify libxfce4ui polkit xfce4-panel))
-    (home-page "https://www.xfce.org/")
+     (list libxrandr gtk+ upower libnotify libxfce4ui polkit
+           wlr-protocols xfce4-panel))
+    (home-page "https://docs.xfce.org/xfce/xfce4-power-manager/")
     (synopsis "Xfce Power Manager")
     (description
      "This is a power manager for the Xfce desktop.  It manages the power
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 37/68] gnu: ristretto: Update to 0.13.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:8366a1e420d79bb9113e4c2dabd2ea0ce3e1cc70.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (ristretto): Update to 0.13.3.

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ia1bc97b0fbecc647e6ccb3a3ddf4ce4d1223bf99

---

gnu/packages/xfce.scm | 26 ++++++++++++++------------

1 file changed, 14 insertions(+), 12 deletions(-)

Toggle diff (41 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a35ba85661..30c77d664f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1391,20 +1391,22 @@ (define-public xfce4-power-manager
 (define-public ristretto
   (package
     (name "ristretto")
-    (version "0.13.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/ristretto/"
-                                  (version-major+minor version) "/"
-                                  "ristretto-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1nbxfm6ljcw45vn8hhjxwcv3k387hdah4jnn07n9w08n63g5x7vp"))))
+    (version "0.13.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0bbcq5spqirh21p0s7vy9na58inz47nsj59asdka35qnvr20g4vh"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for main_window_ui.h, etc.
     (native-inputs
-     (list intltool desktop-file-utils
-           `(,glib "bin") ; for gdbus-codegen
-           pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list gtk+ libexif libxfce4ui tumbler))
     (home-page "https://docs.xfce.org/apps/ristretto/start")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 38/68] gnu: xfce4-taskmanager: Update to 1.5.8.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:308ed014f42fc0782e6727a4545f566564ba7cb5.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-taskmanager): Update to 1.5.8.

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I2b37b509c392dbf2799870a40a146928a232bf76

---

gnu/packages/xfce.scm | 26 +++++++++++++++-----------

1 file changed, 15 insertions(+), 11 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 30c77d664f..696afa885e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1421,18 +1421,22 @@ (define-public ristretto
 (define-public xfce4-taskmanager
   (package
     (name "xfce4-taskmanager")
-    (version "1.5.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "xfce4-taskmanager/" (version-major+minor version) "/"
-                                  "xfce4-taskmanager-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1fv83xcbnlwabi32z3fsdik1knh7v45ji529dx9kwlv4b8pq6dk7"))))
+    (version "1.5.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0dmfbxnnyfv6n55krvjmgx8niv96xkpsf3il0bdmk928hzazhqh3"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for process-window_ui.h, etc.
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libwnck
            libxmu
@@ -1441,7 +1445,7 @@ (define-public xfce4-taskmanager
            ;; FIXME: Remove libxext and libxt when libxmu propagates them.
            libxext
            libxt))
-    (home-page "https://goodies.xfce.org/projects/applications/xfce4-taskmanager")
+    (home-page "https://docs.xfce.org/apps/xfce4-taskmanager/")
     (synopsis "Easy to use task manager")
     (description
      "This is a task manager for the Xfce desktop.  It displays the CPU and
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 39/68] gnu: orage: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:b41441d29d829662a513706211710fb124308681.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (orage)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Id42b5b7895673b80a93ec358a3dc250d537a3c57

---

gnu/packages/xfce.scm | 24 +++++++++++-------------

1 file changed, 11 insertions(+), 13 deletions(-)

Toggle diff (41 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 696afa885e..3c571a30bd 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1456,23 +1456,21 @@ (define-public orage
   (package
     (name "orage")
     (version "4.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1v5385hps6jgcw1ky9vl7w7iryp0rzxz6s4lx72rz8yg4sdv84v3"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1sidyq4358cp701rkfj4p0ikshf612jm5f9j4gma6h6v2dxp7gxw"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list
-      `(,glib "bin")                    ; for dbus-binding-tool
-      intltool
-      pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list dbus-glib gtk+-2 libical libnotify libxfce4ui popt xfce4-panel))
-    (home-page "https://www.xfce.org/projects/")
+    (home-page "https://docs.xfce.org/apps/orage/")
     (synopsis "Simple calendar application with reminders")
     (description
      "This is a simple calendar application for the Xfce desktop.  Orage has
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 40/68] gnu: xfce4-notifyd: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:0b2d43e55876ca8c5a6246402cc1a07416c83be3.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-notifyd)[source]: Switch to git-fetch.

[arguments]: Remove 'patch-configure phase.

[native-inputs]: Add xfce4-dev-tools. Remove which.

[home-page]: Set to docs.xfce.org.

Change-Id: I47d19b497ac3ef9881e86d10c893e0ba65823b1e

---

gnu/packages/xfce.scm | 35 +++++++++++------------------------

1 file changed, 11 insertions(+), 24 deletions(-)

Toggle diff (52 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3c571a30bd..04c4c3991b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1484,34 +1484,21 @@ (define-public xfce4-notifyd
   (package
     (name "xfce4-notifyd")
     (version "0.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0w967np9ik74lg63sn7g7448f10pjspd7h62ncqmr0vxr9f2clwy"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0li1vxh460ak329sxpz8zbyggv4m38mzdanpjxdjxf9gypsp65ag"))))
     (build-system glib-or-gtk-build-system)
-    (arguments
-     (list #:phases
-           #~(modify-phases %standard-phases
-               (add-before 'configure 'patch-configure
-                 (lambda _
-                   (substitute* "configure"
-                     (("\\$PKG_CONFIG --variable=gdbus_codegen gio-2.0")
-                      "which gdbus-codegen")
-                     (("\\$PKG_CONFIG --variable=glib_compile_resources gio-2.0")
-                      "which glib-compile-resources")
-                     (("\\$PKG_CONFIG --variable=glib_genmarshal glib-2.0")
-                      "which glib-genmarshal")
-                     (("\\$PKG_CONFIG --variable=glib_mkenums glib-2.0")
-                      "which glib-mkenums")))))))
     (native-inputs
-     (list intltool pkg-config (list glib "bin") which))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui libnotify sqlite xfce4-panel))
-    (home-page "https://goodies.xfce.org/projects/applications/xfce4-notifyd")
+    (home-page "https://docs.xfce.org/apps/xfce4-notifyd/")
     (synopsis "Show notification bubbles on Xfce")
     (description
      "The Xfce Notify Daemon (xfce4-notifyd for short) is a smallish program
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 41/68] gnu: xfce4-notifyd: Enable sound and wayland support.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:3bb8420981c843860075fddaefc0d91f790378b5.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-notifyd)[inputs]: Add gtk-layer-shell and libcanberra.

Change-Id: I3bfc2c9bdca9d02f3c730f3d590a57d6c006603a

---

gnu/packages/xfce.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 04c4c3991b..d064299812 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1497,7 +1497,7 @@ (define-public xfce4-notifyd
     (native-inputs
      (list xfce4-dev-tools))
     (inputs
-     (list libxfce4ui libnotify sqlite xfce4-panel))
+     (list gtk-layer-shell libcanberra libxfce4ui libnotify sqlite xfce4-panel))
     (home-page "https://docs.xfce.org/apps/xfce4-notifyd/")
     (synopsis "Show notification bubbles on Xfce")
     (description
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 42/68] gnu: xfburn: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:e46696e79c5de4cc5448ef7bf012223201c063bb.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfburn)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add docbook-xsl, libxslt and xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I861899747b17427b532923a769240ce49979f16c

---

gnu/packages/xfce.scm | 24 ++++++++++++++----------

1 file changed, 14 insertions(+), 10 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d064299812..0a9539a71d 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1513,17 +1513,21 @@ (define-public xfburn
   (package
     (name "xfburn")
     (version "0.7.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/xfburn/"
-                                  (version-major+minor version) "/"
-                                  "xfburn-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "09crg8vd6vs671lbbhy1ch9hf3d3xvfynh6vj5zlhpikyzch3fy2"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18i25n81qzgb77w5vc6n4hwnw893204az8c1bg5k9229sz28r7vq"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for xfburn.1
     (native-inputs
-     (list intltool pkg-config))
+     (list docbook-xsl libxslt xfce4-dev-tools))
     (inputs
      (list exo
            gstreamer
@@ -1535,7 +1539,7 @@ (define-public xfburn
            libburn
            libisofs
            libxfce4ui))
-    (home-page "https://goodies.xfce.org/projects/applications/xfburn")
+    (home-page "https://docs.xfce.org/apps/xfburn/")
     (synopsis "GTK+ based CD, DVD and Blu-ray burning application")
     (description
      "Xfburn is a simple CD, DVD, and Blu-ray burning tool based on
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 43/68] gnu: mousepad: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:c4c0901850713f2749daf4417cd9928bcfba17ef.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (mousepad)[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ia5359c701995e7c76236bbc786da5da46acb3476

---

gnu/packages/xfce.scm | 26 +++++++++++++-------------

1 file changed, 13 insertions(+), 13 deletions(-)

Toggle diff (50 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0a9539a71d..fca4ed8435 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1552,17 +1552,19 @@ (define-public mousepad
   (package
     (name "mousepad")
     (version "0.6.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/mousepad/"
-                                  (version-major+minor version) "/mousepad-"
-                                  version ".tar.bz2"))
-              (sha256
-               (base32
-                "1f99p6f0pw17xs87cph0n07a5yz4zhnsrhl2kjmi907ihp0n5w9g"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pchp4jdy7xfgb0bk4pv06bphs6lmf1lr3ykyq2f351s5wqp2nrg"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '(;; Use the GSettings keyfile backend rather than
+     '(#:configure-flags '("--enable-maintainer-mode" ;for mousepad-marshal.c
+                           ;; Use the GSettings keyfile backend rather than
                            ;; DConf.
                            "--enable-keyfile-settings")
        #:phases
@@ -1576,12 +1578,10 @@ (define-public mousepad
                 `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
                                                               "/share"))))))))))
     (native-inputs
-     (list intltool
-           `(,glib "bin") ; for glib-compile-schemas.
-           pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list bash-minimal gspell gtksourceview-4 libxfce4ui xfconf))
-    (home-page "https://git.xfce.org/apps/mousepad/")
+    (home-page "https://docs.xfce.org/apps/mousepad/")
     (synopsis "Simple text editor for Xfce")
     (description
      "Mousepad is a graphical text editor for Xfce based on Leafpad.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 44/68] gnu: xfce4-screenshooter: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:749241fcfcf09ed5d9ba4cab0ae6c73b3b7aab7f.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-screenshooter)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Add wlr-protocols.

[home-page]: Set to docs.xfce.org.

Change-Id: I71b58dffa442b2fb150f5023a4374410b83eebc2

---

gnu/packages/xfce.scm | 26 ++++++++++++--------------

1 file changed, 12 insertions(+), 14 deletions(-)

Toggle diff (42 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fca4ed8435..a5a1c1584a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1591,23 +1591,21 @@ (define-public xfce4-screenshooter
   (package
    (name "xfce4-screenshooter")
    (version "1.11.1")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "https://archive.xfce.org/src/apps/"
-                                "xfce4-screenshooter/"
-                                (version-major+minor version)
-                                "/xfce4-screenshooter-"
-                                version ".tar.bz2"))
-            (sha256
-             (base32
-              "0kfk6x6g1y49wqs8vvhv257dwkjac9ac5g8l6bbzc9lvmhvllk6r"))))
+   (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url (string-append "https://gitlab.xfce.org/apps/" name))
+            (commit (string-append name "-" version))))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32 "1wxgc84f5kgs896mjpn2sq7ikh3gpfyilpqfarmlzpmpmmhgvppw"))))
    (build-system gnu-build-system)
    (native-inputs
-    (list pkg-config intltool
-          `(,glib "bin")))        ; glib-genmarshal
+    (list xfce4-dev-tools))
    (inputs
-    (list exo libsoup-minimal-2 libxfce4ui xfce4-panel))
-   (home-page "https://goodies.xfce.org/projects/applications/xfce4-screenshooter")
+    (list exo libsoup-minimal-2 libxfce4ui wlr-protocols xfce4-panel))
+   (home-page "https://docs.xfce.org/apps/xfce4-screenshooter/")
    (synopsis "Xfce's application to take screenshots")
    (description
     "This application allows you to capture the entire screen, the active
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 45/68] gnu: xfce4-screensaver: Update to 4.18.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:330ee8b4eb0e33dec067c01bec3d77976031b1cd.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-screensaver): Update to 4.18.4.

[source]: Switch to git-fetch.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

Move 'fix-dbus-1-path before 'configure.

[native-inputs]: Add xfce4-dev-tools.

Change-Id: Ia37f60a939304505e04874a0cbc3e7341e392d92

---

gnu/packages/xfce.scm | 31 ++++++++++++++-----------------

1 file changed, 14 insertions(+), 17 deletions(-)

Toggle diff (54 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a5a1c1584a..4fd927268c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1617,22 +1617,22 @@ (define-public xfce4-screenshooter
 (define-public xfce4-screensaver
   (package
     (name "xfce4-screensaver")
-    (version "4.18.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  "xfce4-screensaver/"
-                                  (version-major+minor version)
-                                  "/xfce4-screensaver-"
-                                  version ".tar.bz2"))
-              (sha256
-               (base32
-                "0f9sw703pcgz47689qgc550h2hpqlzvsfgggd7z9s6516rhk2wfi"))))
+    (version "4.18.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09wbr3p325w9mcmragxi3rkvlrdapmrmlpgj5wshh9dv52pn8k5y"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags '("--enable-maintainer-mode")
+       #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-dbus-1-path
+         (add-before 'configure 'fix-dbus-1-path
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (dbus-dir (string-append out "/share/dbus-1/services")))
@@ -1641,10 +1641,7 @@ (define-public xfce4-screensaver
                   (string-append "DBUS_SESSION_SERVICE_DIR="
                                  dbus-dir)))))))))
     (native-inputs
-     (list pkg-config
-           intltool
-           glib ; glib-compile-schemas
-           `(,glib "bin")))                 ; glib-compile-schemas
+     (list xfce4-dev-tools))
     (inputs
      (list dbus-glib
            linux-pam
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 50/68] gnu: xfce4-calculator-plugin: Update to 0.7.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:4879d42dfbd407dcd588f8d7ee2b87c7bd405e61.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-calculator-plugin): Update to 0.7.3.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Icfe99394f43e5061fcd032ccd87c5901a690abb3

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e92317ca6a..e1714fb548 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1766,24 +1766,24 @@ (define-public xfce4-datetime-plugin
 
 (define-public xfce4-calculator-plugin
   (package
-   (name "xfce4-calculator-plugin")
-   (version "0.7.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-calculator-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-calculator-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "12q2jh67w0m9vq94gf324xg9k3mji943rwgrddlc340sljz25xni"))))
+    (name "xfce4-calculator-plugin")
+    (version "0.7.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jdsd3qswzv5kvh1ybpmfz79nqwlfh34r9bhhvw5j71339mcpzf9"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin/")
     (synopsis "Calculator for the Xfce panel")
     (description "This plugin is a calculator for the Xfce4 panel.  It
 supports common mathematical operators (+, -, *, /, ^) with usual
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 51/68] gnu: xfce4-cpufreq-plugin: Update to 1.2.9.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:63f2ed82bfc63dc46d1cc2473780f6a65606b338.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-cpufreq-plugin): Update to 1.2.9.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I81810224f71c70ecf41f1ecad1b65651f8cfd918

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e1714fb548..92265a9598 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1792,24 +1792,24 @@ (define-public xfce4-calculator-plugin
 
 (define-public xfce4-cpufreq-plugin
   (package
-   (name "xfce4-cpufreq-plugin")
-   (version "1.2.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-cpufreq-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-cpufreq-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1sbkjphrlyyqsmdggq2624qr45wkkrmvczpv04h5fpkjykcmir07"))))
+    (name "xfce4-cpufreq-plugin")
+    (version "1.2.9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m90li6lq7d4fvv3pvqvyhd13pijcmz5ipfnr1z7a0jhjkskabjq"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/")
     (synopsis "Xfce panel plugin for displaying CPU frequency")
     (description "This panel plugin shows information about the CPU
 governor and frequencies supported and used by your system.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 52/68] gnu: xfce4-diskperf-plugin: Update to 2.7.1.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:191ee130b895a988d0be7b26d2235c0daaf25036.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-diskperf-plugin): Update to 2.7.1.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: If4e178843b0f2a41c13e2f94971dd3d09a62a3a2

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 92265a9598..be852f1157 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1817,24 +1817,24 @@ (define-public xfce4-cpufreq-plugin
 
 (define-public xfce4-diskperf-plugin
   (package
-   (name "xfce4-diskperf-plugin")
-   (version "2.7.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-diskperf-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-diskperf-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1jgcdwiaqs06l729vbj3kgv67iwimjp8gfy7ydzlvbx6859sc2ar"))))
+    (name "xfce4-diskperf-plugin")
+    (version "2.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fav30y6r08yyrrm0yzi9jrn6af6hw8qk7wk7pd172ajqgcyp4ai"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/")
     (synopsis "Display disk performance in the Xfce panel")
     (description "This Xfce panel plugin displays instant disk/partition
 performance (bytes transferred per second).")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 64/68] gnu: xfce4-time-out-plugin: Update to 1.1.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:20161b0142d118cd01556764c92a77c8a1e44600.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-time-out-plugin): Update to 1.1.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I5817989938128fef9a9b423e817515783b3017e2

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 176d0f8eff..075e62f0db 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2170,24 +2170,24 @@ (define-public xfce4-systemload-plugin
 
 (define-public xfce4-time-out-plugin
   (package
-   (name "xfce4-time-out-plugin")
-   (version "1.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-time-out-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-time-out-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1s4f4akj45bjhqhnfb8wim2snw52wrdym1yqpcccfpp9c5is672s"))))
+    (name "xfce4-time-out-plugin")
+    (version "1.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fk3h968yp9hq707na2kj1fvqa0dg1pqzy3g987if1sjw1w2d1qm"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list gtk+ libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/")
     (synopsis "Xfce panel plugin that encourages periodical breaks")
     (description "This plugin encourages to take periodical
 breaks from the computer every X minutes.  During breaks it locks your
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 65/68] gnu: xfce4-timer-plugin: Update to 1.7.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:fb596887ecebbf85d80b6053046702bb27729272.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-timer-plugin): Update to 1.7.3.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I4364e3e6a8c0b4d530a0f7df7514afc08cfc96b0

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 075e62f0db..7a7aabc0fe 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2197,24 +2197,24 @@ (define-public xfce4-time-out-plugin
 
 (define-public xfce4-timer-plugin
   (package
-   (name "xfce4-timer-plugin")
-   (version "1.7.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-timer-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-timer-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0zcbqpsyzzmbyv8cgd5wriqaigfpdcia6h1md0bfh1cmsg1biczy"))))
+    (name "xfce4-timer-plugin")
+    (version "1.7.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1110s55h4lsspdmyl58cbzfy57gfh8871b1213xjgk3i3q7nmqgc"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/")
     (synopsis "Simple countdown and alarm plugin for the Xfce panel")
     (description "This is a simple plugin that lets the user run an
 alarm at a specified time or at the end of a specified countdown
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 67/68] gnu: xfce4-wavelan-plugin: Update to 0.6.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:8de71618b67b7d4854717c726961e356a725447a.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-wavelan-plugin): Update to 0.6.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Idc3e19f8c0f4b328096a1eebca0dd4272226376c

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 44d4adf556..d05c63be98 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2255,24 +2255,24 @@ (define-public xfce4-verve-plugin
 
 (define-public xfce4-wavelan-plugin
   (package
-   (name "xfce4-wavelan-plugin")
-   (version "0.6.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-wavelan-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-wavelan-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0azpv0s3r4ag3gp0bsfvq0jgzycx6ivdsw5p0ga7425pdksw5h31"))))
+    (name "xfce4-wavelan-plugin")
+    (version "0.6.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hw1xglcq9niacmnb6masnx8b7vs0z38pbnbviy388mvj5bx54dm"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/")
     (synopsis "Show stats from WLAN interface in Xfce panel")
     (description "This plugin is used to display stats from a wireless
 lan interface (signal state, signal quality, network name (SSID)).")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 68/68] gnu: xfce4-weather-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:5326af260745f9302fd6135705741b6dd99f9ca1.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-weather-plugin)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[arguments]: Add "--enable-maintainer-mode" to configure-flags.

[home-page]: Set to docs.xfce.org.

Change-Id: I72bcdab8f58401347a2993172f07237082e0e80a

---

gnu/packages/xfce.scm | 31 +++++++++++++++++--------------

1 file changed, 17 insertions(+), 14 deletions(-)

Toggle diff (48 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d05c63be98..2f6041cc9b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2280,24 +2280,27 @@ (define-public xfce4-wavelan-plugin
 
 (define-public xfce4-weather-plugin
   (package
-   (name "xfce4-weather-plugin")
-   (version "0.11.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-weather-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-weather-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0mywq00xs0rvdp3kd7kmcv2brpzixz65ijzk2ahg7lh677k1yb80"))))
+    (name "xfce4-weather-plugin")
+    (version "0.11.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1cxv5p1472vgy2nks9145m8yajsxrc1a83pmqpmnmvpyyandbdml"))))
     (build-system gnu-build-system)
+    (arguments
+     (list #:configure-flags
+           #~(list "--enable-maintainer-mode"))) ;for weather-config_ui.h
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list gtk+ json-c libsoup-minimal-2 libxfce4ui libxml2 xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/")
     (synopsis "Show information about local weather in the Xfce panel")
     (description "This Xfce panel plugin shows information about your
 local weather in the panel, using forecast data provided by the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 66/68] gnu: xfce4-verve-plugin: Update to 2.0.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:a0946a11a1078a63c25843520961483b0d0b04fc.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-verve-plugin): Update to 2.0.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I778fdec57a65747938f542c22390b4ceb3cdb8db

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7a7aabc0fe..44d4adf556 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2223,24 +2223,24 @@ (define-public xfce4-timer-plugin
 
 (define-public xfce4-verve-plugin
   (package
-   (name "xfce4-verve-plugin")
-   (version "2.0.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-verve-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-verve-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "17p0kxnzx4ks3rs281x5pvwksl1gh2mg7h7mkccjmkzr3cgi5gz1"))))
+    (name "xfce4-verve-plugin")
+    (version "2.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "023d1vv0qa9ig8k15m7bl0b9hgqg7c7lf1w7d8av2y2g7xi8ljwg"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui pcre2 xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/")
     (synopsis "Command line for the Xfce panel")
     (description "The Verve plugin provides a comfortable command line
 for the Xfce panel.  It supports several features, such as:
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 59/68] gnu: xfce4-places-plugin: Update to 1.8.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:6d1263408a38a4bec78dfb5baa45c594692c9114.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-places-plugin): Update to 1.8.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Remove gtk+-2.

[home-page]: Set to docs.xfce.org.

Change-Id: I4ba0a7044ccc01a0fe72feb9f12a57286c33675f

---

gnu/packages/xfce.scm | 30 +++++++++++++++---------------

1 file changed, 15 insertions(+), 15 deletions(-)

Toggle diff (46 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7347ee3ab0..e713053598 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2028,24 +2028,24 @@ (define-public xfce4-netload-plugin
 
 (define-public xfce4-places-plugin
   (package
-   (name "xfce4-places-plugin")
-   (version "1.8.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-places-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-places-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0hy7c350x1p1grj517l1x0r8b4asbcv7sl3b5qnb0apj0dnhw7gi"))))
+    (name "xfce4-places-plugin")
+    (version "1.8.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09yqnya7hr4vr6pn4ddzs7vx8582yyf1wrrwd1fmd81f7mdns1w7"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool desktop-file-utils pkg-config))
+     (list desktop-file-utils xfce4-dev-tools))
     (inputs
-     (list gtk+-2 exo libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin")
+     (list exo libxfce4ui xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-places-plugin/")
     (synopsis "Gnome-like Places menu for the Xfce panel")
     (description "This plugin provides a menu with quick access to folders,
 documents, and removable media.  The places plugin brings much of the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 60/68] gnu: xfce4-smartbookmark-plugin: Update to 0.5.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:4d6f00c1076a3a5685f39f7db31e61753daa62a6.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-smartbookmark-plugin): Update to 0.5.3.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Iacda6cae5eb7a8537cafbd601541295a8c2391de

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e713053598..684a2e7c8b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2065,24 +2065,24 @@ (define-public xfce4-places-plugin
 
 (define-public xfce4-smartbookmark-plugin
   (package
-   (name "xfce4-smartbookmark-plugin")
-   (version "0.5.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-smartbookmark-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-smartbookmark-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1lyd64qc9w6qnpqjb5xk0mjq4l7riv6z7l9aws28clalb8prw9ra"))))
+    (name "xfce4-smartbookmark-plugin")
+    (version "0.5.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rm2yii0xas9n3aqsq6lb378czcylm8xcb2ng7lnl2r5l8qyb9m4"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-smartbookmark-plugin/")
     (synopsis "Perform custom searches in your browser from the Xfce panel")
     (description "This plugin allows you to send search requests
 directly to your browser, such that you can search through your
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 63/68] gnu: xfce4-systemload-plugin: Update to 1.3.3.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:5bc3021a8bf9cb38ee99d1e3e6e2bc59a1578130.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-systemload-plugin): Update to 1.3.3.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I1b970db60e4a61ca7ef5a99cec70bcbf23c21e56

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c7c2e5f43a..176d0f8eff 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2144,24 +2144,24 @@ (define-public xfce4-stopwatch-plugin
 
 (define-public xfce4-systemload-plugin
   (package
-   (name "xfce4-systemload-plugin")
-   (version "1.3.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-systemload-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-systemload-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0wmh09w5fnm9srbr6r4gpdima738szqcp3qbzb8kl18f0b1kyc5v"))))
+    (name "xfce4-systemload-plugin")
+    (version "1.3.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ds1z5zwsrk6m4sxa5fnaqk19vhiy1z7xjn91q1z03cys6j3a025"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libgtop libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/")
     (synopsis "System load display plugin for the Xfce panel")
     (description "A system load plugin for the Xfce4 desktop
 environment.  It displays the current CPU load, the memory in use, the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 61/68] gnu: xfce4-statusnotifier-plugin: Superseded by xfce4-panel.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:613edd2b878d0699bd8104f8bc8d3d6ba327050d.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-statusnotifier-plugin)[home-page]: Set to docs.xfce.org.

[properties]: Mark as superseded by xfce4-panel.

Change-Id: I190bec4d575deb2b56f1753b90f7050e7b9ff48f

---

gnu/packages/xfce.scm | 8 ++++----

1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 684a2e7c8b..a8a950ae74 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2108,15 +2108,15 @@ (define-public xfce4-statusnotifier-plugin
            `(,glib "bin")))
     (inputs
      (list libxfce4ui libdbusmenu xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-statusnotifier-plugin/")
     (synopsis "Xfce panel plugin for status notifier items")
-(description "This plugin provides a panel area for status
+    (description "This plugin provides a panel area for status
 notifier items (application indicators).  Applications may use these
 items to display their status and interact with the user.  This
 technology is a modern alternative to systray and follows the
 freedesktop.org specification.")
-    (license gpl2+)))
+    (license gpl2+)
+    (properties `((superseded . ,xfce4-panel)))))
 
 (define-public xfce4-stopwatch-plugin
   (package
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 62/68] gnu: xfce4-stopwatch-plugin: Update to 0.5.2.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:04d7efc540c0e6c0abbbecb986f91118efbe875f.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-stopwatch-plugin): Update to 0.5.2.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I2656b9a43041215fda5f6e21c86a8b35666bcde9

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a8a950ae74..c7c2e5f43a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2120,24 +2120,24 @@ (define-public xfce4-statusnotifier-plugin
 
 (define-public xfce4-stopwatch-plugin
   (package
-   (name "xfce4-stopwatch-plugin")
-   (version "0.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-stopwatch-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-stopwatch-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1q840298jzdqlhc9lw49q32xzdhnbzcgvv69qq5slkc704s5w6vw"))))
+    (name "xfce4-stopwatch-plugin")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "12b6r9vmqqwqdk8pwbi6xgcfbwvw26lz298b3k53aajvy80lxgql"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-stopwatch-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-stopwatch-plugin/")
     (synopsis "Stopwatch plugin for the Xfce panel")
     (description "This Xfce panel plugin keeps track of elapsed time.")
     (license bsd-2)))
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 56/68] gnu: xfce4-mpc-plugin: Update to 0.5.5.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:216b30331cc473b877217ec2fb712a7700207368.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-mpc-plugin): Update to 0.5.5.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ia98235afda9f6c8e0b6a19b790ab0eb785f95fce

---

gnu/packages/xfce.scm | 27 ++++++++++++++-------------

1 file changed, 14 insertions(+), 13 deletions(-)

Toggle diff (44 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5e536420b2..c3bbae3448 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1934,23 +1934,24 @@ (define-public xfce4-mailwatch-plugin
 
 (define-public xfce4-mpc-plugin
   (package
-   (name "xfce4-mpc-plugin")
-   (version "0.5.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-mpc-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-mpc-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0kb6nz3md3cacl7ys6gz4h2qailr050wp28b7qy2v66d396znrq4"))))
+    (name "xfce4-mpc-plugin")
+    (version "0.5.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1hxpxvlbz0dmfy8d7kay9c08nx9bs19sqrgpzw2f64jfznv0xaay"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/")
     (synopsis "Music Player Daemon plugin for the Xfce panel")
     (description "This is a simple client plugin for Music Player Daemon.
 
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 55/68] gnu: xfce4-mailwatch-plugin: Update to 1.3.2.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:e683fe14e1e76809d96c5916d32bcef0197e9a5f.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-mailwatch-plugin): Update to 1.3.2.

[native-inputs]: Add xfce4-dev-tools.

[inputs]: Add gnutls.

[home-page]: Set to docs.xfce.org.

[license]: Set to gpl2+.

Change-Id: Ibd49182530730030e00187a5dde62b3985e407ef

---

gnu/packages/xfce.scm | 33 +++++++++++++++++----------------

1 file changed, 17 insertions(+), 16 deletions(-)

Toggle diff (63 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a7a7a184b2..5e536420b2 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -72,6 +72,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages textutils)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages wm)
@@ -1899,24 +1900,24 @@ (define-public xfce4-genmon-plugin
 
 (define-public xfce4-mailwatch-plugin
   (package
-   (name "xfce4-mailwatch-plugin")
-   (version "1.3.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-mailwatch-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-mailwatch-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0sh402c7v3sa9nqz8dd2gfn7ml01xbhir680ci46i9jczvln8j85"))))
+    (name "xfce4-mailwatch-plugin")
+    (version "1.3.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0dad2nl8y5v2y4xcp1lp51s0n1yb7v706igs5w2xrfsp7gp19d98"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
-     (list gtk+-2 libxfce4ui exo xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin")
+     (list exo gnutls libxfce4ui xfce4-panel))
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/")
     (synopsis "Mail watch plugin for the Xfce panel")
     (description "The Xfce4 Mailwatch Plugin is a multi-protocol,
 multi-mailbox mail watcher.  Currently, the protocols supported are:
@@ -1929,7 +1930,7 @@ (define-public xfce4-mailwatch-plugin
 @item MH-Maildir mail spool (local)
 @item Google Mail (GMail) mailbox (remote) (requires gnutls)
 @end itemize")
-    (license gpl2)))
+    (license gpl2+)))
 
 (define-public xfce4-mpc-plugin
   (package
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 54/68] gnu: xfce4-genmon-plugin: Update to 4.2.1.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:7a44273734b0aa94fa610d60df2be8fbbd0bd007.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-genmon-plugin): Update to 4.2.1.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I278f39ded40fc528de9aedc2e5c6110b0a85603f

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index df3b4da1c3..a7a7a184b2 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1870,24 +1870,24 @@ (define-public xfce4-fsguard-plugin
 
 (define-public xfce4-genmon-plugin
   (package
-   (name "xfce4-genmon-plugin")
-   (version "4.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-genmon-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-genmon-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0qh3b818kbf5sc07dshkd54nhqncsk0inlwv21zq8h11bzp0i3cl"))))
+    (name "xfce4-genmon-plugin")
+    (version "4.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1ap5qn2g1f4n3m30h9i0x2h8r84cfdh6pylnp0jc7r9gy910mxgm"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/")
     (synopsis "Generic program output monitor for the Xfce panel")
     (description "This plugin cyclically spawns the indicated
 script/program, captures its output (stdout) and displays the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 57/68] gnu: xfce4-mount-plugin: Update to 1.1.7.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:9d7d51bd337649a87b8ca7e41c1795f573202f7a.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-mount-plugin): Update to 1.1.7.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I3187bbb9e1d62eb736812ba988882aeddc1a0750

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c3bbae3448..a9ed14ff88 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1976,24 +1976,24 @@ (define-public xfce4-mpc-plugin
 
 (define-public xfce4-mount-plugin
   (package
-   (name "xfce4-mount-plugin")
-   (version "1.1.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-mount-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-mount-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0ca8j2smq20zydj0gbb20fkcisgzcswpnpz5h8laxb3ghr03frlg"))))
+    (name "xfce4-mount-plugin")
+    (version "1.1.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1s3882dv4a9wmfcjjgn2yk6naswsgfy5cr2ql0wmdgzzg4s3pwl7"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-mount-plugin/")
     (synopsis "Mount/unmount plugin for the Xfce panel")
     (description "The plugin will display a list of items representing
 your various devices.  If you click on an unmounted devices it will
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 53/68] gnu: xfce4-fsguard-plugin: Update to 1.1.4.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:7de10de8d81bb45953a19a0a4720c50b2e6d1373.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-fsguard-plugin): Update to 1.1.4.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ie66a6f6bab34f8861c0633224555377c9205ccd0

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index be852f1157..df3b4da1c3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1842,24 +1842,24 @@ (define-public xfce4-diskperf-plugin
 
 (define-public xfce4-fsguard-plugin
   (package
-   (name "xfce4-fsguard-plugin")
-   (version "1.1.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-fsguard-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-fsguard-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0n62dsc25ynv8kk5va50py88fi0lgggvl0gi1r6dd4i2fns8pvw4"))))
+    (name "xfce4-fsguard-plugin")
+    (version "1.1.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0df9gs9wjmnb2889a0ssfjvjviswcjkcq6f8211fyzzqaj2gn9n0"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/")
     (synopsis "Xfce panel plugin to monitor free disk space")
     (description "The panel plugin checks free space on a chosen mount
 point frequently and displays a message when a limit is reached.  There
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 46/68] gnu: xfce4-volumed-pulse: Update to 0.2.5.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:4ce8f1265e0e8569bdfedc35d88864a4f5955db1.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-volumed-pulse): Update to 0.2.5.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to gitlab.xfce.org.

Change-Id: Ifc8015a5ec9a076b8a953635e99cbc76cfa315f5

---

gnu/packages/xfce.scm | 23 ++++++++++++-----------

1 file changed, 12 insertions(+), 11 deletions(-)

Toggle diff (40 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 4fd927268c..bbc2f90195 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1661,21 +1661,22 @@ (define-public xfce4-screensaver
 (define-public xfce4-volumed-pulse
   (package
     (name "xfce4-volumed-pulse")
-    (version "0.2.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/apps/"
-                                  name "/" (version-major+minor version) "/"
-                                  name "-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0ql3hlciffjs981jp21hg6phrk25crh64yc01fm0l75k4vvf66d0"))))
+    (version "0.2.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/apps/" name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0vr20rm81kd0av85zvfghzbczs4ahkxi1n4qn4hikqnb67iwrcq3"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list xfconf libnotify pulseaudio keybinder-3.0 gtk+))
-    (home-page "https://goodies.xfce.org/projects/applications/xfce4-volumed")
+    (home-page "https://gitlab.xfce.org/apps/xfce4-volumed-pulse")
     (synopsis "XFCE volume keys daemon")
     (description
      "This is a volume keys control daemon for Xfce Desktop environment. It controls
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 47/68] gnu: xfce4-cpugraph-plugin: Update to 1.2.11.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:f77c0d9d032f4bd4232ce05427b0171e040d64a5.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-cpugraph-plugin): Update to 1.2.11.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I5038adfe88af206235605250efa32d73890623bb

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bbc2f90195..666807d291 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1685,24 +1685,24 @@ (define-public xfce4-volumed-pulse
 
 (define-public xfce4-cpugraph-plugin
   (package
-   (name "xfce4-cpugraph-plugin")
-   (version "1.2.10")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-cpugraph-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-cpugraph-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "05frfn3y009xndks9rsw90jgk0v5zfarn5jqaqci45v9ab82sy9p"))))
+    (name "xfce4-cpugraph-plugin")
+    (version "1.2.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1z3vbpn6ylx32fnncswi0ghp01bpxqvs0idmr8fc3rl546pgmqa3"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/")
     (synopsis "Display CPU load as a graph in the Xfce panel")
     (description "This panel plugin offers multiple display
 modes (LED, gradient, fire, etc…) to show the current CPU load of the
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 48/68] gnu: xfce4-eyes-plugin: Update to 4.6.2.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:c101eaaf2a7e70db37add6a2da8890b5d4cf9713.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-eyes-plugin): Update to 4.6.2.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: I97c8114fad77038d2cbad0afdd23d9a49f557cb8

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 666807d291..a870dcdce0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1716,24 +1716,24 @@ (define-public xfce4-cpugraph-plugin
 
 (define-public xfce4-eyes-plugin
   (package
-   (name "xfce4-eyes-plugin")
-   (version "4.6.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-eyes-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-eyes-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "092kmv2i0flg3zg622q0id70mz1kvlz27y12i5y3nfdsi1fz03xd"))))
+    (name "xfce4-eyes-plugin")
+    (version "4.6.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1wwfxhaxp6r8g4jvj5ax7a3djh4q896ilxdfdcx6n67qzs5ksq8h"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin/")
     (synopsis "Display a pair of eyes for the Xfce panel")
     (description "Eyes is a toy Xfce panel plugin that adds eyes which
 watch your every step.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 49/68] gnu: xfce4-datetime-plugin: Switch to git source.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:008cd40bb84d726d0d538a8bcf41991fb6a9bb3e.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-datetime-plugin)[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: If75be225349b366f1e94b0361e68a3705bd35b2a

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a870dcdce0..e92317ca6a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1741,24 +1741,24 @@ (define-public xfce4-eyes-plugin
 
 (define-public xfce4-datetime-plugin
   (package
-   (name "xfce4-datetime-plugin")
-   (version "0.8.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-datetime-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-datetime-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "1c00rj3h25g0g3ss5n07hp2ziis3rnjd5jr6firnhs2qzdwynbkb"))))
+    (name "xfce4-datetime-plugin")
+    (version "0.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qkaz932qrkbajicd8h8ik405804xvaz1bqf36sh73nmvrj7k4vn"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-datetime-plugin/")
     (synopsis "Display date and time inside the Xfce panel")
     (description "This plugin shows the date and time in the panel,
 and a calendar appears when you left-click on it.")
-- 
2.46.0

iyzsong wrote 2 days ago

[PATCH v4 58/68] gnu: xfce4-netload-plugin: Update to 1.4.2.

Recipients:(address . 75146@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)

Message-ID:e93f5788fdb30aa4b897b0785a49cae43d54777a.1735627083.git.iyzsong@member.fsf.org

* gnu/packages/xfce.scm (xfce4-netload-plugin): Update to 1.4.2.

[source]: Switch to git-fetch.

[native-inputs]: Add xfce4-dev-tools.

[home-page]: Set to docs.xfce.org.

Change-Id: Ife87b33390b2cc91b3250d1616924a32d24894e7

---

gnu/packages/xfce.scm | 28 ++++++++++++++--------------

1 file changed, 14 insertions(+), 14 deletions(-)

Toggle diff (45 lines)diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a9ed14ff88..7347ee3ab0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -2003,24 +2003,24 @@ (define-public xfce4-mount-plugin
 
 (define-public xfce4-netload-plugin
   (package
-   (name "xfce4-netload-plugin")
-   (version "1.4.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://archive.xfce.org/src/panel-plugins/"
-                                  "xfce4-netload-plugin/"
-                                  (version-major+minor version)
-                                  "/xfce4-netload-plugin-" version ".tar.bz2"))
-              (sha256
-               (base32
-                "0kmlrh29gn6yby8l1lgxp4211pjn3mrd2z0jzd5mh61fslx3mb4z"))))
+    (name "xfce4-netload-plugin")
+    (version "1.4.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url (string-append "https://gitlab.xfce.org/panel-plugins/"
+                                 name))
+             (commit (string-append name "-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ck3mdwhj7pzrb1xhynyp4550x27bvlja9z50as30mi070vn92l3"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list intltool pkg-config))
+     (list xfce4-dev-tools))
     (inputs
      (list libxfce4ui xfce4-panel))
-    (home-page
-     "https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin")
+    (home-page "https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/")
     (synopsis "Netload plugin for the Xfce Panel")
     (description "This plugin displays the current load of the network
 interfaces of your choice in the panel.")
-- 
2.46.0

Ashvith Shetty wrote 44 hours ago

Re: [bug#75146] [PATCH v0 00/15] XFCE: Move source from generated archive to git.

Recipients:(name . ???)(address . iyzsong@envs.net)(address . 75146@debbugs.gnu.org)

Message-ID:CA+n6Bx8MqOTyBgD+HOja5K26Hx89LKdYL3WwDVFKp2i8i-rfAw@mail.gmail.com

Hello,

On Mon, Dec 30, 2024 at 2:24?PM ??? <iyzsong@envs.net> wrote:

Toggle quote (6 lines)

> I had sent updates via v3, which add autotools, automake, etc. to

> propagated-inputs of xfce4-dev-tools to avoid add them to every

> packages. There are still many xfce packages remain to

> be updated. @Ashvith do you want to continue the work? or I can

> do them later..

Actually, I still have a few commits left to submit, but they require
some minor modifications, so I don't mind either way. I'll finish
updating every XFCE panel plugin first, which would be faster for me.
Would that be okay for you?

Regards,
Ashvith

??? wrote 30 hours ago

Recipients:(name . Ashvith Shetty)(address . ashvithshetty10@gmail.com)(address . 75146-done@debbugs.gnu.org)

Message-ID:87o70qopvc.fsf@envs.net

Ashvith Shetty <ashvithshetty10@gmail.com> writes:

Toggle quote (15 lines)> Hello,
>
> On Mon, Dec 30, 2024 at 2:24?PM ??? <iyzsong@envs.net> wrote:
>
>> I had sent updates via v3, which add autotools, automake, etc. to
>> propagated-inputs of xfce4-dev-tools to avoid add them to every
>> packages.  There are still many xfce packages remain to
>> be updated.  @Ashvith do you want to continue the work?  or I can
>> do them later..
>
> Actually, I still have a few commits left to submit, but they require
> some minor modifications, so I don't mind either way. I'll finish
> updating every XFCE panel plugin first, which would be faster for me.
> Would that be okay for you?

I had pushed v4 patches which update all xfce packages, close this issue

now, you can send updates as new issues.

Thank you!

Closed

Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 75146@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 75146

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch