Thanks, applied as 5e6bdbf87d6f30fe5787d9f9dadbd990214ff685. Michael
[sent from post-receive hook] On Tue, 22 Feb 2022 08:39:25 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/json-glib.in b/rules/json-glib.in > index 03e3743697ce..9230f4001bee 100644 > --- a/rules/json-glib.in > +++ b/rules/json-glib.in > @@ -3,6 +3,7 @@ > config JSON_GLIB > tristate > prompt "json-glib" > + select HOST_MESON > select GLIB > select HOST_GLIB # for glib-mkenums > select GOBJECT_INTROSPECTION if JSON_GLIB_INTROSPECTION > diff --git a/rules/json-glib.make b/rules/json-glib.make > index 507560e283f0..d36edc7d2cf6 100644 > --- a/rules/json-glib.make > +++ b/rules/json-glib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_GLIB) += json-glib > # > # Paths and names > # > -JSON_GLIB_VERSION := 1.2.8 > -JSON_GLIB_MD5 := ff31e7d0594df44318e12facda3d086e > +JSON_GLIB_VERSION := 1.6.6 > +JSON_GLIB_MD5 := 9c40fcd8cdbf484dd1704480afefae14 > JSON_GLIB := json-glib-$(JSON_GLIB_VERSION) > JSON_GLIB_SUFFIX := tar.xz > JSON_GLIB_URL := $(call ptx/mirror, GNOME, > json-glib/$(basename $(JSON_GLIB_VERSION))/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)) > @@ -28,25 +28,15 @@ JSON_GLIB_LICENSE := LGPL-2.1-only > # > ---------------------------------------------------------------------------- > > # > -# autoconf > +# meson > # > -JSON_GLIB_CONF_TOOL := autoconf > +JSON_GLIB_CONF_TOOL := meson > JSON_GLIB_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-glibtest \ > - --enable-debug=minimum \ > - --enable-maintainer-flags=no \ > - --disable-installed-tests \ > - --disable-always-build-tests \ > - --disable-gcov \ > - --disable-gtk-doc \ > - --disable-gtk-doc-html \ > - --disable-gtk-doc-pdf \ > - --disable-man \ > - --$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)-introspection \ > - --disable-nls \ > - --disable-rpath > - > + $(CROSS_MESON_USR) \ > + -Dintrospection=$(call ptx/endis, PTXCONF_JSON_GLIB_INTROSPECTION)d \ > + -Dgtk_doc=disabled \ > + -Dman=false \ > + -Dtests=false > > # > ---------------------------------------------------------------------------- > # Target-Install _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
