amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: json-glib: Update to 1.6.6.

Browse source 
* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6.
[arguments]: Convert to list of G-Expressions.
[#:configure-flags]: Add -Dgtk_doc=disabled.
[native-inputs]: Drop labels.
(json-glib) [#:configure-flags]: Remove -Ddocs=true.  Unless cross-compiling,
add -Dgtk_doc=enabled and -Dintrospection=enabled.
[#:phases] <move-docs>: Replace /share/gtk-doc with /share/doc.
[native-inputs]: Add gi-docgen.  Remove docbook-xml-4.3, docbook-xsl, gtk-doc,
libxslt.

Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Vivien Kraus 2023-11-24 00:08:44 +01:00 • committed by Liliana Marie Prikler
parent b0d91b147b
commit dbedf8dfdc
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/gnome.scm
View file

@ -4697,7 +4697,7 @@ configuration storage systems.")
(define-public json-glib-minimal (define-public json-glib-minimal
(package (package
(name "json-glib-minimal") (name "json-glib-minimal")
(version "1.6.2") (version "1.6.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/json-glib/" (uri (string-append "mirror://gnome/sources/json-glib/"
@ -4705,14 +4705,16 @@ configuration storage systems.")
"/json-glib-" version ".tar.xz")) "/json-glib-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (list #:glib-or-gtk? #t ;to wrap binaries, compile schemas
#:configure-flags #~(list "-Dgtk_doc=disabled")))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list
("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal gettext-minimal
("pkg-config" ,pkg-config))) `(,glib "bin") ;for glib-mkenums and glib-genmarshal
pkg-config))
(inputs (inputs
(list bash-minimal)) (list bash-minimal))
(propagated-inputs (propagated-inputs
@ -4731,8 +4733,7 @@ GLib and GObject, and integrates JSON with GLib data types.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments json-glib-minimal) (substitute-keyword-arguments (package-arguments json-glib-minimal)
((#:configure-flags _) ((#:configure-flags _)
#~(list "-Ddocs=true" #~(list "-Dman=true"
"-Dman=true"
#$@(if (%current-target-system) #$@(if (%current-target-system)
;; If enabled, gtkdoc-scangobj will try to execute a ;; If enabled, gtkdoc-scangobj will try to execute a
;; cross-compiled binary. ;; cross-compiled binary.
@ -4740,7 +4741,8 @@ GLib and GObject, and integrates JSON with GLib data types.")
;; Trying to build introspection data when cross-compiling ;; Trying to build introspection data when cross-compiling
;; causes errors during linking. ;; causes errors during linking.
"-Dintrospection=disabled") "-Dintrospection=disabled")
#~()))) #~("-Dgtk_doc=enabled"
"-Dintrospection=enabled"))))
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
#~(modify-phases #$phases #~(modify-phases #$phases
;; When cross-compiling, there are no docs to move. ;; When cross-compiling, there are no docs to move.
@ -4753,16 +4755,13 @@ GLib and GObject, and integrates JSON with GLib data types.")
(lambda _ (lambda _
(mkdir-p (string-append #$output:doc "/share")) (mkdir-p (string-append #$output:doc "/share"))
(rename-file (rename-file
(string-append #$output "/share/gtk-doc") (string-append #$output "/share/doc")
(string-append #$output:doc (string-append #$output:doc
"/share/gtk-doc")))))))))) "/share/doc"))))))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs json-glib-minimal) (modify-inputs (package-native-inputs json-glib-minimal)
(prepend docbook-xml-4.3 (prepend gi-docgen
docbook-xsl gobject-introspection)))))
gobject-introspection
gtk-doc
libxslt)))))
(define-public libxklavier (define-public libxklavier
(package (package