From 33ab064b0d6050834766f00f3c940102d08a8789 Mon Sep 17 00:00:00 2001
From: Peter Petrik <zilolv@gmail.com>
Date: Thu, 13 Sep 2018 09:22:44 +0200
Subject: [PATCH] fix build on high sierra

---
 .gitignore            |  3 ++-
 .travis.yml           |  2 +-
 Formula/qgis3-dev.rb  |  6 +++---
 development/README.md | 15 ++++++++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 723ef36..090a1f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.idea
\ No newline at end of file
+.idea
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
index e82cdff..e0034dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 os: osx
 env: OSX=10.12
-osx_image: xcode8.1
+osx_image: xcode9.4
 rvm: system
 sudo: required
 
diff --git a/Formula/qgis3-dev.rb b/Formula/qgis3-dev.rb
index cf5b790..fa94fe3 100644
--- a/Formula/qgis3-dev.rb
+++ b/Formula/qgis3-dev.rb
@@ -35,7 +35,7 @@ class Qgis3Dev < Formula
   homepage "https://www.qgis.org"
 
   url "https://github.com/qgis/QGIS.git", :branch => "master"
-  version "2.99"
+  version "3.99"
 
   option "without-ninja", "Disable use of ninja CMake generator"
   option "without-debug", "Disable debug build, which outputs info to system.log or console"
@@ -66,7 +66,7 @@ class Qgis3Dev < Formula
     depends_on "doxygen"
   end
 
-  depends_on :python3
+  depends_on "python3"
 
   depends_on "qt" # keg_only
   depends_on "osgeo/osgeo4mac/qt5-webkit" => :recommended # keg_only
@@ -83,7 +83,7 @@ class Qgis3Dev < Formula
   depends_on "expat" # keg_only
   depends_on "proj"
   depends_on "spatialindex"
-  depends_on "homebrew/science/matplotlib"
+  depends_on "brewsci/bio/matplotlib"
   depends_on "fcgi" if build.with? "server"
   # use newer postgresql client than Apple's, also needed by `psycopg2`
   depends_on "postgresql" => :recommended
diff --git a/development/README.md b/development/README.md
index 4477ee2..0759fa1 100644
--- a/development/README.md
+++ b/development/README.md
@@ -53,6 +53,13 @@ brew install bash-completion
 brew install git
 ```
 
+You need to update `~/.bash_profile` to get homebrew's bash-completion working:
+```
+if [ -f $(brew --prefix)/etc/bash_completion ]; then
+    . $(brew --prefix)/etc/bash_completion
+fi
+```
+
 ## Python Dependencies
 
 ### Select an interpreter
@@ -196,8 +203,6 @@ pip3 install future numpy psycopg2 matplotlib pyparsing requests pyyaml mock nos
 
 # Add some useful Homebrew taps
 # NOTE: try to avoid tapping homebrew/boneyard
-brew tap homebrew/science
-brew tap homebrew/python
 brew tap qgis/qgisdev
 brew tap osgeo/osgeo4mac
 
@@ -405,7 +410,7 @@ Under ``Kits`` tab, click ``Add``, then configure with:
   QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}
   CMAKE_BUILD_TYPE:STRING=RelWithDebInfo
   CMAKE_FIND_FRAMEWORK:STRING=LAST 
-  CMAKE_PREFIX_PATH:STRING='/usr/local/opt/qt5;/usr/local/opt/qt5-webkit;/usr/local/opt/qscintilla2;/usr/local/opt/qwt;/usr/local/opt/qwtpolar;/usr/local/opt/qca;/usr/local/opt/gdal2;/usr/local/opt/gsl;/usr/local/opt/geos;/usr/local/opt/proj;/usr/local/opt/libspatialite;/usr/local/opt/spatialindex;/usr/local/opt/fcgi;/usr/local/opt/expat;/usr/local/opt/sqlite;/usr/local/opt/flex;/usr/local/opt/bison'
+  CMAKE_PREFIX_PATH:STRING='/usr/local/opt/qt5;/usr/local/opt/qt5-webkit;/usr/local/opt/qscintilla2;/usr/local/opt/qwt;/usr/local/opt/qwtpolar;/usr/local/opt/qca;/usr/local/opt/gdal2;/usr/local/opt/gsl;/usr/local/opt/geos;/usr/local/opt/proj;/usr/local/opt/libspatialite;/usr/local/opt/spatialindex;/usr/local/opt/fcgi;/usr/local/opt/expat;/usr/local/opt/sqlite;/usr/local/opt/flex;/usr/local/opt/bison;/usr/local/opt/libzip;/usr/local/opt/libtash1'
   ```
   
   **Notes:**
@@ -507,7 +512,7 @@ If using `osgeo/osgeo4mac/grass7`:
 
 ```
 WITH_GRASS7=TRUE                                  (Add as Boolean)
-GRASS_PREFIX7=/usr/local/opt/grass7/grass-base"   (Add as Directory)
+GRASS_PREFIX7=/usr/local/opt/grass7/grass-base   (Add as Directory)
 ```
 
 #### Fix some CMake module search results
@@ -563,7 +568,7 @@ Alternatively, add the gdal2 packages to your environment directly in QGIS like
 
 * Import QGIS code style rules
   * Under `Preferences -> C++`, click `Import`
-  * Import `qtcreator_code_style.xml` from `QGIS/doc` folder in QGIS source tree
+  * Import `qtcreator_code_style.xml` from `QGIS/editors/QtCreator` folder in QGIS source tree
   * A "QGIS" code style is imported, which you can assign as the code style for your loaded project (or import just for your project, under `Project Settings` for your project in the `Projects` section of the main window)
 
 ### Useful Qt Creator shortcuts