[glib/wip/pwithnall/ci-image-updates] WIP: ci: Apply patch to pcre2

[Philip Withnall <pwithnall src gnome org>]

commit d891c4279b26f23849c296eccc676cc376521b02
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jun 24 17:26:04 2022 +0100

    WIP: ci: Apply patch to pcre2
    
    This is https://github.com/mesonbuild/wrapdb/pull/499, but without using
    `diff_files` because the Meson version on the CI images is too old.
    
    I’ve literally spent an entire afternoon putting this crap together.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 .gitlab-ci/cache-subprojects.sh           |  3 ++-
 meson.build                               |  1 +
 subprojects/packagefiles/pcre2/0001.patch | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci/cache-subprojects.sh b/.gitlab-ci/cache-subprojects.sh
index 0e69266059..b7e0441e44 100755
--- a/.gitlab-ci/cache-subprojects.sh
+++ b/.gitlab-ci/cache-subprojects.sh
@@ -2,9 +2,10 @@
 
 set -e
 
-git clone --depth 1 --no-tags https://gitlab.gnome.org/GNOME/glib.git
+git clone --depth 1 --no-tags https://gitlab.gnome.org/GNOME/glib.git --branch wip/pwithnall/ci-image-updates
 git -C glib submodule update --init
 meson subprojects download --sourcedir glib
+pushd glib/subprojects/pcre2-10.40 && git --work-tree . apply -p1 ../packagefiles/pcre2/0001.patch && popd
 rm glib/subprojects/*.wrap
 mv glib/subprojects/ .
 rm -rf glib
diff --git a/meson.build b/meson.build
index e44bad35bd..d5f3b9a7e0 100644
--- a/meson.build
+++ b/meson.build
@@ -2008,6 +2008,7 @@ else
   libiconv = dependency('iconv')
 endif
 
+subproject('pcre2')
 pcre = dependency('libpcre', version: '>= 8.31', required : false) # Should check for Unicode support, too. 
FIXME
 if not pcre.found()
   if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
diff --git a/subprojects/packagefiles/pcre2/0001.patch b/subprojects/packagefiles/pcre2/0001.patch
new file mode 100644
index 0000000000..cbe1e110e3
--- /dev/null
+++ b/subprojects/packagefiles/pcre2/0001.patch
@@ -0,0 +1,25 @@
+diff --git a/meson.build b/meson.build
+index 27cacf6..ce96043 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,17 +130,17 @@ install_headers([pcre2_h, 'src/pcre2posix.h'])
+ 
+ pkg = import('pkgconfig')
+ 
+-pkg.generate(libraries : pcre2_8_lib,
++pkg.generate(pcre2_8_lib,
+              name : 'libpcre2-8',
+              description: 'PCRE2 - Perl compatible regular expressions C library (2nd API) with 8 bit 
character support',
+              version: meson.project_version())
+ 
+-pkg.generate(libraries : pcre2_16_lib,
++pkg.generate(pcre2_16_lib,
+              name : 'libpcre2-16',
+              description: 'PCRE2 - Perl compatible regular expressions C library (2nd API) with 16 bit 
character support',
+              version: meson.project_version())
+ 
+-pkg.generate(libraries : pcre2_32_lib,
++pkg.generate(pcre2_32_lib,
+              name : 'libpcre2-32',
+              description: 'PCRE2 - Perl compatible regular expressions C library (2nd API) with 32 bit 
character support',
+              version: meson.project_version())