From a456b09c43b2505edfbd3c16c4130af4b72a30e2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 13:47:59 -0500 Subject: gnu: gdk-pixbuf: Absorb grafted replacement. * gnu/packages/gtk.scm (gdk-pixbuf)[source]: Use gdk-pixbuf-CVE-2020-29385.patch. [replacement]: Remove field. (gdk-pixbuf/fixed): Remove variable. --- gnu/packages/gtk.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bffc9e0298..16efb072a3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -567,12 +567,12 @@ highlighting and other features typical of a source code editor.") (package (name "gdk-pixbuf") (version "2.40.0") - (replacement gdk-pixbuf/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "gdk-pixbuf-CVE-2020-29385.patch")) (sha256 (base32 "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm")))) @@ -624,15 +624,6 @@ in the GNOME project.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/gdk-pixbuf/"))) -(define gdk-pixbuf/fixed - (package - (inherit gdk-pixbuf) - (source (origin - (inherit (package-source gdk-pixbuf)) - (patches - (append (search-patches "gdk-pixbuf-CVE-2020-29385.patch") - (origin-patches (package-source gdk-pixbuf)))))))) - ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends ;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the ;; closure size. -- cgit 1.4.1 From d178039a07a33751ac4f7cd582df5ae7349db4fb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 13:44:18 -0500 Subject: gnu: cairo: Absorb grafted replacement. * gnu/packages/gtk.scm (cairo)[source]: Use cairo-CVE-2018-19876.patch and cairo-CVE-2020-35492.patch. [replacement]: Remove field. (cairo/fixed): Remove variable. --- gnu/packages/gtk.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 16efb072a3..24fd48d971 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -125,11 +125,12 @@ tools have full access to view and control running applications.") (package (name "cairo") (version "1.16.0") - (replacement cairo/fixed) (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) + (patches (search-patches "cairo-CVE-2018-19876.patch" + "cairo-CVE-2020-35492.patch")) (sha256 (base32 "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) @@ -176,15 +177,6 @@ affine transformation (scale, rotation, shear, etc.).") (license license:lgpl2.1) ; or Mozilla Public License 1.1 (home-page "https://cairographics.org/"))) -(define cairo/fixed - (package - (inherit cairo) - (source (origin - (inherit (package-source cairo)) - (patches (append (search-patches "cairo-CVE-2018-19876.patch" - "cairo-CVE-2020-35492.patch") - (origin-patches (package-source cairo)))))))) - (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cairo. (package/inherit cairo -- cgit 1.4.1 From 583aeadb0d972f35f70c4b1fde51ec2ad4991abe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Apr 2021 11:08:02 +0200 Subject: gnu: gtkdatabox: Update to 1.0.0. * gnu/packages/gtk.scm (gtkdatabox): Update to 1.0.0. [inputs]: Substitute gtk+ for gtk+-2. --- gnu/packages/gtk.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bffc9e0298..542e274ce3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016 Patrick Hetu ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018, 2020 Arun Isaac @@ -2351,19 +2351,19 @@ foreground and background colors, text justification and more.") (define-public gtkdatabox (package (name "gtkdatabox") - (version "0.9.3.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gtkdatabox/gtkdatabox/" - version "/gtkdatabox-" version ".tar.gz")) - (sha256 - (base32 - "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh")))) + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gtkdatabox/gtkdatabox3/" + "gtkdatabox-" version ".tar.gz")) + (sha256 + (base32 "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("gtk+-2" ,gtk+-2))) + `(("gtk+" ,gtk+))) (synopsis "Display widget for dynamic data") (description "GtkDatabox is a widget for live display of large amounts of fluctuating numerical data. It enables data presentation (for example, on -- cgit 1.4.1 From 2ff36e418680526a91d9350489f4fc828f5147d3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 26 Apr 2021 10:19:32 +0200 Subject: gnu: gtkdatabox: Adjust source URL. It looks like the package sources have been relocated. Hash is still the same. * gnu/packages/gtk.scm (gtkdatabox) [source]: Adjust URL. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 542e274ce3..eb274dd184 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2355,7 +2355,7 @@ foreground and background colors, text justification and more.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/gtkdatabox/gtkdatabox3/" + (uri (string-append "mirror://sourceforge/gtkdatabox/gtkdatabox-1/" "gtkdatabox-" version ".tar.gz")) (sha256 (base32 "1qykm551bx8j8pfgxs60l2vhpi8lv4r8va69zvn2594lchh71vlb")))) -- cgit 1.4.1 From 7cea32e407903d7e94da589e17b803be2fc5b05d Mon Sep 17 00:00:00 2001 From: Simon Streit Date: Thu, 6 May 2021 11:22:08 +0200 Subject: gnu: Add volctl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (volctl): New Variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gtk.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8c8a2956ef..4883638587 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)) @@ -2354,3 +2356,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))) -- cgit 1.4.1 From da4073acf99687cda9a387a9d0ba993432400978 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 May 2021 14:46:47 +0200 Subject: gnu: volctl: Comment on the license. * gnu/packages/gtk.scm (volctl): Comment on the license. --- gnu/packages/gtk.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4883638587..e64dc69798 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2399,4 +2399,7 @@ user interaction (e.g. measuring distances).") 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.") + + ;; XXX: 'setup.py' says "GPLv2" but nothing says "version 2 only". Is + ;; GPLv2+ intended? (license license:gpl2))) -- cgit 1.4.1