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

Previous Next

Full log

View this message in rfc822 format

From: iyzsong <at> envs.net
To: 75146 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>, Zhu Zihao <all_but_last <at> 163.com>, 宋文武 <iyzsong <at> envs.net>
Subject: [bug#75146] [PATCH v4 30/68] gnu: xfdesktop: Switch to git source.
Date: Tue, 31 Dec 2024 14:44:00 +0800

From: 宋文武 <iyzsong <at> 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(-)

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.