From 70c057ed8ad00eca63ac45f9a33b8f3f8e913553 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Nov 2017 16:58:33 +0100
Subject: [PATCH 1/3] Revert "Test using previous build platform for AppVeyor"

This reverts commit b05d864f5e623379512d0c42039461457d28ea7d as it
didn't help with Python-related build failures, finally.
---
 appveyor.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 6dd6f00bc0..c593022a88 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,5 @@
 version: '{build}'
 
-os: Previous Visual Studio 2015
-
 branches:
   only:
   - master

From 69d3c2bf50e126164d2b21fe9aa424fbf964b302 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Nov 2017 17:00:25 +0100
Subject: [PATCH 2/3] Use -g (--upgrade-also) switch with Cygwin setup on
 AppVeyor

This is necessary to properly upgrade the package dependencies when
installing the new versions of the packages themselves and fixes the
problem with the new Python 2.7.14 failing to run since its package was
updated from 2.7.13.
---
 build/tools/appveyor.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index 2f81bd1be1..4d66deebe6 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -36,7 +36,7 @@ bash -lc "CXXFLAGS=-Wno-deprecated-declarations ./configure --disable-optimise &
 goto :eof
 
 :cygwin
-C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
+C:\cygwin\setup-x86.exe -qgnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel
 path c:\cygwin\bin;%path%
 set CHERE_INVOKING=yes
 :: Workaround for "configure: Bad file descriptor"

From 2e9e38aba151bede8487f90c410dac7253bf9522 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 3 Nov 2017 17:34:51 +0100
Subject: [PATCH 3/3] Revert "Work around using Python in Cygwin AppVeyor
 build"

This reverts commit 257974e3214f5869af04a39b0b1e2e226e72b67c as it
shouldn't be needed any more after the last commit.
---
 build/tools/appveyor.bat | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index 4d66deebe6..d703d23e0f 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -41,9 +41,6 @@ path c:\cygwin\bin;%path%
 set CHERE_INVOKING=yes
 :: Workaround for "configure: Bad file descriptor"
 perl -i".bak" -pe "s/^test -n \".DJDIR\"/#$&/" configure
-:: Workaround for currently broken Python under Cygwin: don't use it for
-:: running gen_iface.py.
-touch include/wx/stc/stc.h
 bash -lc "g++ --version"
 bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3"
 goto :eof