glib2: update to 2.88.1

Bump from 2.82.0 to the current upstream stable. Required by GTK
4.22 and other recent GNOME-stack consumers (gtk 4.22 requires
glib >= 2.84).

Refresh 006-c99.patch for upstream context shift; the patch
forces HAVE_C99_SNPRINTF/VSNPRINTF and HAVE_UNIX98_PRINTF to
true when cross-compiling, since upstream now only does that
implicitly for the darwin/iOS/tvOS triplet.

Link: https://gitlab.gnome.org/GNOME/glib/-/tags/2.88.1
Signed-off-by: Daniel Golle <redacted>

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 0679ab28be0420f3ed2cc2a13d36e42352f4c753..f10f7422385b5892f151357a42cd6d515f86ea4a 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.82.0
-PKG_RELEASE:=3
+PKG_VERSION:=2.88.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
-PKG_HASH:=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
+PKG_HASH:=51ab804c56f6eab3e5045c774d1290ac5e4c923d4f9a3d8e33123bee45c1840e
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=LGPL-2.1-or-later

diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch
index 98c17db0f24a63a88eea520a8356bc8300ed1fe3..5408fd96d664785da591a8bc648fb423899dc022 100644 (file)
--- a/libs/glib2/patches/006-c99.patch
+++ b/libs/glib2/patches/006-c99.patch
@@ -1,10 +1,10 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -1189,7 +1189,7 @@ if host_system == 'windows' and (cc.get_
+@@ -1239,7 +1239,7 @@ if host_system == 'windows' and (cc.get_
    glib_conf.set('HAVE_C99_SNPRINTF', false)
    glib_conf.set('HAVE_C99_VSNPRINTF', false)
    glib_conf.set('HAVE_UNIX98_PRINTF', false)
--elif not cc_can_run and host_system in ['ios', 'darwin']
+-elif not cc_can_run and host_system == 'darwin'
 +elif true
    # All these are true when compiling natively on macOS, so we should use good
    # defaults when building for iOS and tvOS.