all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5.
@ 2023-04-26  0:11 kiasoc5 via Guix-patches via
  2023-05-01 14:15 ` Efraim Flashner
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2023-04-26  0:11 UTC (permalink / raw)
  To: 63080; +Cc: kiasoc5, Raimon Grau, Efraim Flashner

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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5.
  2023-04-26  0:11 [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5 kiasoc5 via Guix-patches via
@ 2023-05-01 14:15 ` Efraim Flashner
  2023-06-05 23:18 ` [bug#63080] [PATCH] * gnu: Move stalonetray to (gnu packages xdisorg) kiasoc5 via Guix-patches via
  2023-08-15 21:23 ` bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5 Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: Efraim Flashner @ 2023-05-01 14:15 UTC (permalink / raw)
  To: kiasoc5; +Cc: raimonster, 63080

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

On Tue, Apr 25, 2023 at 08:11:52PM -0400, kiasoc5 wrote:
> The last update for stalonetray.scm was in 2016, and it only contains stalonetray. Could it be moved to xdisorg.scm?

That's fine with me.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#63080] [PATCH] * gnu: Move stalonetray to (gnu packages xdisorg).
  2023-04-26  0:11 [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5 kiasoc5 via Guix-patches via
  2023-05-01 14:15 ` Efraim Flashner
@ 2023-06-05 23:18 ` kiasoc5 via Guix-patches via
  2023-08-15 21:23 ` bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5 Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2023-06-05 23:18 UTC (permalink / raw)
  To: 63080; +Cc: kiasoc5

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.
---
 gnu/local.mk                 |  1 -
 gnu/packages/stalonetray.scm | 69 ------------------------------------
 gnu/packages/xdisorg.scm     | 41 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 70 deletions(-)
 delete mode 100644 gnu/packages/stalonetray.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index f9afb433e6..69b7d511a0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -586,7 +586,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/squirrel.scm			\
   %D%/packages/ssh.scm				\
   %D%/packages/sssd.scm				\
-  %D%/packages/stalonetray.scm			\
   %D%/packages/statistics.scm			\
   %D%/packages/stb.scm				\
   %D%/packages/stenography.scm			\
diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm
deleted file mode 100644
index a9d842a99e..0000000000
--- a/gnu/packages/stalonetray.scm
+++ /dev/null
@@ -1,69 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Raimon Grau <raimonster@gmail.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; 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 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.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-	(git-reference
-	 (url "https://github.com/kolbusa/stalonetray")
-	 (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-	(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 docbook-xsl libxslt))
-    (build-system gnu-build-system)
-    (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
-tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86).  It
-has full XEMBED support and minimal dependencies: an X11 lib only.  Stalonetray
-works with virtually any EWMH-compliant window manager.")
-    (license gpl2+)))
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index b8671d1cf6..615ac32aa0 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -102,6 +102,7 @@ (define-module (gnu packages xdisorg)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -2002,6 +2003,46 @@ (define-public tint2
 actions, a built-in clock, a battery monitor and a system tray.")
     (license license:gpl2)))
 
+(define-public stalonetray
+  (package
+    (name "stalonetray")
+    (version "0.8.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+	(git-reference
+	 (url "https://github.com/kolbusa/stalonetray")
+	 (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+	(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 docbook-xsl libxslt))
+    (build-system gnu-build-system)
+    (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
+tray (notification area) for X Window System/X11 (e.g. X.Org or XFree86).  It
+has full XEMBED support and minimal dependencies: an X11 lib only.  Stalonetray
+works with virtually any EWMH-compliant window manager.")
+    (license license:gpl2+)))
+
 (define-public tofi
   (package
     (name "tofi")

base-commit: f598f5b870462afbb5a5770c1b16071bca63fc52
prerequisite-patch-id: 45ae29dd8297f83231b66d1fc3f357b903f7a080
-- 
2.40.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5.
  2023-04-26  0:11 [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5 kiasoc5 via Guix-patches via
  2023-05-01 14:15 ` Efraim Flashner
  2023-06-05 23:18 ` [bug#63080] [PATCH] * gnu: Move stalonetray to (gnu packages xdisorg) kiasoc5 via Guix-patches via
@ 2023-08-15 21:23 ` Ludovic Courtès
  2 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2023-08-15 21:23 UTC (permalink / raw)
  To: kiasoc5; +Cc: Raimon Grau, 63080-done, Efraim Flashner

Hi,

kiasoc5 <kiasoc5@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’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-08-15 21:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-26  0:11 [bug#63080] [PATCH] gnu: stalonetray: Update to 0.8.5 kiasoc5 via Guix-patches via
2023-05-01 14:15 ` Efraim Flashner
2023-06-05 23:18 ` [bug#63080] [PATCH] * gnu: Move stalonetray to (gnu packages xdisorg) kiasoc5 via Guix-patches via
2023-08-15 21:23 ` bug#63080: [PATCH] gnu: stalonetray: Update to 0.8.5 Ludovic Courtès

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.