From 9f2c20cd66b72f092fae88563231fe043705697c Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 13 Oct 2018 21:54:45 +1100
Subject: [PATCH] Updated travis osx_image to 9.4

---
 .travis.yml |  3 ++-
 config.sh   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b6a8d532f..a90308e8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
       - UNICODE_WIDTH=32
       - BUILD_DEPENDS=""
       - TEST_DEPENDS="pytest pytest-cov numpy scipy"
+      - MACOSX_DEPLOYMENT_TARGET=10.10
       - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
       # Following generated with
       # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
@@ -17,7 +18,7 @@ python: 3.5
 sudo: required
 dist: trusty
 services: docker
-osx_image: xcode6.4
+osx_image: xcode9.4
 
 matrix:
   exclude:
diff --git a/config.sh b/config.sh
index c3106c8b9..e14ed3f8d 100644
--- a/config.sh
+++ b/config.sh
@@ -34,7 +34,19 @@ function pre_build {
         install_name_tool -id $BUILD_PREFIX/lib/libopenjp2.7.dylib $BUILD_PREFIX/lib/libopenjp2.2.1.0.dylib
     fi
     build_lcms2
+
+    if [ -n "$IS_OSX" ]; then
+        # Custom flags to allow building on OS X 10.10 and 10.11
+        build_giflib
+        
+        ORIGINAL_CPPFLAGS=$CPPFLAGS
+        CPPFLAGS=""
+    fi
     build_libwebp
+    if [ -n "$IS_OSX" ]; then
+        CPPFLAGS=$ORIGINAL_CPPFLAGS
+    fi
+
     if [ -n "$IS_OSX" ]; then
         # Custom freetype build
         build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no