From: Florian Eckert <redacted>
Date: Fri, 16 Feb 2024 09:16:10 +0000 (+0100)
Subject: Revert "glib2: use internal pcre2"
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=445f75e3f16adcf3b5f419a97284f4612eacd3fc;p=openwrt-packages.git

Revert "glib2: use internal pcre2"

This is must also get revert to get back to working glib2 version 2.74.0

Signed-off-by: Florian Eckert <redacted>

This reverts commit 9f57ef2d6e339231278f36614d9b2fdd275a9339.
---

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 27e30a807..7dc30ddd7 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
 PKG_VERSION:=2.78.4
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
@@ -55,7 +55,7 @@ COMP_ARGS= \
 	-Dglib_checks=true \
 	-Dlibelf=disabled
 
-MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled -Dforce_fallback_for=libpcre2-8
+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
 
 define Build/InstallDev
diff --git a/libs/glib2/patches/010-pcre.patch b/libs/glib2/patches/010-pcre.patch
index b61341cdf..ead8f7f23 100644
--- a/libs/glib2/patches/010-pcre.patch
+++ b/libs/glib2/patches/010-pcre.patch
@@ -1,11 +1,8 @@
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -400,8 +400,9 @@ endif
+@@ -402,6 +402,7 @@ pcre2_static_args = []
  
- pcre2_static_args = []
- 
--if use_pcre2_static_flag
-+if pcre2.type_name() == 'internal'
+ if use_pcre2_static_flag
    pcre2_static_args = ['-DPCRE2_STATIC']
 +  pcre2 = pcre2.as_link_whole()
  endif