From patchwork Thu Aug 20 15:10:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 23726 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EAD927BBE5; Thu, 20 Aug 2020 16:29:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 11D2027BBE6 for ; Thu, 20 Aug 2020 16:29:03 +0100 (BST) Received: from localhost ([::1]:60316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8mUw-0000g2-Ix for patchwork@mira.cbaines.net; Thu, 20 Aug 2020 11:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mEd-0007XF-Hw for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8mEd-00073t-4D for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8mEc-0006EO-VB for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 23/29] gnu: gtk-doc: Update package definition. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Aug 2020 15:12:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Cc: Raghav Gururajan , Danny Milosavljevic Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.159793632423839 (code B ref 42958); Thu, 20 Aug 2020 15:12:10 +0000 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:12:04 +0000 Received: from localhost ([127.0.0.1]:43524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mEO-0006BD-Se for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:12:04 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDb-00064f-48 for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:12 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id C731F3368211; Thu, 20 Aug 2020 17:11:00 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 20 Aug 2020 17:10:44 +0200 Message-Id: <20200820151050.9529-23-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Raghav Gururajan * gnu/packages/gtk.scm (gtk-doc) [version]: Update to 1.32. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'help'. [arguments]<#:configure-flags>[--with-help-dir]: New flag. <#:phases>['patch-test-out]: Remove phase. ['disable-failing-tests]: New phase. [native-inputs]: Add glib:bin, perl and python-wrapper. [inputs]: Add python-anytree, python-lxml, python-parameterized, python-pygments, python-unittest2 and yelp-tools. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add fdl1.1+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 124 ++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 54 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d595a8c7ec..7e32b7623b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1633,48 +1633,48 @@ information.") (define-public gtk-doc (package (name "gtk-doc") - (version "1.28") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li")))) - (build-system gnu-build-system) + (version "1.32") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0z4h1dggpimygdp719l457jvqilps4qcfpk31jmj3jqpzcsg03ny")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "help")) (arguments - `(#:parallel-tests? #f + `(#:configure-flags + (list + (string-append "--with-xml-catalog=" + (assoc-ref %build-inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml") + (string-append "--with-help-dir=" + (assoc-ref %outputs "help") + "/share/help")) #: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")) - (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/common/en.xml"))) + (("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")) + (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) - (add-after 'patch-gtk-doc-scan 'patch-test-out + (add-after 'unpack 'disable-failing-tests (lambda _ - ;; sanity.sh counts the number of status lines. Since our - ;; texlive regenerates the fonts every time and the font - ;; generator metafont outputs a lot of extra lines, this - ;; test would always fail. Disable it for now. (substitute* "tests/Makefile.in" - (("empty.sh sanity.sh") "empty.sh")) - #t)) - (add-before 'build 'set-HOME - (lambda _ - ;; FIXME: dblatex with texlive-union does not find the built - ;; metafonts, so it tries to generate them in HOME. - (setenv "HOME" "/tmp") + (("annotations.sh bugs.sh empty.sh fail.sh gobject.sh program.sh") + "")) #t)) (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -1691,6 +1691,12 @@ information.") "^catalog.xml$")) " \"http://docbook.sourceforge.net/release/xsl/"))) #t)) + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: dblatex with texlive-union does not find the built + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-after 'install 'wrap-executables (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -1698,34 +1704,44 @@ information.") (wrap-program prog `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) (find-files (string-append out "/bin"))) - #t)))) - #:configure-flags - (list (string-append "--with-xml-catalog=" - (assoc-ref %build-inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")))) + #t)))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) ("itstool" ,itstool) - ("libxml" ,libxml2) - ("gettext" ,gettext-minimal) - ("bc" ,bc))) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) (inputs - `(("perl" ,perl) - ("python" ,python) - ("xsltproc" ,libxslt) + `(("bc" ,bc) ("dblatex" ,dblatex) ("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl) - ("source-highlight" ,source-highlight) ("glib" ,glib) - ("python-six" ,python-six))) - (home-page "https://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+))) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-anytree" ,python-anytree) + ("python-lxml" ,python-lxml) + ("python-parameterized" ,python-parameterized) + ("python-pygments" ,python-pygments) + ("python-unittest2" ,python-unittest2) + ("source-highlight" ,source-highlight) + ("yelp-tools" ,yelp-tools))) + (synopsis "GTK+ DocBook Documentation Generator") + (description "GtkDoc is a tool used to extract API documentation from C-code +like Doxygen, but handles documentation of GObject (including signals and +properties) that makes it very suitable for GTK+ apps and libraries. It uses +docbook for intermediate files and can produce html by default and pdf/man-pages +with some extra work.") + (home-page "https://wiki.gnome.org/DocumentationProject/GtkDoc") + (license + (list + ;; Docs. + license:fdl1.1+ + ;; Others. + license:gpl2+)))) (define-public gtk-engines (package