Move to next stable series.
https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS
A bunch of fixes and improvments, 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.me...@t2data.com>
---
 rules/glib.in   |  3 +--
 rules/glib.make | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/rules/glib.in b/rules/glib.in
index e74db0509..bbe396f4d 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -9,8 +9,7 @@ menuconfig GLIB
        select LIBC_PTHREAD
        select ICONV
        select LIBFFI
-       select LIBPCRE
-       select LIBPCRE_ENABLE_UTF8
+       select PCRE2
        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 \
-- 
2.34.1


Reply via email to