From 042e2bd2603c2eecf6a0ef7c105ea788491653be Mon Sep 17 00:00:00 2001
From: Christian Melki <christian.melki@t2data.com>
Date: Tue, 22 Nov 2022 13:22:39 +0100
Subject: glib: Version bump. 2.72.3 -> 2.74.1.

Move to next stable series.
https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS
A bunch of fixes and improvements, as usual.
Notable is the replacement of pcre for pcre2.
Likely to cause some minor headaches.
As usual, glib needs wringing with various packages.

* License changed from LGPL-2.0 or later to LGPL-2.1 or later.
* glib.h had a SPDX identifier added.
* COPYING points to the actual license file in the license directory.
* Remove -Dfam (gamin file monitor). Deprecated.
* Replace PCRE with PCRE2. PCRE2 selects 8-bit by default.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20221122122240.3967729-1-christian.melki@t2data.com>
[mol: squash host-glib changes and add missing PCRE2_8 dependency]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

fixup! glib: Version bump. 2.72.3 -> 2.74.1.
---
 rules/glib.in        |  4 ++--
 rules/glib.make      | 11 +++++------
 rules/host-glib.in   |  2 +-
 rules/host-glib.make |  1 -
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/rules/glib.in b/rules/glib.in
index 140bf0131..00485112a 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -8,8 +8,8 @@ menuconfig GLIB
 	select LIBC_PTHREAD
 	select ICONV
 	select LIBFFI
-	select LIBPCRE
-	select LIBPCRE_ENABLE_UTF8
+	select PCRE2
+	select PCRE2_8
 	select UTIL_LINUX		if GLIB_LIBMOUNT
 	select UTIL_LINUX_LIBMOUNT	if GLIB_LIBMOUNT
 	select ZLIB
diff --git a/rules/glib.make b/rules/glib.make
index 8b1fd17f9..39fb55543 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -15,17 +15,17 @@ PACKAGES-$(PTXCONF_GLIB) += glib
 #
 # Paths and names
 #
-GLIB_VERSION	:= 2.72.3
-GLIB_MD5	:= ef67f7e19e47c8e082256d614f1ab8f4
+GLIB_VERSION	:= 2.74.1
+GLIB_MD5	:= abcfe42128bbace7a63c795551131d93
 GLIB		:= glib-$(GLIB_VERSION)
 GLIB_SUFFIX	:= tar.xz
 GLIB_URL	:= $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
 GLIB_SOURCE	:= $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
 GLIB_DIR	:= $(BUILDDIR)/$(GLIB)
-GLIB_LICENSE	:= LGPL-2.0-or-later
+GLIB_LICENSE	:= LGPL-2.1-or-later
 GLIB_LICENSE_FILES := \
-	file://glib/glib.h;startline=1;endline=16;md5=48a2e189b0f5db4b3c3fd8f53bdb55a0 \
-	file://COPYING;md5=4fbd65380cdd255951079008b364516c
+	file://glib/glib.h;startline=1;endline=18;md5=c97f6829778db537db59d1ce41090b51 \
+	file://LICENSES/LGPL-2.1-or-later.txt;md5=41890f71f740302b785c27661123bff5
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -39,7 +39,6 @@ GLIB_CONF_OPT	:= \
 	$(CROSS_MESON_USR) \
 	-Dbsymbolic_functions=true \
 	-Ddtrace=false \
-	-Dfam=false \
 	-Dforce_posix_threads=true \
 	-Dglib_assert=true \
 	-Dglib_checks=true \
diff --git a/rules/host-glib.in b/rules/host-glib.in
index b87c33937..08f5cae2c 100644
--- a/rules/host-glib.in
+++ b/rules/host-glib.in
@@ -4,6 +4,6 @@ config HOST_GLIB
 	tristate
 	default y if ALLYES
 	select HOST_LIBFFI
-	select HOST_LIBPCRE
 	select HOST_MESON
+	select HOST_PCRE2
 	select HOST_ZLIB
diff --git a/rules/host-glib.make b/rules/host-glib.make
index c062ad884..71973203b 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -28,7 +28,6 @@ HOST_GLIB_CONF_OPT	:= \
 	$(HOST_MESON_OPT) \
 	-Dbsymbolic_functions=true \
 	-Ddtrace=false \
-	-Dfam=false \
 	-Dforce_posix_threads=true \
 	-Dglib_assert=true \
 	-Dglib_checks=true \
-- 
cgit v1.2.3