[PATCH] gnu: Add gtk-doc.

[PATCH] gnu: Add gtk-doc.

[Andy Wingo]

[-- Attachment #1: 0002-gnu-Add-gtk-doc.patch --]
[-- Type: text/plain, Size: 2904 bytes --]

From 552c575b2c5e00ecca7c66c33b31de0229ce1e2f Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Thu, 6 Aug 2015 12:25:12 +0200
Subject: [PATCH 2/4] gnu: Add gtk-doc.

* gnu/packages/gnome.scm (gtk-doc): New variable.
---
 gnu/packages/gnome.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fb5c67e..c228bdf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -34,6 +34,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (gnu packages)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages base)
@@ -44,6 +45,7 @@
   #:use-module (gnu packages djvu)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gnuzilla)
@@ -3162,3 +3164,46 @@ mounts to non-GIO applications using FUSE.
 GVFS comes with a set of backends, including trash support, SFTP, SMB, HTTP,
 DAV, and others.")
     (license license:lgpl2.0+)))
+
+(define-public gtk-doc
+  (package
+    (name "gtk-doc")
+    (version "1.24")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-xml-catalog="
+                            (assoc-ref %build-inputs "docbook-xml")
+                            "/xml/dtd/docbook/catalog.xml"))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("itstool" ,itstool)
+       ("libxml" ,libxml2)
+       ("gettext" ,gnu-gettext)
+       ("bc" ,bc)))
+    (inputs
+     `(("perl" ,perl)
+       ("python" ,python)
+       ("xsltproc" ,libxslt)
+       ("dblatex" ,dblatex)
+       ("docbook-xml" ,docbook-xml-4.3)
+       ("docbook-xsl" ,docbook-xsl)
+       ;; FIXME: Including (gnu packages pretty-print) causes the build to
+       ;; fail :(
+       ;; ("source-highlight" ,source-highlight)
+       ("glib" ,glib)))
+    (home-page "http://www.gtk.org/gtk-doc/")
+    (synopsis "Documentation generator from C source code")
+    (description
+     "GTK-Doc generates API documentation from comments added to C code. It is
+typically used to document the public API of GTK+ and GNOME libraries, but it
+can also be used to document application code.")
+    (license license:gpl2+)))
-- 
2.4.3

Re: [PATCH] gnu: Add gtk-doc.

[Mark H Weaver]

Andy Wingo <wingo@igalia.com> writes:

> From 552c575b2c5e00ecca7c66c33b31de0229ce1e2f Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@igalia.com>
> Date: Thu, 6 Aug 2015 12:25:12 +0200
> Subject: [PATCH 2/4] gnu: Add gtk-doc.

[...]

> +       ;; FIXME: Including (gnu packages pretty-print) causes the build to
> +       ;; fail :(
> +       ;; ("source-highlight" ,source-highlight)

This was a circularity problem, fixed in commit 7a75b02ae5, so I was
able to add this to the inputs.  Also, I thought (gnu packages gtk) was
a better home for 'gtk-doc', so I put it there instead.

Pushed with these changes.

     Thanks!
       Mark