GNU bug report logs - #63080
[PATCH] gnu: stalonetray: Update to 0.8.5.

Previous Next

Package: guix-patches;

Reported by: kiasoc5 <kiasoc5 <at> disroot.org>

Date: Wed, 26 Apr 2023 00:13:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#63080: closed ([PATCH] gnu: stalonetray: Update to 0.8.5.)
Date: Tue, 15 Aug 2023 21:24:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Tue, 15 Aug 2023 23:23:28 +0200
with message-id <87wmxw6lv3.fsf <at> gnu.org>
and subject line Re: bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5.
has caused the debbugs.gnu.org bug report #63080,
regarding [PATCH] gnu: stalonetray: Update to 0.8.5.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
63080: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63080
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: kiasoc5 <kiasoc5 <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>, Raimon Grau <raimonster <at> gmail.com>,
 Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH] gnu: stalonetray: Update to 0.8.5.
Date: Tue, 25 Apr 2023 20:11:52 -0400
The last update for stalonetray.scm was in 2016, and it only contains stalonetray. Could it be moved to xdisorg.scm?

*  (stalonetray): Update to 0.8.5.
[source]: Switch to git reference from GitHub.
[arguments](phases): add phase to fix docbook root.
[inputs]: Add libxpm.
[native-inputs]: Add autoconf, autoconf, automake, libxslt, docbook-xsl.
[homepage]: Update.
---
 gnu/packages/stalonetray.scm | 38 +++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm
index 65732313fe..37b5cdaae3 100644
--- a/gnu/packages/stalonetray.scm
+++ b/gnu/packages/stalonetray.scm
@@ -18,28 +18,48 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages stalonetray)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:select (gpl2+))
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages docbook)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public stalonetray
   (package
     (name "stalonetray")
-    (version "0.8.3")
+    (version "0.8.5")
     (source
      (origin
-       (method url-fetch)
+       (method git-fetch)
        (uri
-        (string-append "mirror://sourceforge/stalonetray/stalonetray/stalonetray-"
-                       version "/stalonetray-" version ".tar.bz2"))
+	(git-reference
+	 (url "https://github.com/kolbusa/stalonetray")
+	 (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0k7xnpdb6dvx25d67v0crlr32cdnzykdsi9j889njiididc8lm1n"))))
-    (inputs (list libx11))
+	(base32
+	 "074wy1xppfycillbxq6fwrq87ik9glc95083df5vgm20mhzni7pz"))))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+	  (add-after 'unpack 'fix-docbook-root
+	    (lambda _
+	      (substitute* "configure.ac"
+		(("AC_SUBST\\(DOCBOOK_ROOT\\)" all)
+		 (string-append "DOCBOOK_ROOT="
+				#$(this-package-native-input "docbook-xsl")
+				"/xml/xsl/docbook-xsl-"
+				#$(package-version (this-package-native-input "docbook-xsl"))
+				"; " all))))))))
+    (inputs (list libx11 libxpm))
+    (native-inputs (list autoconf automake libxslt docbook-xsl))
     (build-system gnu-build-system)
-    (home-page "https://stalonetray.sourceforge.net")
+    (home-page "https://kolbusa.github.io/stalonetray")
     (synopsis "Standalone freedesktop.org and KDE systray implementation")
     (description
      "Stalonetray is a stand-alone freedesktop.org and KDE system

base-commit: 8093c6ba21c51efe901ba98ce698c545bf13dcd0
-- 
2.40.0



[Message part 3 (message/rfc822, inline)]
From: Ludovic Courtès <ludo <at> gnu.org>
To: kiasoc5 <kiasoc5 <at> disroot.org>
Cc: Raimon Grau <raimonster <at> gmail.com>, 63080-done <at> debbugs.gnu.org,
 Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5.
Date: Tue, 15 Aug 2023 23:23:28 +0200
Hi,

kiasoc5 <kiasoc5 <at> disroot.org> skribis:

> The last update for stalonetray.scm was in 2016, and it only contains stalonetray. Could it be moved to xdisorg.scm?
>
> *  (stalonetray): Update to 0.8.5.
> [source]: Switch to git reference from GitHub.
> [arguments](phases): add phase to fix docbook root.
> [inputs]: Add libxpm.
> [native-inputs]: Add autoconf, autoconf, automake, libxslt, docbook-xsl.
> [homepage]: Update.

[...]

> See <https://issues.guix.gnu.org/63080>.
>
> * gnu/packages/stalonetray.scm (stalonetray): Move from here…
> * gnu/packages/xdisorg.scm (stalonetray): …to here.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly.

Finally applied, thanks!

Ludo’.


This bug report was last modified 1 year and 282 days ago.

Previous Next


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