From f45a70d1e87cee78fdb9072699425925d21e587e Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 20 Apr 2019 16:55:26 -0700
Subject: [PATCH] travis: Avoid more duplication.

---
 .travis.yml | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b3521f1cb..ecdbf32887 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,46 +4,22 @@ language: generic
 matrix:
   include:
     - compiler: mingw-x86
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - mingw-w64-i686-dev
+      addons: true
       env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x86
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - mingw-w64-i686-dev
+      addons: true
       env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x86
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-i686
-            - mingw-w64-i686-dev
+      addons: true
       env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
+      addons: true
       env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
+      addons: true
       env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: mingw-x64
-      addons:
-        apt:
-          packages:
-            - g++-mingw-w64-x86-64
-            - mingw-w64-x86-64-dev
+      addons: true
       env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
     - compiler: gcc
       env: CC=gcc-8 CXX=g++-8
@@ -82,6 +58,12 @@ before_install:
        # Install a more recent clang than the default
        sudo apt-get install -y libstdc++-7-dev
        sudo apt-get install -y clang-6.0
+     elif [ "$CROSS_COMPILE" = i686-w64-mingw32- ]; then
+       sudo apt-get install -y g++-mingw-w64-i686
+       sudo apt-get install -y mingw-w64-i686-dev
+     elif [ "$CROSS_COMPILE" = x86_64-w64-mingw32- ]; then
+       sudo apt-get install -y g++-mingw-w64-x86-64
+       sudo apt-get install -y mingw-w64-x86-64-dev
      fi
 
 script: