fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-08 03:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install mingw build-dependencies in a different order

Browse source 
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>
This commit is contained in:
Simon McVittie 2016-11-22 21:10:44 +00:00
parent 07ec3ecf24
commit c4640c6fac
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -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