me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* gnu/packages/gnome.scm (seed) [arguments]: Remove patch-docbook-xml
phase.  Use gexps.
[native-inputs, inputs, propagated-inputs]: Remove labels.
This commit is contained in:
Maxim Cournoyer 2023-04-20 15:50:08 -04:00
parent eef131d7ae
commit 56f382141d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 43 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
gnu/packages/gnome.scm
View file

@ -480,65 +480,52 @@ bindings.")
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags (list #:configure-flags
(list #~(list "--disable-static"
"--disable-static" "--enable-xorg-module"
"--enable-xorg-module" (string-append "--with-html-dir=" #$output:doc
(string-append "--with-html-dir=" "/share/gtk-doc/html")
(assoc-ref %outputs "doc") "--with-webkit=4.0")
"/share/gtk-doc/html") #:phases
"--with-webkit=4.0") #~(modify-phases %standard-phases
#:phases ;; The seed-webkit.patch patches configure.ac.
(modify-phases %standard-phases ;; So the source files need to be re-bootstrapped.
;; The seed-webkit.patch patches configure.ac. (add-after 'unpack 'trigger-bootstrap
;; So the source files need to be re-bootstrapped. (lambda _
(add-after 'unpack 'trigger-bootstrap (for-each delete-file
(lambda _ (list "configure"
(for-each delete-file "Makefile.in"))))
(list (add-after 'unpack 'patch-tests
"configure" (lambda* (#:key outputs #:allow-other-keys)
"Makefile.in")) (substitute* (find-files "." "\\.js$")
#t)) (("#!/usr/bin/env seed")
(add-after 'unpack 'patch-tests (string-append "#!" (getcwd) "/src/seed"))))))))
(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)))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) (list autoconf
("automake" ,automake) automake
("docbook-xml" ,docbook-xml-4.1.2) docbook-xml-4.1.2
("gettext" ,gettext-minimal) gettext-minimal
("gobject-introspection" ,gobject-introspection) gobject-introspection
("gtk-doc" ,gtk-doc/stable) gtk-doc/stable
("intltool" ,intltool) intltool
("libtool" ,libtool) libtool
("pkg-config" ,pkg-config))) pkg-config))
(inputs (inputs
`(("cairo" ,cairo) (list cairo
("dbus" ,dbus) dbus
("dbus-glib" ,dbus-glib) dbus-glib
("gnome-js-common" ,gnome-js-common) gnome-js-common
("gtk+" ,gtk+) gtk+
("gtk+-2" ,gtk+-2) gtk+-2
("libffi" ,libffi) libffi
("libxml2" ,libxml2) libxml2
("mpfr" ,mpfr) mpfr
("readline" ,readline) readline
("sqlite" ,sqlite) sqlite
("xscrnsaver" ,libxscrnsaver))) libxscrnsaver))
(propagated-inputs (propagated-inputs
`(("glib" ,glib) (list glib
("webkit" ,webkitgtk-with-libsoup2))) webkitgtk-with-libsoup2))
(synopsis "GObject JavaScriptCore bridge") (synopsis "GObject JavaScriptCore bridge")
(description "Seed is a library and interpreter, dynamically bridging (description "Seed is a library and interpreter, dynamically bridging
(through GObjectIntrospection) the WebKit JavaScriptCore engine, with the (through GObjectIntrospection) the WebKit JavaScriptCore engine, with the