From: Simon McVittie <smcv@collabora.com>
Date: Wed, 3 Oct 2018 16:51:49 +0000 (+0100)
Subject: ci: Teach ci-install.sh to install wine on Debian 9 'stretch'
X-Git-Tag: dbus-1.12.12~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35fb20a1f4e019ce19e14fe8d2fcae90ba466d91;p=thirdparty%2Fdbus.git

ci: Teach ci-install.sh to install wine on Debian 9 'stretch'

Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=108177
Acked-by: Philip Withnall <withnall@endlessm.com>
(cherry picked from commit 408b222a9fc61327cd7be385b6705f30f0c38802)
---

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 68d1c11ba..cd39026bc 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -82,12 +82,24 @@ case "$ci_distro" in
         # travis-ci has a sources list for Chrome which doesn't support i386
         : | $sudo tee /etc/apt/sources.list.d/google-chrome.list
 
+        case "$ci_suite" in
+            (trusty)
+                # Ubuntu 14.04 didn't have the wine32, wine64 packages
+                wine32=wine:i386
+                wine64=wine:amd64
+                ;;
+            (*)
+                wine32=wine32
+                wine64=wine64
+                ;;
+        esac
+
         case "$ci_host" in
             (i686-w64-mingw32)
                 $sudo dpkg --add-architecture i386
                 ;;
             (x86_64-w64-mingw32)
-                # nothing required, travis-ci is an amd64 system
+                # assume the host or container is x86_64 already
                 ;;
         esac
 
@@ -98,14 +110,14 @@ case "$ci_distro" in
                 $sudo apt-get -qq -y install \
                     binutils-mingw-w64-i686 \
                     g++-mingw-w64-i686 \
-                    wine:i386 \
+                    $wine32 \
                     ${NULL}
                 ;;
             (x86_64-w64-mingw32)
                 $sudo apt-get -qq -y install \
                     binutils-mingw-w64-x86-64\
                     g++-mingw-w64-x86-64 \
-                    wine:amd64 \
+                    $wine64 \
                     ${NULL}
                 ;;
         esac