From d0db12043a9dab7c93bf386911ed1a7c6a7925a8 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Mon, 15 Apr 2024 13:39:20 +0200
Subject: [PATCH] libs/glib2: update to 2.80.0

Explicitly disable gobject introspection option.

Set runtime_dir to /var/run as current glib2 version sets this option
to /run by default.

python-packaging/host dependency is now mandatory.

Refresh patches.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 libs/glib2/Makefile                               | 15 +++++++++++----
 .../glib2/patches/003-valgrind.h-mips16-fix.patch |  2 +-
 libs/glib2/patches/006-c99.patch                  |  2 +-
 libs/glib2/patches/010-pcre.patch                 |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index ef36e162c0..dbadd4239a 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.74.7
-PKG_RELEASE:=3
+PKG_VERSION:=2.80.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
-PKG_HASH:=196ab86c27127a61b7a70c3ba6af7b97bdc01c07cd3b21abd5e778b955eccb1b
+PKG_HASH:=8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -26,7 +26,9 @@ PKG_FORTIFY_SOURCE:=0
 PKG_BUILD_FLAGS:=gc-sections
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
-HOST_BUILD_DEPENDS:=pcre2/host libffi/host libiconv-full/host
+HOST_BUILD_DEPENDS:=pcre2/host libffi/host libiconv-full/host python3/host python-packaging/host
+
+PKG_BUILD_DEPENDS:=python3/host python-packaging/host
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -66,6 +68,11 @@ COMP_ARGS+=-Dglib_assert=false
 # default boolean=true see meson_options.txt
 COMP_ARGS+=-Dtests=false
 
+# default feature=auto see meson_options.txt
+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 -Dforce_fallback_for=libpcre2-8
 MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
diff --git a/libs/glib2/patches/003-valgrind.h-mips16-fix.patch b/libs/glib2/patches/003-valgrind.h-mips16-fix.patch
index d0c5c80394..ca35972b74 100644
--- a/libs/glib2/patches/003-valgrind.h-mips16-fix.patch
+++ b/libs/glib2/patches/003-valgrind.h-mips16-fix.patch
@@ -1,6 +1,6 @@
 --- a/glib/valgrind.h
 +++ b/glib/valgrind.h
-@@ -158,7 +158,7 @@
+@@ -159,7 +159,7 @@
  #  define PLAT_s390x_linux 1
  #elif defined(__linux__) && defined(__mips__) && (__mips==64)
  #  define PLAT_mips64_linux 1
diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch
index b6d160737a..9cfcc33086 100644
--- a/libs/glib2/patches/006-c99.patch
+++ b/libs/glib2/patches/006-c99.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -1062,7 +1062,7 @@ if host_system == 'windows' and (cc.get_
+@@ -1160,7 +1160,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)
diff --git a/libs/glib2/patches/010-pcre.patch b/libs/glib2/patches/010-pcre.patch
index 4682134f11..2ce2a7b82e 100644
--- a/libs/glib2/patches/010-pcre.patch
+++ b/libs/glib2/patches/010-pcre.patch
@@ -1,10 +1,10 @@
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -366,6 +366,7 @@ pcre2_static_args = []
+@@ -404,6 +404,7 @@ pcre2_static_args = []
  
  if use_pcre2_static_flag
    pcre2_static_args = ['-DPCRE2_STATIC']
 +  pcre2 = pcre2.as_link_whole()
  endif
  
- glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre2_static_args + glib_hidden_visibility_args
+ glib_c_args = ['-DG_LOG_DOMAIN="GLib"'] + glib_c_args_internal + pcre2_static_args