From 9f379524076322f7875175f251b38e9c4083600a Mon Sep 17 00:00:00 2001
From: Joachim Bauch <mail@joachim-bauch.de>
Date: Sun, 24 Feb 2019 15:07:24 +0100
Subject: [PATCH 1/2] Switch to Xenial for CI runs.

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 93c6273..2a0f624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,8 @@ matrix:
 
 language: cpp
 
+dist: xenial
+
 cache:
   - apt
   - ccache

From 316aa59c48cd6ab1c10b8a1a99bc1e7aa6f719f4 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <mail@joachim-bauch.de>
Date: Sun, 24 Feb 2019 15:17:41 +0100
Subject: [PATCH 2/2] Get latest stable version of Wine when testing.

---
 .travis.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a0f624..0bb4efe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: true
 
 matrix:
   include:
-    - env: PLATFORM=x86_64 UNICODE=  CMAKE=
+    - env: PLATFORM=x86_64 UNICODE=  CMAKE= WINE_PACKAGE=winehq-stable:amd64
       addons:
         apt:
           packages:
@@ -10,8 +10,7 @@ matrix:
             - mingw-w64-x86-64-dev
             - g++-mingw-w64-x86-64
             - gcc-mingw-w64-x86-64
-            - wine:amd64
-    - env: PLATFORM=i686   UNICODE=  CMAKE=
+    - env: PLATFORM=i686   UNICODE=  CMAKE= WINE_PACKAGE=winehq-stable:i386
       addons:
         apt:
           packages:
@@ -19,8 +18,7 @@ matrix:
             - mingw-w64-i686-dev
             - g++-mingw-w64-i686
             - gcc-mingw-w64-i686
-            - wine:i386
-    - env: PLATFORM=x86_64 UNICODE=1 CMAKE=
+    - env: PLATFORM=x86_64 UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:amd64
       addons:
         apt:
           packages:
@@ -28,8 +26,7 @@ matrix:
             - mingw-w64-x86-64-dev
             - g++-mingw-w64-x86-64
             - gcc-mingw-w64-x86-64
-            - wine:amd64
-    - env: PLATFORM=i686   UNICODE=1 CMAKE=
+    - env: PLATFORM=i686   UNICODE=1 CMAKE= WINE_PACKAGE=winehq-stable:i386
       addons:
         apt:
           packages:
@@ -37,8 +34,7 @@ matrix:
             - mingw-w64-i686-dev
             - g++-mingw-w64-i686
             - gcc-mingw-w64-i686
-            - wine:i386
-    - env: PLATFORM=x86_64 UNICODE=  CMAKE=1
+    - env: PLATFORM=x86_64 UNICODE=  CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
       addons:
         apt:
           packages:
@@ -46,8 +42,7 @@ matrix:
             - mingw-w64-x86-64-dev
             - g++-mingw-w64-x86-64
             - gcc-mingw-w64-x86-64
-            - wine:amd64
-    - env: PLATFORM=i686   UNICODE=  CMAKE=1
+    - env: PLATFORM=i686   UNICODE=  CMAKE=1 WINE_PACKAGE=winehq-stable:i386
       addons:
         apt:
           packages:
@@ -56,8 +51,7 @@ matrix:
             - mingw-w64-i686-dev
             - g++-mingw-w64-i686
             - gcc-mingw-w64-i686
-            - wine:i386
-    - env: PLATFORM=x86_64 UNICODE=1 CMAKE=1
+    - env: PLATFORM=x86_64 UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:amd64
       addons:
         apt:
           packages:
@@ -66,8 +60,7 @@ matrix:
             - mingw-w64-x86-64-dev
             - g++-mingw-w64-x86-64
             - gcc-mingw-w64-x86-64
-            - wine:amd64
-    - env: PLATFORM=i686   UNICODE=1 CMAKE=1
+    - env: PLATFORM=i686   UNICODE=1 CMAKE=1 WINE_PACKAGE=winehq-stable:i386
       addons:
         apt:
           packages:
@@ -76,7 +69,6 @@ matrix:
             - mingw-w64-i686-dev
             - g++-mingw-w64-i686
             - gcc-mingw-w64-i686
-            - wine:i386
 
 language: cpp
 
@@ -87,6 +79,9 @@ cache:
   - ccache
 
 before_script:
+  - curl https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add -
+  - echo "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/winehq.list
+  - sudo apt-get -y update && sudo apt-get -y install --install-recommends $WINE_PACKAGE
   - if [ ! -z "$CMAKE" ]; then cmake -DPLATFORM=$PLATFORM -DUNICODE=$UNICODE -DTESTSUITE=ON -H. -B.; fi
 
 script: