From c0ab8bb2eebd0ea9d066cccfa50006e71d7b0a8d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Dec 2025 20:00:31 +0100 Subject: [PATCH] package/matchbox-lib: bump version to 1.14 Changelog: https://git.yoctoproject.org/libmatchbox/log/?h=1.14 Updated license hash due to upstream commit: https://git.yoctoproject.org/libmatchbox/commit/COPYING?h=1.14&id=bd46fea025212dac5e2a218a41f971d4cba92b76 Drop patch that is upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ine-correct-prototype-for-hash_empty.patch | 34 ------------------- package/matchbox-lib/matchbox-lib.hash | 4 +-- package/matchbox-lib/matchbox-lib.mk | 2 +- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 package/matchbox-lib/0002-Define-correct-prototype-for-hash_empty.patch diff --git a/package/matchbox-lib/0002-Define-correct-prototype-for-hash_empty.patch b/package/matchbox-lib/0002-Define-correct-prototype-for-hash_empty.patch deleted file mode 100644 index ac65d03b12..0000000000 --- a/package/matchbox-lib/0002-Define-correct-prototype-for-hash_empty.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 312c04b6ba60dca0d6c4a7d1393f0ec816a265e3 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 17 Mar 2025 14:16:03 -0700 -Subject: [PATCH] Define correct prototype for hash_empty() - -GCC-15 follows C23 standard which does not allow function -declarations without parameters and types - -Fixes - -../../git/libmb/hash.c:76:6: error: conflicting types for 'hash_empty'; have 'void(struct hash *)' - -Signed-off-by: Khem Raj -Signed-off-by: Richard Purdie -Upstream: https://git.yoctoproject.org/libmatchbox/commit/?id=312c04b6ba60dca0d6c4a7d1393f0ec816a265e3 -Signed-off-by: Thomas Petazzoni ---- - libmb/hash.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmb/hash.h b/libmb/hash.h -index 86f18bf..43827b2 100644 ---- a/libmb/hash.h -+++ b/libmb/hash.h -@@ -38,5 +38,5 @@ struct hash* hash_new(int size); - unsigned int hashfunc(struct hash *h, char *s); - struct nlist *hash_lookup(struct hash *h, char *s); - struct nlist *hash_add(struct hash *h, char *key, char *val); --void hash_empty(); -+void hash_empty(struct hash *h); - void hash_destroy(struct hash *h); --- -2.52.0 - diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash index ecd02f7174..7c2d972440 100644 --- a/package/matchbox-lib/matchbox-lib.hash +++ b/package/matchbox-lib/matchbox-lib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 648d7e1af82e69b79c0932ff9f85e6781584eada5da8662f70196916dd208f55 libmatchbox-1.12.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 2d0c3e827acb8f95e801168d6f7fa03497e06ff60cbfe0b8ae7c5e740295c6ac libmatchbox-1.14.tar.gz +sha256 8e470c16b6bc23f275c22fec5ed56ca8dceca9d34c87d76d5a0c1295553f15d1 COPYING diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk index b6e4584052..097678c028 100644 --- a/package/matchbox-lib/matchbox-lib.mk +++ b/package/matchbox-lib/matchbox-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATCHBOX_LIB_VERSION = 1.12 +MATCHBOX_LIB_VERSION = 1.14 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.gz MATCHBOX_LIB_SITE = http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot MATCHBOX_LIB_LICENSE = LGPL-2.1+