diff mbox series

[v9,1/6] package/json-glib: bump to version 1.10.6

Message ID 20250120211707.2381182-2-fiona.klute@gmx.de
State Accepted
Headers show
Series libglib2 2.82 series with bootstrap | expand

Commit Message

Fiona Klute Jan. 20, 2025, 9:17 p.m. UTC
From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de>

Required to build with gobject-introspection >= 1.82.0, to be bumped
in a later commit.

License information has been restructured according to REUSE
guidelines, see [1]. Update hashes and license information
accordingly.

[1] https://gitlab.gnome.org/GNOME/json-glib/-/commit/a06d43db36545aff10eb384d62548d96a7cf6020

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Tested-by: Marcus Hoffmann <buildroot@bubu1.eu>
---
Changes v8 -> v9 (Fiona):
* Update license info & hashes

Changes v7 -> v8 (Fiona):
* Move json-glib bump to start of series, to avoid broken state after
  GOI bump

Changes v6 -> v7 (Fiona):
* Bump json-glib to version 1.10.6

 package/json-glib/json-glib.hash | 13 +++++++++----
 package/json-glib/json-glib.mk   | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/package/json-glib/json-glib.hash b/package/json-glib/json-glib.hash
index b78d708391..d61a448f4e 100644
--- a/package/json-glib/json-glib.hash
+++ b/package/json-glib/json-glib.hash
@@ -1,5 +1,10 @@ 
-# From https://download.gnome.org/sources/json-glib/1.8/json-glib-1.8.0.sha256sum
-sha256  97ef5eb92ca811039ad50a65f06633f1aae64792789307be7170795d8b319454  json-glib-1.8.0.tar.xz
+# From https://download.gnome.org/sources/json-glib/1.10/json-glib-1.10.6.sha256sum
+sha256  77f4bcbf9339528f166b8073458693f0a20b77b7059dbc2db61746a1928b0293  json-glib-1.10.6.tar.xz
 
-# Hash for license file:
-sha256  a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7  COPYING
+# Hashes for license files and REUSE license/file listing
+sha256  a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499  LICENSES/CC0-1.0.txt
+sha256  fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb  LICENSES/LGPL-2.1-or-later.txt
+sha256  b85dcd3e453d05982552c52b5fc9e0bdd6d23c6f8e844b984a88af32570b0cc0  LICENSES/MIT.txt
+sha256  c3d141a8d2613d8c376cf240cdecd10ea0ae2dd0e16f648e88ddae425b2d3ba8  .reuse/dep5
+# symlink to LICENSES/LGPL-2.1-or-later.txt
+sha256  fa6f36630bb1e0c571d34b2bbdf188d08495c9dbf58f28cac112f303fc1f58fb  COPYING
diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk
index e216af20b1..a7a6d7f497 100644
--- a/package/json-glib/json-glib.mk
+++ b/package/json-glib/json-glib.mk
@@ -4,12 +4,16 @@ 
 #
 ################################################################################
 
-JSON_GLIB_VERSION_MAJOR = 1.8
-JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).0
+JSON_GLIB_VERSION_MAJOR = 1.10
+JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6
 JSON_GLIB_SITE = https://download.gnome.org/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_LICENSE = LGPL-2.1+, MIT (conformance test data), CC0-1.0 (parts of build system, metadata, translations)
+JSON_GLIB_LICENSE_FILES = LICENSES/CC0-1.0.txt \
+	LICENSES/LGPL-2.1-or-later.txt \
+	LICENSES/MIT.txt \
+	.reuse/dep5 \
+	COPYING
 JSON_GLIB_INSTALL_STAGING = YES
 JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false