From: Simon McVittie <smcv@collabora.com>
Date: Fri, 6 Nov 2020 13:38:45 +0000 (+0000)
Subject: ci-build: Update required MSYS packages
X-Git-Tag: dbus-1.12.22~4^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1799f782bb30b54b3effad4b02b09e35994b9e9;p=thirdparty%2Fdbus.git

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 cb19f4a77..f0162f45b 100755
--- 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