From patchwork Thu May 6 09:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 29147 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 ACE5227BC82; Thu, 6 May 2021 10:40:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3B33A27BC81 for ; Thu, 6 May 2021 10:40:56 +0100 (BST) Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leaV5-0001Uo-Fb for patchwork@mira.cbaines.net; Thu, 06 May 2021 05:40:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leaUE-0000OF-K5 for guix-patches@gnu.org; Thu, 06 May 2021 05:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leaUE-0004m4-B9 for guix-patches@gnu.org; Thu, 06 May 2021 05:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leaUE-0007is-8K for guix-patches@gnu.org; Thu, 06 May 2021 05:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48027] [PATCH] gnu: Add volctl. Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 May 2021 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48027 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 48027@debbugs.gnu.org Received: via spool by 48027-submit@debbugs.gnu.org id=B48027.162029394629672 (code B ref 48027); Thu, 06 May 2021 09:40:02 +0000 Received: (at 48027) by debbugs.gnu.org; 6 May 2021 09:39:06 +0000 Received: from localhost ([127.0.0.1]:37126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leaTD-0007iF-1h for submit@debbugs.gnu.org; Thu, 06 May 2021 05:39:06 -0400 Received: from smtprelay04.ispgateway.de ([80.67.18.16]:58433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leaT9-0007i9-9z for 48027@debbugs.gnu.org; Thu, 06 May 2021 05:38:58 -0400 Received: from [93.195.166.153] (helo=milk) by smtprelay04.ispgateway.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1leaT0-0004TQ-Gg; Thu, 06 May 2021 11:38:46 +0200 From: Simon Streit References: <87wnsftth9.fsf@gnu.org> Gcc: nnfolder+archive:sent.2021-05 Date: Thu, 06 May 2021 11:39:27 +0200 In-Reply-To: <87wnsftth9.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Mon, 03 May 2021 23:09:22 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Ludovic, Ludovic Courtès writes: >> + (source (origin >> + (method url-fetch) >> + (uri (string-append "https://github.com/buzz/" name >> + "/archive/v" version ".tar.gz")) >> + (sha256 >> + (base32 >> + "1xanqn6s2i6s2n6wysvgz6l58lsdkl3zmzz4hccla01gx7h4yx4f")))) > > To placate ‘guix lint’, could you (1) use ‘git-fetch’ instead of > referring to an autogenerated tarball, and (2) add a ‘file-name’ field > as done elsewhere? Thanks for your reply. I was using guix lint, but there I wasn't quite sure how to it the correct way. Yes, looking at other definitions I simply copied it from there. The linter is quiet now. Thanks for your tip! > Could you send an updated patch? Applied the suggestions. Please find the updated patch as attachment. I'm well chuffed having this posted now. Cheers, Simon From 64730108ee4900836637fe2b37619652e2252606 Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 6 May 2021 11:22:08 +0200 Subject: [PATCH] gnu: Add volctl. * gnu/packages/gtk.scm (volctl): New Variable. --- gnu/packages/gtk.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 542e274ce3..6d32b70458 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages pulseaudio) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match)) @@ -2371,3 +2373,47 @@ linear or logarithmic scales, as dots or lines, with markers/labels) as well as user interaction (e.g. measuring distances).") (home-page "https://sourceforge.net/projects/gtkdatabox/") (license license:lgpl2.1+))) + +(define-public volctl + (package + (name "volctl") + (version "0.8.2") + (source (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/buzz/volctl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((pulse (assoc-ref inputs "pulseaudio")) + (xfixes (assoc-ref inputs "libxfixes"))) + (substitute* "volctl/lib/xwrappers.py" + (("libXfixes.so") + (string-append xfixes "/lib/libXfixes.so"))) + (substitute* "volctl/lib/pulseaudio.py" + (("libpulse.so.0") + (string-append pulse "/lib/libpulse.so.0"))) + #t)))))) + (inputs + `(("gtk+" ,gtk+) + ("libxfixes" ,libxfixes) + ("pulseaudio" ,pulseaudio))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyyaml" ,python-pyyaml))) + (home-page "https://buzz.github.io/volctl/") + (synopsis "Per-application volume control and on-screen display (OSD) for graphical desktops") + (description "Volctl is a PulseAudio-enabled tray icon volume control and +OSD applet for graphical desktops. It's not meant to be an replacement for a +full-featured mixer application. If you're looking for that check out the +excellent pavucontrol.") + (license license:gpl2))) -- 2.31.1