guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/10: gnu: Use 'gtk-doc/stable' in native-inputs instead of 'gtk-doc'.


From: guix-commits
Subject: 01/10: gnu: Use 'gtk-doc/stable' in native-inputs instead of 'gtk-doc'.
Date: Mon, 22 Jan 2024 00:24:00 -0500 (EST)

apteryx pushed a commit to branch core-updates
in repository guix.

commit c20736562de91ec994e90678fa3ea5083abb114e
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Mar 28 13:38:34 2021 +0200

    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/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.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Change-Id: I6c647ff1394e0a48bef0e6fb1ae43533673f1d79
---
 gnu/packages/admin.scm          |  2 +-
 gnu/packages/glib.scm           |  2 +-
 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 |  3 ++-
 gnu/packages/wm.scm             |  3 ++-
 8 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 95cce677eb..7d0fcdb6e9 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4304,7 +4304,7 @@ hard-coded.")
            autoconf-archive
            automake
            `(,glib "bin") ; for glib-genmarshal, etc.
-           gtk-doc
+           gtk-doc/stable
            pkg-config))
     (inputs
      (list dbus-glib libevdev libxml2 upower xz))
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2cbb4bdcb7..acb8184511 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -572,7 +572,7 @@ functions for strings and common data structures.")
        (prepend docbook-xml-4.2
                 docbook-xml
                 docbook-xsl
-                gtk-doc
+                gtk-doc/stable
                 libxml2
                 libxslt)))
     (arguments
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 5a6c6b5b64..6a1fd0d6f6 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -238,7 +239,7 @@ themes for both gtk+-2 and gtk+-3.")
            `(,glib "bin")
            gobject-introspection
            yelp-tools
-           gtk-doc))
+           gtk-doc/stable))
     (inputs
      (list gtk+ libxrandr iso-codes startup-notification))
     (propagated-inputs
@@ -733,7 +734,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)
        ("texlive-bin" ,texlive-bin) ;synctex
        ("xmllint" ,libxml2)
        ("zlib" ,zlib)))
@@ -869,7 +870,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
@@ -1228,7 +1229,7 @@ can be used as backgrounds in the MATE Desktop 
environment.")
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal
-           gtk-doc
+           gtk-doc/stable
            intltool
            libice
            libsm
@@ -1280,7 +1281,7 @@ can be used as backgrounds in the MATE Desktop 
environment.")
     (build-system glib-or-gtk-build-system)
     (native-inputs
      (list gettext-minimal
-           gtk-doc
+           gtk-doc/stable
            gobject-introspection
            intltool
            pkg-config
@@ -1344,7 +1345,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)))
@@ -1384,7 +1385,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)
@@ -1464,7 +1465,7 @@ MATE Desktop to monitor your system resources and usage.")
          "0mq3a9ab4fxpkah6c5p7a0zsy8cixfc5j9030k204cy5vysv1dzm"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     (list gettext-minimal gtk-doc intltool libtool pkg-config))
+     (list gettext-minimal gtk-doc/stable intltool libtool pkg-config))
     (inputs
      (list accountsservice
            glib
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 61446894e2..0d0363421f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
@@ -231,7 +232,7 @@ XMPP-based sessions.")
      (list docbook-xml-4.1.2
            `(,glib "bin")
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            pkg-config))
     (inputs (list ncurses))
     (propagated-inputs (list glib libxml2 python-2))
@@ -2013,7 +2014,7 @@ including psyced.")
     (native-inputs
      (list pkg-config check
            `(,glib "bin") ; gtester
-           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 a779fc9652..fc8b59011f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Thomas Albers Raviola <thomas@thomaslabs.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2022 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -780,7 +781,7 @@ many input formats and provides a customisable Vi-style 
user interface.")
     (native-inputs
      (list diffutils
            `(,glib "bin")               ; for gtester
-           gtk-doc
+           gtk-doc/stable
            intltool
            libtool
            pkg-config))
@@ -5168,7 +5169,7 @@ studio.")
            cunit
            gettext-minimal
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            libtool
            libxslt
            pkg-config
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index df3deebf90..ce45df6f19 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020. 2021, 2022 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
@@ -729,7 +730,7 @@ such as Batch image processing.")
            gettext-minimal
            `(,glib "bin")
            gobject-introspection
-           gtk-doc
+           gtk-doc/stable
            itstool
            libxml2
            perl
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 2b19f7b49f..f8ca6c05d3 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2018, 2019 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2021 Sergey Trofimov <sarg@sarg.org.ru>
@@ -637,7 +638,7 @@ operations.")
            gengetopt
            help2man
            pkg-config
-           gtk-doc
+           gtk-doc/stable
            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 6c1d227f74..925dca7830 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
 ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2021, 2023 jgart <jgart@dismail.de>
@@ -1369,7 +1370,7 @@ all of them.  Currently supported window managers include:
     (inputs
      (list gtk+ gobject-introspection))
     (native-inputs
-     (list gtk-doc pkg-config))
+     (list gtk-doc/stable pkg-config))
     (synopsis "Library for registering global keyboard shortcuts, Gtk3 
version")
     (description
      "Keybinder is a library for registering global keyboard shortcuts.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]