From a960dbc5d5f68c7ffdded79e34f6739b0d90940e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 Mar 2022 18:12:59 +0100 Subject: [PATCH] package/json-glib: bump to version 1.6.6 - Update introspection option: https://gitlab.gnome.org/GNOME/json-glib/-/commit/461edcc8cd6dc1c4efeb09aaaba02459293546f2 - Disable docs (enabled by default since https://gitlab.gnome.org/GNOME/json-glib/-/commit/8d6176451f9d7cd4d6660185c679733aee3b57ea) - Disable tests (added by: https://gitlab.gnome.org/GNOME/json-glib/-/commit/8e835f8ed2299ad68032432eaf6491b2da8d532b) - Update indentation in hash file (two spaces) https://gitlab.gnome.org/GNOME/json-glib/-/blob/1.6.6/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-glib/json-glib.hash | 6 +++--- package/json-glib/json-glib.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash index b68794db37..680d404a4b 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888..52ca47e906 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPL-2.1+ JSON_GLIB_LICENSE_FILES = COPYING JSON_GLIB_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)