me/guix
Archived
1
0
Fork 0
Code Activity

gnu: memphis: Remove patch-docbook-xml phase.

Browse source 
* gnu/packages/geo.scm (memphis) [arguments]: Remove patch-docbook-xml phase.
[native-inputs]: Remove labels.  Add libxml2.
This commit is contained in:
Maxim Cournoyer 2023-04-20 15:37:48 -04:00
parent 81913e582c
commit f07cf9807f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/geo.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2021 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org> ;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com> ;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -245,44 +245,31 @@ than 600 operators available.")
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (list "--disable-static"
"--disable-static" "--enable-gtk-doc"
"--enable-gtk-doc" "--enable-vala"
"--enable-vala" (string-append "--with-html-dir=" #$output "/share/gtk-doc/html"))
(string-append "--with-html-dir="
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-autogen (add-after 'unpack 'patch-autogen
(lambda _ (lambda _
(substitute* "autogen.sh" (substitute* "autogen.sh"
(("\\./configure \"\\$@\"") (("\\./configure \"\\$@\"")
"")) "")))))))
#t))
(add-after 'patch-autogen 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs/reference"
(substitute* "libmemphis-docs.sgml"
(("http://www.oasis-open.org/docbook/xml/4.3/")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/"))))
#t)))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("docbook-xml" ,docbook-xml-4.3) docbook-xml-4.3
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("libtool" ,libtool) libtool
("pkg-config" ,pkg-config) libxml2 ;for XML_CATALOG_FILES
("python" ,python-wrapper) pkg-config
("seed" ,seed) python-wrapper
("vala" ,vala))) seed
(inputs vala))
(list expat glib)) (inputs (list expat glib))
(propagated-inputs (propagated-inputs (list cairo))
(list cairo))
(synopsis "Map-rendering for OpenSteetMap") (synopsis "Map-rendering for OpenSteetMap")
(description "Memphis is a map-rendering application and a library for (description "Memphis is a map-rendering application and a library for
OpenStreetMap written in C using eXpat, Cairo and GLib.") OpenStreetMap written in C using eXpat, Cairo and GLib.")