[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/44: gnu: seed: Remove patch-docbook-xml phase.
From: |
guix-commits |
Subject: |
19/44: gnu: seed: Remove patch-docbook-xml phase. |
Date: |
Fri, 21 Apr 2023 00:48:24 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 56f382141d5c6c68d5e5a13cad67a1bf50eb73d2
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Apr 20 15:50:08 2023 -0400
gnu: seed: Remove patch-docbook-xml phase.
* gnu/packages/gnome.scm (seed) [arguments]: Remove patch-docbook-xml
phase. Use gexps.
[native-inputs, inputs, propagated-inputs]: Remove labels.
---
gnu/packages/gnome.scm | 99 ++++++++++++++++++++++----------------------------
1 file changed, 43 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6b4a4f0fbc..e9a78ce90c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -480,65 +480,52 @@ bindings.")
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (list
- "--disable-static"
- "--enable-xorg-module"
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html")
- "--with-webkit=4.0")
- #:phases
- (modify-phases %standard-phases
- ;; The seed-webkit.patch patches configure.ac.
- ;; So the source files need to be re-bootstrapped.
- (add-after 'unpack 'trigger-bootstrap
- (lambda _
- (for-each delete-file
- (list
- "configure"
- "Makefile.in"))
- #t))
- (add-after 'unpack 'patch-tests
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* (find-files "." "\\.js$")
- (("#!/usr/bin/env seed")
- (string-append "#!" (getcwd) "/src/seed")))
- #t))
- (add-before 'build 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "doc"
- (substitute* '("reference/seed-docs.sgml" "modules/book.xml")
- (("http://www.oasis-open.org/docbook/xml/4.1.2/")
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/"))))
- #t)))))
+ (list #:configure-flags
+ #~(list "--disable-static"
+ "--enable-xorg-module"
+ (string-append "--with-html-dir=" #$output:doc
+ "/share/gtk-doc/html")
+ "--with-webkit=4.0")
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; The seed-webkit.patch patches configure.ac.
+ ;; So the source files need to be re-bootstrapped.
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (for-each delete-file
+ (list "configure"
+ "Makefile.in"))))
+ (add-after 'unpack 'patch-tests
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* (find-files "." "\\.js$")
+ (("#!/usr/bin/env seed")
+ (string-append "#!" (getcwd) "/src/seed"))))))))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("docbook-xml" ,docbook-xml-4.1.2)
- ("gettext" ,gettext-minimal)
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("intltool" ,intltool)
- ("libtool" ,libtool)
- ("pkg-config" ,pkg-config)))
+ (list autoconf
+ automake
+ docbook-xml-4.1.2
+ gettext-minimal
+ gobject-introspection
+ gtk-doc/stable
+ intltool
+ libtool
+ pkg-config))
(inputs
- `(("cairo" ,cairo)
- ("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
- ("gnome-js-common" ,gnome-js-common)
- ("gtk+" ,gtk+)
- ("gtk+-2" ,gtk+-2)
- ("libffi" ,libffi)
- ("libxml2" ,libxml2)
- ("mpfr" ,mpfr)
- ("readline" ,readline)
- ("sqlite" ,sqlite)
- ("xscrnsaver" ,libxscrnsaver)))
+ (list cairo
+ dbus
+ dbus-glib
+ gnome-js-common
+ gtk+
+ gtk+-2
+ libffi
+ libxml2
+ mpfr
+ readline
+ sqlite
+ libxscrnsaver))
(propagated-inputs
- `(("glib" ,glib)
- ("webkit" ,webkitgtk-with-libsoup2)))
+ (list glib
+ webkitgtk-with-libsoup2))
(synopsis "GObject JavaScriptCore bridge")
(description "Seed is a library and interpreter, dynamically bridging
(through GObjectIntrospection) the WebKit JavaScriptCore engine, with the
- 37/44: gnu: docbook2x: Use gexps and remove input labels., (continued)
- 37/44: gnu: docbook2x: Use gexps and remove input labels., guix-commits, 2023/04/21
- 30/44: gnu: ibus-minimal: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 02/44: gnu: docbook-xml: Fix permissions., guix-commits, 2023/04/21
- 03/44: gnu: docbook-xml: Use XSLT to patch catalog.xml., guix-commits, 2023/04/21
- 04/44: gnu: docbook-xml-4.1.2: Add missing catalog.xml., guix-commits, 2023/04/21
- 13/44: gnu: memphis: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 21/44: gnu: dee: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 11/44: gnu: farstream: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 16/44: gnu: libsigc++-2: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 17/44: gnu: gupnp-igd: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 19/44: gnu: seed: Remove patch-docbook-xml phase.,
guix-commits <=
- 15/44: gnu: libsigc++: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 23/44: gnu: libnma: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 24/44: gnu: system-config-printer: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 29/44: gnu: libhandy: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 26/44: gnu: vala: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 27/44: gnu: json-glib: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 28/44: gnu: network-manager: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 31/44: gnu: nimf: Remove patch-docbook-xml phase., guix-commits, 2023/04/21
- 38/44: gnu: adcli: Delete use-local-docbook phase., guix-commits, 2023/04/21
- 35/44: gnu: freerdp: Remove input labels., guix-commits, 2023/04/21