From 766b2b532ca29c5eefa0095fcf7adccbea373a17 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 5 Sep 2019 10:16:57 +0200
Subject: [PATCH 1/2] Build new version of dependencies (with new compilation
 option).

---
 kiwixbuild/versions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index f84639f..77c032a 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -42,7 +42,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '53'
+base_deps_meta_version = '54'
 
 base_deps_versions = {
   'zlib' : '1.2.8',

From 3a8151d8417253365e255d0919fde7576f2da5d2 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 5 Sep 2019 13:46:47 +0200
Subject: [PATCH 2/2] Compile kiwix-tools for windows with a recent mingw.

---
 .travis.yml                      | 3 ++-
 travis/bionic_builder.dockerfile | 2 ++
 travis/xenial_builder.dockerfile | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b88f619..d5ce174 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,6 +70,7 @@ script:
   then
     VARIANT=xenial
     if [[ $DESKTOP_ONLY = 1 ]]; then VARIANT=bionic; fi
+    if [[ $PLATFORM =~ ^win32_* ]]; then VARIANT=bionic; fi
   fi
 - |
   if [[ $TRAVIS_OS_NAME = "linux" ]]
@@ -106,7 +107,7 @@ env:
   global:
     - NIGHTLY_DATE=$(date +%Y-%m-%d)
     - SSH_KEY=/tmp/private/travisci_builder_id_key
-    - DOCKER_VERSION=1
+    - DOCKER_VERSION=2
   matrix:
     - PLATFORM="flatpak" DESKTOP_ONLY=1
     - PLATFORM="native_dyn"
diff --git a/travis/bionic_builder.dockerfile b/travis/bionic_builder.dockerfile
index df2298c..daecbf2 100644
--- a/travis/bionic_builder.dockerfile
+++ b/travis/bionic_builder.dockerfile
@@ -17,6 +17,8 @@ RUN apt update -q && \
     libfuse2 fuse patchelf \
 # Flatpak tools
     elfutils flatpak flatpak-builder \
+# Cross win32 compiler
+    g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
 # Other tools (to remove)
 #    vim less grep \
   && \
diff --git a/travis/xenial_builder.dockerfile b/travis/xenial_builder.dockerfile
index e826542..3508ace 100644
--- a/travis/xenial_builder.dockerfile
+++ b/travis/xenial_builder.dockerfile
@@ -14,8 +14,6 @@ RUN apt update -q && \
 # Packaged dependencies
     libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
     libmicrohttpd-dev \
-# Cross win32 compiler
-    g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
 # Cross compile i586
     libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
 # Other tools (to remove)