More fixes for CI

package/linux/travis-build-main.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-set -euo pipefail
+
+# This is too strict for source $HOME/perl5/perlbrew/etc/bashrc:
+### set -euo pipefail
 
 mkdir -p $CACHE
 

package/osx/patch-wxwidgets.diff

@@ -0,0 +1,46 @@
+diff --git src/osx/carbon/dataobj.cpp src/osx/carbon/dataobj.cpp
+index 758e3a7928..5445aa6b14 100644
+--- src/osx/carbon/dataobj.cpp
++++ src/osx/carbon/dataobj.cpp
+@@ -29,10 +29,6 @@
+ 
+ #include "wx/osx/private.h"
+ 
+-#if wxOSX_USE_COCOA_OR_CARBON
+-    #include <QuickTime/QuickTime.h>
+-#endif
+-
+ // ----------------------------------------------------------------------------
+ // wxDataFormat
+ // ----------------------------------------------------------------------------
+diff --git src/osx/core/bitmap.cpp src/osx/core/bitmap.cpp
+index 3c61c173e7..3322b605fc 100644
+--- src/osx/core/bitmap.cpp
++++ src/osx/core/bitmap.cpp
+@@ -35,10 +35,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
+ #include "wx/osx/private.h"
+ #endif
+ 
+-#ifndef __WXOSX_IPHONE__
+-#include <QuickTime/QuickTime.h>
+-#endif
+-
+ CGColorSpaceRef wxMacGetGenericRGBColorSpace();
+ CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
+ 
+diff --git src/stc/scintilla/src/Editor.cxx src/stc/scintilla/src/Editor.cxx
+index cd72953ae7..a3ee41c49b 100644
+--- src/stc/scintilla/src/Editor.cxx
++++ src/stc/scintilla/src/Editor.cxx
+@@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-	if (abs(pt1.x - pt2.x) > 3)
++	if (labs(pt1.x - pt2.x) > 3)
+ 		return false;
+-	if (abs(pt1.y - pt2.y) > 3)
++	if (labs(pt1.y - pt2.y) > 3)
+ 		return false;
+ 	return true;
+ }

package/osx/travis-build-main.sh

@@ -8,17 +8,16 @@ export SLIC3R_STATIC=1
 export BOOST_DIR=/usr/local
 perl ./Build.PL
 
-# Install GUI modules and wxWidgets:
+# Only recompile Wx if it's not already there
+if !(perl -MWx -e1 2> /dev/null); then
+    PERL_USE_UNSAFE_INC=1 \
+        CXX="clang++ -mmacosx-version-min=10.12" \
+        CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \
+        LDFLAGS="-mmacosx-version-min=10.12" \
+        cpanm --local-lib local-lib Alien::wxWidgets -v --reinstall \
+            --configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/package/osx/patch-wxwidgets.diff"
 
-curl -O https://gist.githubusercontent.com/alranel/c2de82c05f6006b49c5029fc78bcaa87/raw/778dec2692408334ef2b87818bf977ac6f9fd8ee/patch-wxwidgets-noquicktime.diff
+    PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master
-
+fi
-PERL_USE_UNSAFE_INC=1 \
-    CXX="clang++ -mmacosx-version-min=10.12" \
-    CPPFLAGS="-mmacosx-version-min=10.12 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1" \
-    LDFLAGS="-mmacosx-version-min=10.12" \
-    cpanm --local-lib local-lib Alien::wxWidgets -v --reinstall \
-        --configure-args="--wxWidgets-build=1 --wxWidgets-extraflags=\"--with-macosx-version-min=10.12 --disable-qtkit --disable-mediactrl --disable-webkit --disable-webview\" --wxWidgets-userpatch=$(pwd)/patch-wxwidgets-noquicktime.diff"
-
-PERL_USE_UNSAFE_INC=1 cpanm --local-lib local-lib --reinstall -v https://github.com/alranel/wxPerl-osx10.12/tarball/master
 
 perl ./Build.PL --gui