ci-build: Update required MSYS packages

The older versions we were previously building against are no longer
available on mirrors.

Based on changes proposed in !189 by Arnout Engelen, and the package
list gathered by Ralf Habacker in #318.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/318
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 053238254ec1cd145208d19c808678b61a6a6566)

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index cb19f4a7711b949827b9204197653da0821fcb52..f0162f45b92adea6a0b363513f1dfabb738eefd8 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -119,12 +119,17 @@ case "$ci_host" in
         unset CC
         unset CXX
         for pkg in \
-            expat-2.1.0-6 \
-            gcc-libs-5.2.0-4 \
-            gettext-0.19.6-1 \
-            glib2-2.46.1-1 \
-            libffi-3.2.1-3 \
-            zlib-1.2.8-9 \
+            bzip2-1.0.8-1 \
+            expat-2.2.9-1 \
+            gcc-libs-9.3.0-2 \
+            gettext-0.19.8.1-8 \
+            glib2-2.64.2-1 \
+            iconv-1.16-1 \
+            libffi-3.3-1 \
+            libiconv-1.16-1 \
+            libwinpthread-git-8.0.0.5814.9dbf4cc1-1 \
+            pcre-8.44-1 \
+            zlib-1.2.11-7 \
             ; do
             wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
             tar -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz