More fixes to CI scripts

package/linux/travis-build-main.sh

@@ -31,10 +31,7 @@ tar -C$HOME/perl5/perlbrew/perls -xjf $CACHE/slic3r-perlbrew-5.24.tar.bz2
 tar -C$HOME -xjf $CACHE/boost-compiled.tar.bz2
 tar -C$HOME -xjf $CACHE/wx${WXVERSION}.tar.bz2
 
-export PERLBREW_SKIP_INIT=0
 source $HOME/perl5/perlbrew/etc/bashrc
 perlbrew switch slic3r-perl
 
-# CXX=g++-4.9 ?
-# CC=g++-4.9 ?
-SLIC3R_STATIC=1 CC=gcc-7 CXX=g++-7 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL
+SLIC3R_STATIC=1 CC=g++-4.9 CXX=g++-4.9 BOOST_DIR=$HOME/boost_1_63_0 perl ./Build.PL

package/osx/patch-wxwidgets.diff

@@ -17,7 +17,7 @@ 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)
+@@ -35,10 +35,6 @@
  #include "wx/osx/private.h"
  #endif
  
@@ -32,7 +32,7 @@ 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) {
+@@ -5841,9 +5841,9 @@
  }
  
  static bool Close(Point pt1, Point pt2) {

package/osx/travis-build-main.sh

@@ -10,6 +10,7 @@ perl ./Build.PL
 
 # Only recompile Wx if it's not already there
 if !(perl -MWx -e1 2> /dev/null); then
+    # our patch-wxwidgets.diff assumes Alien::wxWidgets installs wxWidgets 3.0.2
     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" \