[glib/wip/pwithnall/ci-image-updates: 15/15] ci: Add libpcre2 dependencies and subproject

[Philip Withnall <pwithnall src gnome org>]

commit 03ea524188f80e693fe9c5151992c6072535b1a8
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jun 24 12:50:26 2022 +0100

    ci: Add libpcre2 dependencies and subproject
    
    This is in preparation for porting `GRegex` to libpcre2, which is
    happening in !2529. It’s a big port, though, and specially rebuilding
    the CI images to add libpcre2 for it is a pain.
    
    Add libpcre2, and then !2529 can drop the old libpcre dependencies when
    the port lands.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Helps: #1085

 .gitlab-ci.yml                      |  8 ++++----
 .gitlab-ci/coverity.Dockerfile      |  2 +-
 .gitlab-ci/debian-stable.Dockerfile |  1 +
 .gitlab-ci/fedora.Dockerfile        |  1 +
 .gitlab-ci/mingw.Dockerfile         |  1 +
 .gitlab-ci/test-msys2.sh            |  1 +
 subprojects/pcre2.wrap              | 16 ++++++++++++++++
 7 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebcc251201..0195ed30fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,10 +10,10 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v16"
-  COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v5"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v11"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v7"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v17"
+  COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v6"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v12"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v8"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile
index 67ebc440af..5ee757e2dd 100644
--- a/.gitlab-ci/coverity.Dockerfile
+++ b/.gitlab-ci/coverity.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v16
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v17
 
 ARG COVERITY_SCAN_PROJECT_NAME
 ARG COVERITY_SCAN_TOKEN
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index f9ba9bfc2e..0622aa26b8 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -27,6 +27,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     libffi-dev \
     libmount-dev \
     libpcre3-dev \
+    libpcre2-dev \
     libselinux1-dev \
     libxml2-utils \
     libxslt1-dev \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 386be1ac5b..b83a34c8c7 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -44,6 +44,7 @@ RUN dnf -y update \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
+    pcre2-devel \
     "python3-dbusmock >= 0.18.3-2" \
     python3-pip \
     python3-pygments \
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index 904fc1211d..5fe5e67ded 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -44,6 +44,7 @@ RUN dnf -y install \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
+    pcre2-devel \
     python3 \
     python3-pip \
     python3-wheel \
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 85ed88f3fe..d891ee008f 100755
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -19,6 +19,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-libffi \
     mingw-w64-$MSYS2_ARCH-meson \
     mingw-w64-$MSYS2_ARCH-pcre \
+    mingw-w64-$MSYS2_ARCH-pcre2 \
     mingw-w64-$MSYS2_ARCH-python3 \
     mingw-w64-$MSYS2_ARCH-python-pip \
     mingw-w64-$MSYS2_ARCH-toolchain \
diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap
new file mode 100644
index 0000000000..d210eb65d3
--- /dev/null
+++ b/subprojects/pcre2.wrap
@@ -0,0 +1,16 @@
+[wrap-file]
+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_filename = pcre2_10.40-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-2/get_patch
+patch_hash = 6c1bbb3c00ec3917b3abee922dedc19ad8b3a199db65ba893a61241e3428bdbd
+wrapdb_version = 10.40-2
+
+[provide]
+libpcre2-8 = -libpcre2_8
+libpcre2-16 = -libpcre2_16
+libpcre2-32 = -libpcre2_32
+libpcre2-posix = -libpcre2_posix
+