From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 22 Nov 2016 21:10:44 +0000 (+0000)
Subject: Install mingw build-dependencies in a different order
X-Git-Tag: dbus-1.10.14~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4640c6facdb48f98761188645212d9a9184e366;p=thirdparty%2Fdbus.git

Install mingw build-dependencies in a different order

This avoids installing the build-dependencies for dbus and its tests,
then uninstalling them all because they rely on libraries whose versions
are older than the ones needed by wine:i386 (and apparently apt prefers
to remove those libraries rather than upgrade them). Doing it this way
round seems to convince apt to do the right thing.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/.travis.yml b/.travis.yml
index 7f09c1d9a..03f9c9a6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ install:
   - ": | sudo tee /etc/apt/sources.list.d/google-chrome.list"
   - test "$dbus_ci_host" != mingw || sudo dpkg --add-architecture i386
   - sudo apt-get -qq -y update
+  - >
+    test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install
+    binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386
   - sudo apt-get -qq -y build-dep dbus
   - >
     sudo apt-get -qq -y install
@@ -31,9 +34,6 @@ install:
     xmlto
     xsltproc
     xvfb
-  - >
-    test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install
-    binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386
 script:
   # python-dbus and python-gi aren't available to Travis's version of
   # Python in /opt, which it uses as a default