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: Ashvith Shetty <Ashvith <at> noreply.codeberg.org>, Zhu Zihao <all_but_last <at> 163.com>, 宋文武 <iyzsong <at> envs.net>
Subject: [bug#75146] [PATCH v3 11/16] gnu: xfce4-panel: Switch to git source.
Date: Mon, 30 Dec 2024 22:21:56 +0800

From: Ashvith Shetty <Ashvith <at> noreply.codeberg.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(-)

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

Previous Next

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