libs/glib2: update to 2.82.0

Remove the obsolete patch as the required functionality was already available upstream. Refresh 006-c99.patch. Remove -Ddefault_library option from MESON_HOST_ARGS and MESON_ARGS as this is now the default behavior. Signed-off-by: Yegor Yefremov <[email protected]>
openwrt · Sep 17, 2024 · b93ad77 · b93ad77
1 parent 9cd39fb
commit b93ad77
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 696 deletions.
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.80.3
+PKG_VERSION:=2.82.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
-PKG_HASH:=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+PKG_HASH:=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3
 
 PKG_MAINTAINER:=Peter Wagner <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -68,8 +68,8 @@ COMP_ARGS+=-Dintrospection=disabled
 # set runtime dir to /var/run
 COMP_ARGS+=-Druntime_dir=/var/run
 
-MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled
-MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
+MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Dnls=disabled
+MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin

diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -1160,7 +1160,7 @@ if host_system == 'windows' and (cc.get_
+@@ -1189,7 +1189,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)