From 70897e328a8c7314d9e2ad90ea3c5c55f690dc7c Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sun, 28 Mar 2021 13:38:34 +0200 Subject: [PATCH 01/10] gnu: Use 'gtk-doc/stable' in native-inputs instead of 'gtk-doc'. Commit 9dea1618755891526f708aa335b4136c1302d16e only replaced 'gtk-doc' with 'gtk-doc/stable' in the native-inputs of some packages, but we may as well do this for all packages. * gnu/packages/admin.scm (thermald)[native-inputs]: Replace 'gtk-doc' with 'gtk-doc/stable'. gnu/packages/gimp.scm (glimpse)[native-inputs]: Likewise. gnu/packages/glib.scm (glib-with-documentation): Likewise. gnu/packages/mate.scm (mate-desktop, atril, caja-extensions) (mate-utils, eom, engrampa, pluma, mate-polkit)[native-inputs]: Likewise. gnu/packages/messaging.scm (libgnt, loudmouth)[native-inputs]: Likewise. gnu/packages/music.scm (denemo, gsequencer)[native-inputs]: Likewise. gnu/packages/photo.scm (entangle)[native-inputs]: Likewise. gnu/packages/security-token.scm (libu2f-host,libu2f-server)[native-inputs]: Likewise. gnu/packages/wm.scm (keybinder, keybinder-3.0)[native-inputs]: Likewise. --- gnu/packages/admin.scm | 3 ++- gnu/packages/gimp.scm | 3 ++- gnu/packages/glib.scm | 3 ++- gnu/packages/mate.scm | 17 +++++++++-------- gnu/packages/messaging.scm | 5 +++-- gnu/packages/music.scm | 5 +++-- gnu/packages/photo.scm | 3 ++- gnu/packages/security-token.scm | 5 +++-- gnu/packages/wm.scm | 5 +++-- 9 files changed, 29 insertions(+), 20 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index df7973395d..3bafa71edc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Hyunseok Kim +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -3580,7 +3581,7 @@ make it a perfect utility on modern distros.") ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("glib" ,glib "bin") ; for glib-genmarshal, etc. - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("dbus-glib" ,dbus-glib) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5d005e0378..b81a679261 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -594,7 +595,7 @@ transferring the style of an image.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("libxslt" ,libxslt) ; for xsltproc diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c04bd334e9..5f8186eabe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Arthur Margerit +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -426,7 +427,7 @@ dynamic loading, and an object system.") (properties (alist-delete 'hidden? (package-properties glib))) (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc + `(("gtk-doc" ,gtk-doc/stable) ; for the doc ("docbook-xml" ,docbook-xml) ("libxml2" ,libxml2) ,@(package-native-inputs glib))) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 44420147a3..5cee1bfe99 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -239,7 +240,7 @@ themes for both gtk+-2 and gtk+-3.") ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("yelp-tools" ,yelp-tools) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (inputs `(("gtk+" ,gtk+) ("libxrandr" ,libxrandr) @@ -761,7 +762,7 @@ infamous 'Wanda the Fish'.") ("yelp-tools" ,yelp-tools) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("xmllint" ,libxml2) ("zlib" ,zlib))) (inputs @@ -896,7 +897,7 @@ icons on the MATE desktop. It works on local and remote file systems.") ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml2" ,libxml2) ("pkg-config" ,pkg-config))) (inputs @@ -1258,7 +1259,7 @@ can be used as backgrounds in the MATE Desktop environment.") (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libice" ,libice) ("libsm" ,libsm) @@ -1310,7 +1311,7 @@ can be used as backgrounds in the MATE Desktop environment.") (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) @@ -1375,7 +1376,7 @@ can be used as backgrounds in the MATE Desktop environment.") #t))))) (native-inputs `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("yelp-tools" ,yelp-tools))) @@ -1415,7 +1416,7 @@ can be used as backgrounds in the MATE Desktop environment.") #:tests? #f)) (native-inputs `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("libtool" ,libtool) @@ -1500,7 +1501,7 @@ MATE Desktop to monitor your system resources and usage.") (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5c55e08fb2..a455eccef6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Robert Karszniewicz +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -237,7 +238,7 @@ Its design goals are simplicity and stability.") `(("docbook-xml" ,docbook-xml-4.1.2) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("ncurses" ,ncurses))) @@ -1886,7 +1887,7 @@ many bug fixes.") `(("pkg-config" ,pkg-config) ("check" ,check) ("glib" ,glib "bin") ; gtester - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (home-page "https://mcabber.com/") (description "Loudmouth is a lightweight and easy-to-use C library for programming diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 98cd3583cc..ec603a7dd6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -638,7 +639,7 @@ many input formats and provides a customisable Vi-style user interface.") (native-inputs `(("diffutils" ,diffutils) ("glib:bin" ,glib "bin") ; for gtester - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) @@ -4814,7 +4815,7 @@ studio.") ("cunit" ,cunit) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4d679c7f02..11de91d103 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020. 2021 Vinicius Monego +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -665,7 +666,7 @@ such as Batch image processing.") ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index accab82419..65c9f8e176 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019 Chris Marusich ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2020 Raphaël Mélotte +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -483,7 +484,7 @@ PCSC API Python wrapper module.") `(("help2man" ,help2man) ("gengetopt" ,gengetopt) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("docbook-xml" ,docbook-xml-4.3) ("eudev" ,eudev))) (home-page "https://developers.yubico.com/libu2f-host/") @@ -527,7 +528,7 @@ operations.") ("gengetopt" ,gengetopt) ("help2man" ,help2man) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("which" ,which))) (home-page "https://developers.yubico.com/libu2f-server/") ;; TRANSLATORS: The U2F protocol has a "server side" and a "host side". diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6105a98f14..8a4130b0b4 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 qblade +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1104,7 +1105,7 @@ all of them. Currently supported window managers include: ("gtk+-2" ,gtk+-2))) (native-inputs `(("python2-pygtk" ,python2-pygtk) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (synopsis "Library for registering global keyboard shortcuts") (description @@ -1132,7 +1133,7 @@ Keybinder works with GTK-based applications using the X Window System.") `(("gtk+" ,gtk+) ("gobject-introspection" ,gobject-introspection))) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (synopsis "Library for registering global keyboard shortcuts, Gtk3 version") (description -- 2.31.1