Message ID | 4a8421cd144ee7b910e5e70571fb3839a6bdd8a2.1700864554.git.vivien@planete-kraus.eu |
---|---|
State | New |
Headers | show |
Series | [bug#67420,gnome-team,v2] gnu: json-glib: Update to 1.6.6. | expand |
Hello, Vivien Kraus <vivien@planete-kraus.eu> writes: > * 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, libxml2 and python. Remove gtk-doc. Please stick to one package per change, unless they'd cause the tree to be broken (non atomic).
Le dimanche 03 décembre 2023 à 18:59 -0500, Maxim Cournoyer a écrit : > > * 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, libxml2 and python. Remove gtk- > > doc. > > Please stick to one package per change, unless they'd cause the tree > to > be broken (non atomic). Hello, Unfortunately, this is not possible, as the “docs” option changed from one release to the next. Best regards, Vivien
Hi, Vivien Kraus <vivien@planete-kraus.eu> writes: > Le dimanche 03 décembre 2023 à 18:59 -0500, Maxim Cournoyer a écrit : >> > * 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, libxml2 and python. Remove gtk- >> > doc. >> >> Please stick to one package per change, unless they'd cause the tree >> to >> be broken (non atomic). > > Hello, > > Unfortunately, this is not possible, as the “docs” option changed from > one release to the next. OK! Good to know, thanks for the explanation.
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 194a443484..93bd623697 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4679,7 +4679,7 @@ (define-public dconf (define-public json-glib-minimal (package (name "json-glib-minimal") - (version "1.6.2") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/json-glib/" @@ -4687,14 +4687,16 @@ (define-public json-glib-minimal "/json-glib-" version ".tar.xz")) (sha256 (base32 - "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) + "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (list #:glib-or-gtk? #t + #:configure-flags #~'("-Dgtk_doc=disabled"))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal - ("pkg-config" ,pkg-config))) + (list + gettext-minimal + `(,glib "bin") ;for glib-mkenums and glib-genmarshal + pkg-config)) (inputs (list bash-minimal)) (propagated-inputs @@ -4713,8 +4715,7 @@ (define-public json-glib (arguments (substitute-keyword-arguments (package-arguments json-glib-minimal) ((#:configure-flags _) - #~(list "-Ddocs=true" - "-Dman=true" + #~(list "-Dman=true" #$@(if (%current-target-system) ;; If enabled, gtkdoc-scangobj will try to execute a ;; cross-compiled binary. @@ -4722,7 +4723,8 @@ (define-public json-glib ;; Trying to build introspection data when cross-compiling ;; causes errors during linking. "-Dintrospection=disabled") - #~()))) + #~("-Dgtk_doc=enabled" + "-Dintrospection=enabled")))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases ;; When cross-compiling, there are no docs to move. @@ -4735,16 +4737,18 @@ (define-public json-glib (lambda _ (mkdir-p (string-append #$output:doc "/share")) (rename-file - (string-append #$output "/share/gtk-doc") + (string-append #$output "/share/doc") (string-append #$output:doc - "/share/gtk-doc")))))))))) + "/share/doc")))))))))) (native-inputs (modify-inputs (package-native-inputs json-glib-minimal) (prepend docbook-xml-4.3 docbook-xsl + gi-docgen gobject-introspection - gtk-doc - libxslt))))) + libxml2 + libxslt + python))))) (define-public libxklavier (package