[libsoup/wip/glib-bump] Bump glib requirement to 2.69.1




commit 8f8839cb9fe665b6d06077c4fce0571bc139d6ba
Author: Patrick Griffis <pgriffis igalia com>
Date:   Mon Aug 23 08:59:46 2021 -0500

    Bump glib requirement to 2.69.1

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 4 ++--
 .gitlab-ci/run-docker.sh | 2 +-
 meson.build              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2530f61..fa87b736 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v13
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v14
 
 stages:
   - build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index bc4d4b4e..1b589497 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -36,7 +36,7 @@ RUN dnf update -y \
 
 RUN git clone https://gitlab.gnome.org/GNOME/glib.git \
     && pushd glib \
-    && git checkout 02742ef957b532789c003eef80ec7f51c370e3d5 \
+    && git checkout 2.69.1 \
     && meson _build --prefix=/usr \
     && ninja -C _build install \
     && popd \
@@ -44,7 +44,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/glib.git \
 
 RUN git clone https://gitlab.gnome.org/GNOME/glib-networking.git \
     && pushd glib-networking \
-    && git checkout 2.70.alpha \
+    && git checkout f7b3250d3e3fce4ea02b00610d9f2148ade4a6ce \
     && meson _build --prefix=/usr \
     && ninja -C _build install \
     && popd \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index e386d021..f23c8151 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v13"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v14"
 
 SUDO_CMD="sudo"
 if docker -v |& grep -q podman; then
diff --git a/meson.build b/meson.build
index 52861b59..e49c9521 100644
--- a/meson.build
+++ b/meson.build
@@ -90,7 +90,7 @@ endif
 
 add_project_arguments(common_flags, language : 'c')
 
-glib_required_version = '>= 2.69.0'
+glib_required_version = '>= 2.69.1'
 glib_dep = dependency('glib-2.0', version : glib_required_version,
                        fallback: ['glib', 'libglib_dep'])
 gobject_dep = dependency('gobject-2.0', version : glib_required_version,


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