--- Begin Message ---
|
Subject: |
[PATCH gnome-team] gnu: json-glib: Update to 1.6.6. |
|
Date: |
Fri, 24 Nov 2023 00:08:44 +0100 |
|
User-agent: |
Evolution 3.46.4 |
* 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.
Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888
---
gnu/packages/gnome.scm | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 194a443484..477b6e07fe 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,19 @@ (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
base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93
--
2.41.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [PATCH gnome-team v7 00/15] World-rebuilding updates for GNOME 44.7 |
|
Date: |
Tue, 19 Dec 2023 23:52:02 +0100 |
|
User-agent: |
Evolution 3.46.4 |
Am Dienstag, dem 19.12.2023 um 13:29 -0500 schrieb Maxim Cournoyer:
> Hello,
>
> Vivien Kraus <vivien@planete-kraus.eu> writes:
>
> > Dear guix,
> >
> > GNOME 44.7 releases with a new Vala. I added it to the series.
> >
> > What do you think?
> >
> > Best regards,
> >
> > Vivien
> >
> > Vivien Kraus (15):
> > gnu: gdk-pixbuf: Update to 2.42.10.
> > gnu: glib-networking: Update to 2.76.1.
> > gnu: gnome-backgrounds: Update to 44.0.
> > gnu: gtk+: Update to 3.24.38.
> > gnu: gtkmm-3: Update to 3.24.8.
> > gnu: json-glib: Update to 1.6.6.
> > gnu: libnotify: Update to 0.8.3.
> > gnu: libsoup: Update to 3.4.4.
> > gnu: libsoup-minimal: Update to 3.4.4.
> > gnu: libsoup-minimal: Update style.
> > gnu: mm-common: Update to 1.0.5.
> > gnu: pangomm@2.46: Update to 2.46.3.
> > gnu: vala: Update to 0.56.14.
> > gnu: yelp-tools: Update to 42.1.
> > gnu: yelp-xsl: Update to 42.1.
> >
> > gnu/local.mk | 2 -
>
> I only had a small comment for "09/15 gnu: libsoup-minimal: Update to
> 3.4.4", so:
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
>
> (this being in reply to the cover letter meaning it's for the whole
> series, per "info --index-search=Reviewed-by guix")
Pushed v8, which addresses your comment.
Thanks everyone for your work and patience.
Cheers
--- End Message ---