From patchwork Mon Jun 5 23:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 50724 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4091627BBE2; Tue, 6 Jun 2023 00:19:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 380AA27BBE2 for ; Tue, 6 Jun 2023 00:19:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6JTh-0005z7-Kr; Mon, 05 Jun 2023 19:19:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6JTc-0005wY-Gs for guix-patches@gnu.org; Mon, 05 Jun 2023 19:19:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6JTc-00084d-7P for guix-patches@gnu.org; Mon, 05 Jun 2023 19:19:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6JTa-0006t0-GI for guix-patches@gnu.org; Mon, 05 Jun 2023 19:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63080] [PATCH] * gnu: Move stalonetray to (gnu packages xdisorg). References: <20230426001152.71300-1-kiasoc5@disroot.org> In-Reply-To: <20230426001152.71300-1-kiasoc5@disroot.org> Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 05 Jun 2023 23:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63080@debbugs.gnu.org Cc: kiasoc5 Received: via spool by 63080-submit@debbugs.gnu.org id=B63080.168600712226435 (code B ref 63080); Mon, 05 Jun 2023 23:19:02 +0000 Received: (at 63080) by debbugs.gnu.org; 5 Jun 2023 23:18:42 +0000 Received: from localhost ([127.0.0.1]:50505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6JTF-0006sG-KV for submit@debbugs.gnu.org; Mon, 05 Jun 2023 19:18:42 -0400 Received: from knopi.disroot.org ([178.21.23.139]:60348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6JTC-0006s1-C3 for 63080@debbugs.gnu.org; Mon, 05 Jun 2023 19:18:40 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5986640623; Tue, 6 Jun 2023 01:18:33 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gf2bgvKtSq1X; Tue, 6 Jun 2023 01:18:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1686007111; bh=g7/cCYmLBTJKMD5dXmAquxrgnd0bK49drMYQU8l9Id4=; h=From:To:Cc:Subject:Date; b=Ryb8xmsM32O9vSxQyXY5AXexrDeme18aCulIP3zsyANq9KaCziza4lVL0hf0ADoe8 Mk0Q8vP4Q/UqvRXyBWP/zZu3NaCPPdSz/Kka5Ey8q2vHcP0vLWoYYItJfH0Jnj7wIf DGkk13QBrOZb3OaUeQL9erMwH74FLqvNLHiDES9+yl3egP8H3xtfipONGUCzUyDBAC va8FAEA0IoqLh3R2PiCItLa3QkR/2X2jRUQA9tK2VEH0kvA24a+RGQv1qYea3+q1pM INKTGIpJk48hoDcYEsF1IT2bunjbg9yXFOrk3xX9Zbybm0ghEerzURyRRclCatkN4O amxxT+9hMa7ug== Date: Mon, 5 Jun 2023 19:18:20 -0400 Message-Id: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches See . * 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 base-commit: f598f5b870462afbb5a5770c1b16071bca63fc52 prerequisite-patch-id: 45ae29dd8297f83231b66d1fc3f357b903f7a080 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 -;;; Copyright © 2016 Efraim Flashner -;;; -;;; 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 . - -(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")