From 63b3e2e61bf74d3efb0dd2c984237fd83738ec1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 31 Dec 2024 11:44:13 +0800 Subject: [PATCH] gnu: xfdesktop: Switch to git source. * 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 4ea06ba4a8b9b7fe93c45b4dc749500691efd9d7..6bc29fc8c19f78f5d7f99898827e1edcafe8759f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1049,35 +1049,24 @@ window manager.") (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 @@ window manager.") #: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 @@ window manager.") 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