From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: [PATCH] Generate manpages for the udisks utility Date: Sat, 26 Nov 2016 20:25:33 -0800 Message-ID: <87inr9tupu.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAr27-0006RN-Hh for guix-devel@gnu.org; Sat, 26 Nov 2016 23:25:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAr26-0001Ed-4I for guix-devel@gnu.org; Sat, 26 Nov 2016 23:25:43 -0500 Received: from mail-pg0-x230.google.com ([2607:f8b0:400e:c05::230]:33568) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cAr25-0001EO-O0 for guix-devel@gnu.org; Sat, 26 Nov 2016 23:25:41 -0500 Received: by mail-pg0-x230.google.com with SMTP id 3so43815392pgd.0 for ; Sat, 26 Nov 2016 20:25:40 -0800 (PST) Received: from apteryx ([2601:647:4100:e0d:c2f8:daff:fe5d:2f2f]) by smtp.gmail.com with ESMTPSA id 135sm59814380pgc.7.2016.11.26.20.25.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 26 Nov 2016 20:25:38 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi Guix, This patch adds the manpages to the udisks package. It appears that the manpages were previously disabled because of the strict docbook catalog files location verification in the configure script. The fix is essentially equivalent to what was done in commit b4787e71aca75392f394a127a7df537a0a016b04 to fix the build of gtk-doc, but is a bit less invasive since it only requires to define the XML_CATALOG_FILES variable and to pass it to make, rather than to substitute the catalog string directly in the configure script (FWIU of the referenced commit). There are still some "no ID for constraint linkend" errors output by xsltproc; unfortunately I have no idea how those can be solved. My understanding is that these errors mean that xsltproc couldn't find the reference ID of a linked resource. Here's what those errors look like in the build log: make -j3 XML_CATALOG_FILES="/gnu/store/sp361wnn64zkp3aici69xxmblrf2pfkb-docbook-xsl-1.78.1/xml/xsl/docbook-xsl-1.78.1/catalog.xml /gnu/store/d5lvr5xh8361dwhaqw3y880x9jzlqk4l-docbook-xml-4.3/xml/dtd/docbook/catalog.xml" Making all in man make[1]: Entering directory '/home/maxim/devel/udisks-2.1.7/doc/man' /gnu/store/sjmyrkcm7byz14s87sanf2p14dxbdad8-profile/bin/xsltproc -path "./.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl udisksctl.xml /gnu/store/sjmyrkcm7byz14s87sanf2p14dxbdad8-profile/bin/xsltproc -path "./.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl udisksd.xml /gnu/store/sjmyrkcm7byz14s87sanf2p14dxbdad8-profile/bin/xsltproc -path "./.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl udisks.xml Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: udisks-polkit-actions. Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Drive.Id. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintSystem. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintIgnore. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintAuto. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Drive.CanPowerOff. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintName. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintIconName. Error: no ID for constraint linkend: gdbus-property-org-freedesktop-UDisks2-Block.HintIconName. Error: no ID for constraint linkend: gdbus-method-org-freedesktop-UDisks2-Filesystem.Mount. Error: no ID for constraint linkend: udisksctl.1. Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: udisks.8. Error: no ID for constraint linkend: udisksctl.1. Error: no ID for constraint linkend: umount.udisks2.8. Note: Writing udisksd.8 Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: udisksctl.1. Error: no ID for constraint linkend: umount.udisks2.8. Error: no ID for constraint linkend: udisks.8. Error: no ID for constraint linkend: udisks.8. Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: umount.udisks2.8. Note: Writing udisks.8 Note: Writing udisksctl.1 /gnu/store/sjmyrkcm7byz14s87sanf2p14dxbdad8-profile/bin/xsltproc -path "./.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl umount.udisks2.xml Error: no ID for constraint linkend: udisks.8. Error: no ID for constraint linkend: udisksd.8. Error: no ID for constraint linkend: udisksctl.1. Error: no ID for constraint linkend: umount.8. Note: Writing umount.udisks2.8 make[1]: Leaving directory '/home/maxim/devel/udisks-2.1.7/doc/man' make[1]: Entering directory '/home/maxim/devel/udisks-2.1.7/doc' make[1]: Nothing to be done for 'all-am'. make[1]: Leaving directory '/home/maxim/devel/udisks-2.1.7/doc' With that said, the manpages otherwise appear to be correctly generated. Thanks! Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-udisks-Add-manpages.patch Content-Transfer-Encoding: quoted-printable Content-Description: Patch to add the manpages to the udisks package From=20cc290cbe9f23c2dc5b60d90c966ee2c851c1f879 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Nov 2016 09:05:45 -0800 Subject: [PATCH] gnu: udisks: Add manpages. =2D-- gnu/packages/freedesktop.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 456d569..9ccf13e 100644 =2D-- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -461,7 +461,9 @@ Analysis and Reporting Technology) functionality.") "119pr2zbff8vkwlhghim7d7ir24c1dil9hp4q49wm4f6pnrjpbmb")))) (build-system gnu-build-system) (native-inputs =2D `(("glib:bin" ,glib "bin") ; for glib-mkenums + `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages + ("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) @@ -480,13 +482,28 @@ Analysis and Reporting Technology) functionality.") `(#:tests? #f ; requiring system message dbus #:disallowed-references ("doc") ;enforce separation of "= doc" #:configure-flags =2D (list "--disable-man" + (list "--enable-man" "--localstatedir=3D/var" "--enable-fhs-media" ;mount devices in /media, not /run/m= edia (string-append "--with-html-dir=3D" (assoc-ref %outputs "doc") "/share/doc/udisks/html") (string-append "--with-udevdir=3D" %output "/lib/udev")) + #:make-flags + (let* ((docbook-xsl-name-version ,(string-append + (package-name docbook-xsl) "-" + (package-version docbook-xsl))) + (docbook-xsl-catalog-file (string-append + (assoc-ref %build-inputs "docboo= k-xsl") + "/xml/xsl/" + docbook-xsl-name-version + "/catalog.xml")) + (docbook-xml-catalog-file (string-append + (assoc-ref %build-inputs "docboo= k-xml") + "/xml/dtd/docbook/catalog.xml"))) + ;; Reference the catalog files required to build the manpages. + (list (string-append "XML_CATALOG_FILES=3D" docbook-xsl-catalog-f= ile " " + docbook-xml-catalog-file))) #:phases (modify-phases %standard-phases (add-before =2D-=20 2.10.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYOmA9AAoJEBJg5GSC5jVikEMQAJnd8kTzsTzm6UeFhsTBTZAa f12j56PrHvSfb+UXaxS80Vk4UQh9HhA5KiSXMkX+dNldSC7HnIX0s87DFeNr5ZWH wnTLYsQFAm5oG6S/rHY/blYobolqN54XWqyw2+3oJgPWj0yrl3+A0TrrUUAjayEt 6LKUzfdqSBFaRZfchYsLLgHuxoJ+CBh2o2D9JTs/pYNtQVDs7uNizhoiblylb2h0 c4y/b4bgb1veu08y3k0Ogot/wJx09sRvhSQ7B7nCeS7M3kmjGC7pkVwgE2NdvL+o cYhwLX83PssfYfXDWpgLjUdZaTeOfUV8LGHt5TqmZRiLSVdcaxjeVygyT+KaIUY7 RZ57cTV9AwyfVsMDLILOQCidboGlHq58TdXssRdNEl9Ht8A/+LB5J/4aS+zZZ7Td XXdevWMkp3/3o3QVeMIDReyngNSOTpjykB+qa+uMBQWAq0qZ8/R/4s4EPr7odoo+ 2c/Pe6q/4HKhiVnlvsl6BJCVDZ+xqn2Wmm3S40YLIc7VIXunnYPnUv96ny4c6blq 5lyqF+LiITaxchtxoXXBXC2gGWXBsuE5SdWi1aNYdf8V7mMBuZ8vRGDh7I6sUF2Z oCQENdTHP21hFCQ4rh62LH8gQHbQnOOqQJAfEbV9hL6HziLWbdKfk/tg65moXAWm v2RBOQwfCqBnu0wR15/S =wIK0 -----END PGP SIGNATURE----- --==-=-=--