[glib/wip/pwithnall/ci-image-updates] WIP

[Philip Withnall <pwithnall src gnome org>]

commit b041e0dfe7ee3fb3ea9255ce72dbf543644fb4b1
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jun 24 15:09:14 2022 +0100

    WIP
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 subprojects/packagefiles/pcre2/0001.patch        |  25 ++++
 subprojects/packagefiles/pcre2/meson.build       | 181 -----------------------
 subprojects/packagefiles/pcre2/meson_options.txt |   8 -
 subprojects/pcre2.wrap                           |  16 +-
 4 files changed, 36 insertions(+), 194 deletions(-)
---
diff --git a/subprojects/packagefiles/pcre2/0001.patch b/subprojects/packagefiles/pcre2/0001.patch
new file mode 100644
index 0000000000..96cb635306
--- /dev/null
+++ b/subprojects/packagefiles/pcre2/0001.patch
@@ -0,0 +1,25 @@
+diff --git a/subprojects/packagefiles/pcre2/meson.build b/subprojects/packagefiles/pcre2/meson.build
+index 27cacf6..ce96043 100644
+--- a/subprojects/packagefiles/pcre2/meson.build
++++ b/subprojects/packagefiles/pcre2/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())
diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap
index b755e14afd..e68f22a4aa 100644
--- a/subprojects/pcre2.wrap
+++ b/subprojects/pcre2.wrap
@@ -3,10 +3,16 @@ directory = pcre2-10.40
 source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2
 source_filename = pcre2-10.40.tar.bz2
 source_hash = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68
-patch_directory = pcre2
+patch_filename = pcre2_10.40-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-1/get_patch
+patch_hash = 2f134f8d933fb2444048278556451d2ef3016ef052dcf454e324396fe07934c3
+wrapdb_version = 10.40-1
+
+diff_files = pcre2/0001.patch
 
 [provide]
-libpcre2-8 =-libpcre2_8
-libpcre2-16 =-libpcre2_16
-libpcre2-32 =-libpcre2_32
-libpcre2-posix =-libpcre2_posix
\ No newline at end of file
+libpcre2-8 = -libpcre2_8
+libpcre2-16 = -libpcre2_16
+libpcre2-32 = -libpcre2_32
+libpcre2-posix = -libpcre2_posix
+