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




commit 4a4a835b2c1c424a20c7a6c54c8739719bf2fb9b
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jun 24 14:28:22 2022 +0100

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

 .gitlab-ci/cache-subprojects.sh |  2 +-
 subprojects/pcre2.wrap          | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci/cache-subprojects.sh b/.gitlab-ci/cache-subprojects.sh
index 0e69266059..c6da3676e2 100755
--- a/.gitlab-ci/cache-subprojects.sh
+++ b/.gitlab-ci/cache-subprojects.sh
@@ -2,7 +2,7 @@
 
 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
 rm glib/subprojects/*.wrap
diff --git a/subprojects/pcre2.wrap b/subprojects/pcre2.wrap
index 17a81c5498..b755e14afd 100644
--- a/subprojects/pcre2.wrap
+++ b/subprojects/pcre2.wrap
@@ -1,8 +1,12 @@
 [wrap-file]
-directory = pcre2-10.39
-source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2
-source_filename = pcre2-10.39.tar.bz2
-source_hash = 0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440
-patch_filename = pcre2_10.39-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.39-2/get_patch
-patch_hash = c4cfffff83e7bb239c8c330339b08f4367b019f79bf810f10c415e35fb09cf14
\ No newline at end of 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_directory = pcre2
+
+[provide]
+libpcre2-8 =-libpcre2_8
+libpcre2-16 =-libpcre2_16
+libpcre2-32 =-libpcre2_32
+libpcre2-posix =-libpcre2_posix
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]