[bug#31819] [PATCH core-updates] gnu: gtk-doc: Update to 1.27.

[bug#31819] [PATCH core-updates] gnu: gtk-doc: Update to 1.27.

[Danny Milosavljevic]

[-- Attachment #1.1: Type: text/plain, Size: 413 bytes --]

Hi,

I tried to update gtk-doc to 1.27.

Unfortunately, a unit test (sanity.sh) fails because it expects a certain maximal number of status lines.

Because our texlive-union dynamically generates metafont stuff, it prints a LOT more status lines (metafont
outputs a lot).

Is it possible to silence metafont?  Or to have it generate the fonts before the tests run?  Or should
we just disable the test?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-gtk-doc-Update-to-1.27.patch --]
[-- Type: text/x-patch, Size: 2335 bytes --]

From 5baa1f738da0685b6d8f4aec5252f1bbf5201724 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 13 Jun 2018 22:06:11 +0200
Subject: [PATCH staging] gnu: gtk-doc: Update to 1.27.
Tags: patch

* gnu/packages/gtk.scm (gtk-doc)[source]: Update to 1.27.
[arguments]<#:phases>[patch-gtk-doc-scan]: New phase.
[propagated-inputs]: Add python-six.
---
 gnu/packages/gtk.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f7196611d..dff6eac8c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1411,7 +1411,7 @@ information.")
 (define-public gtk-doc
   (package
     (name "gtk-doc")
-    (version "1.25")
+    (version "1.27")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1419,12 +1419,21 @@ information.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"))))
+                "0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2"))))
     (build-system gnu-build-system)
     (arguments
      `(#:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-gtk-doc-scan
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "gtk-doc.xsl"
+              (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
+               (string-append (assoc-ref inputs "docbook-xsl")
+                              "/xml/xsl/docbook-xsl-"
+                              ,(package-version docbook-xsl)
+                              "/html/chunk.xsl")))
+             #t))
          (add-before 'build 'set-HOME
            (lambda _
              ;; FIXME: dblatex with texlive-union does not find the built
@@ -1465,6 +1474,8 @@ information.")
        ("docbook-xsl" ,docbook-xsl)
        ("source-highlight" ,source-highlight)
        ("glib" ,glib)))
+    (propagated-inputs
+     `(("python-six" ,python-six)))
     (home-page "http://www.gtk.org/gtk-doc/")
     (synopsis "Documentation generator from C source code")
     (description

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#31819] [PATCH core-updates] gnu: gtk-doc: Update to 1.27.

[Ricardo Wurmus]

Hi Danny,

> Because our texlive-union dynamically generates metafont stuff, it
> prints a LOT more status lines (metafont outputs a lot).
>
> Is it possible to silence metafont?  Or to have it generate the fonts
> before the tests run?  Or should we just disable the test?

The fact that it generates the fonts *again* is a problem I haven’t yet
been able to fix in texlive-union.  This should not happen, because the
fonts should already be there after the specific texlive union package
has been built.  The big texlive package did not have this behaviour.

This annoying behaviour also led me to add (setenv "HOME" …) expressions
to build phases in some packages after switching from “texlive” to
“texlive-union” or “texlive-tiny”, because that’s where the dynamically
generated fonts end up.

I don’t see how we can silence it in general.

--
Ricardo

[bug#31819] [PATCH core-updates] gnu: gtk-doc: Update to 1.27.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi,
>
> I tried to update gtk-doc to 1.27.
>
> Unfortunately, a unit test (sanity.sh) fails because it expects a certain maximal number of status lines.

I think it's fine to disable the sanity test for now, with a comment
that it's really a bug in texlive-union (IIUC).

However: why is this labelled 'core-updates'?  This is good for
'master', no?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]