unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 74306@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>,
	Liliana Marie Prikler <liliana.prikler@gmail.com>,
	Vivien Kraus <vivien@planete-kraus.eu>
Subject: [bug#74306] [PATCH gnome-team 16/44] gnu: glib: Fix build.
Date: Mon, 11 Nov 2024 15:16:59 +0900	[thread overview]
Message-ID: <542c1fbab63036afb8bbdf38e4669a3bee9f2517.1731303037.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1731303037.git.maxim.cournoyer@gmail.com>

* gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Remove
docbook-xml-4.2, docbook-xml, docbook-xsl, gtk-doc, libxml2, libxslt inputs.
Add gi-docgen and python-docutils.
[arguments] <configure-flags> Replace 'gtk_doc' option with 'documentation'.
<phases>: Delete patch-docbook-xml phase.  Adjust move-doc phase.

Change-Id: I964a79603ff80ee8a22bb2d9ebe07f05a1f79e57
---
 gnu/packages/glib.scm | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1a8ecdad35..2732d739bf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -545,41 +545,24 @@ (define-public glib-with-documentation
   (let ((base glib))
     (package/inherit base
       (properties (alist-delete 'hidden? (package-properties base)))
-      (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference
+      (outputs (cons "doc" (package-outputs base)))
       (native-inputs
-       `(("docbook-xml-4.2" ,docbook-xml-4.2)
-         ("docbook-xml-4.5" ,docbook-xml)
-         ("docbook-xsl" ,docbook-xsl)
-         ("gtk-doc" ,gtk-doc/stable)
-         ("libxml2" ,libxml2)
-         ("xsltproc" ,libxslt)
-         ,@(package-native-inputs base)))
+       (modify-inputs (package-native-inputs base)
+         (append gi-docgen python-docutils)))
       (arguments
        (substitute-keyword-arguments (package-arguments base)
          ((#:configure-flags flags ''())
-          #~(cons "-Dgtk_doc=true"
+          #~(cons "-Ddocumentation=true"
                   (delete "-Dman=false" #$flags)))
          ((#:phases phases)
           #~(modify-phases #$phases
-              (add-after 'unpack 'patch-docbook-xml
-                (lambda* (#:key inputs #:allow-other-keys)
-                  (with-directory-excursion "docs"
-                    (substitute* (find-files "." "\\.xml$")
-                      (("http://www.oasis-open.org/docbook/xml/4\\.5/")
-                       (string-append (assoc-ref inputs "docbook-xml-4.5")
-                                      "/xml/dtd/docbook/"))
-                      (("http://www.oasis-open.org/docbook/xml/4\\.2/")
-                       (string-append (assoc-ref inputs "docbook-xml-4.2")
-                                      "/xml/dtd/docbook/"))))))
               (add-after 'install 'move-doc
-                (lambda* (#:key outputs #:allow-other-keys)
-                  (let* ((out (assoc-ref outputs "out"))
-                         (doc (assoc-ref outputs "doc"))
-                         (html (string-append "/share/gtk-doc")))
-                    (mkdir-p (string-append doc "/share"))
+                (lambda _
+                  (let ((doc "/share/doc"))
+                    (mkdir-p (string-append #$output:doc "/share"))
                     (rename-file
-                     (string-append out html)
-                     (string-append doc html))))))))))))
+                     (string-append #$output doc)
+                     (string-append #$output:doc doc))))))))))))
 
 (define (python-extension-suffix python triplet)
   "Determine the suffix for C extensions for PYTHON when compiled
-- 
2.46.0





  parent reply	other threads:[~2024-11-11  6:25 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-11  5:50 [bug#74306] [PATCH gnome-team 00/44] gstreamer, GTK, fontmanager updates Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 01/44] gnu: dee: Use latest vala Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 02/44] gnu: gvfs: Patch mount, umount and lsof commands Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 03/44] gnu: gnome-vfs: Remove trailing #t Maxim Cournoyer
2024-11-11 18:12   ` Liliana Marie Prikler
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 04/44] gnu: nautilus: Update to 46.1 Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 05/44] gnu: gstreamer: Update to 1.24.8 Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 06/44] gnu: gst-plugins-base: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 07/44] gnu: gst-plugins-good: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 08/44] gnu: gst-plugins-bad: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 09/44] gnu: gst-plugins-ugly: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 10/44] gnu: gst-libav: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 11/44] gnu: gst-editing-services: " Maxim Cournoyer
2024-11-11 18:15   ` Liliana Marie Prikler
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 12/44] gnu: python-gst: " Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 13/44] gnu: gst-plugins-espeak: Update to 0.6.0 Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 14/44] build/meson: Enable parallel tests by default Maxim Cournoyer
2024-11-11  6:16 ` [bug#74306] [PATCH gnome-team 15/44] gnu: meson: Update to 1.5.2 Maxim Cournoyer
2024-11-11  6:16 ` Maxim Cournoyer [this message]
2024-11-11 18:17   ` [bug#74306] [PATCH gnome-team 16/44] gnu: glib: Fix build Liliana Marie Prikler
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 17/44] gnu: glib-minimal: Fix deprecation warning Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 18/44] gnu: libmbim: Update to 1.30.0 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 19/44] gnu: Add libqrtr-glib Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 20/44] gnu: libqmi: Update to 1.34.0 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 21/44] gnu: gi-docgen: Update to 2024.1 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 22/44] gnu: glib-minimal: Update to 2.83.0 Maxim Cournoyer
2024-11-11 18:18   ` Liliana Marie Prikler
2024-11-12 13:08     ` Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 23/44] gnu: glib-networking: Update to 2.80.0 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 24/44] gnu: libsoup-minimal: Disable test suite Maxim Cournoyer
2024-11-11 18:19   ` Liliana Marie Prikler
2024-11-12 13:47     ` Maxim Cournoyer
2024-11-12 18:35       ` Liliana Marie Prikler
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 25/44] gnu: modem-manager: Update to 1.22.0 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 26/44] gnu: libquicktime: Remove ffmpeg-4 and gtk+-2 inputs Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 27/44] gnu: mjpegtools: Remove gtk+-2 input Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 28/44] gnu: libdbusmenu: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 29/44] gnu: libnice: Update to 0.1.22 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 30/44] gnu: gtk: Update to 4.17.0 Maxim Cournoyer
2024-11-11 18:20   ` Liliana Marie Prikler
2024-11-12 13:49     ` Maxim Cournoyer
2024-11-12 13:56     ` Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 31/44] gnu: fontmanager: Update to 0.9.0 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 32/44] gnu: fontmanager: Use gexps and drop input labels Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 33/44] gnu: libvisual: Update to 0.4.2 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 34/44] gnu: libvisual-plugins: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 35/44] gnu: orc: Update to 0.4.40 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 36/44] gnu: gstreamer-docs: Update to 1.24.9 Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 37/44] gnu: gstreamer: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 38/44] gnu: gst-plugins-base: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 39/44] gnu: gst-plugins-good: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 40/44] gnu: gst-plugins-bad: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 41/44] gnu: gst-plugins-ugly: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 42/44] gnu: gst-libav: " Maxim Cournoyer
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 43/44] gnu: gst-editing-services: " Maxim Cournoyer
2024-11-11 18:22   ` Liliana Marie Prikler
2024-11-11  6:17 ` [bug#74306] [PATCH gnome-team 44/44] gnu: python-gst: " Maxim Cournoyer
2024-11-11 18:24 ` [bug#74306] [PATCH gnome-team 00/44] gstreamer, GTK, fontmanager updates Liliana Marie Prikler
2024-11-12 13:57   ` Maxim Cournoyer
2024-11-12 18:51     ` Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=542c1fbab63036afb8bbdf38e4669a3bee9f2517.1731303037.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=74306@debbugs.gnu.org \
    --cc=liliana.prikler@gmail.com \
    --cc=vivien@planete-kraus.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).