From 600960a6d0a642220dcaa7f72ec469622e42e6d7 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 18:13:32 +0530
Subject: [PATCH 1/7] CI: Add OSX

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1c27318..629017d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: cpp
 
+os:
+  - linux
+  - osx
+
 compiler:
   - gcc
   - clang

From 54e7e8c03ded2a86f9cff2bfd276d70057084d95 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:06:28 +0530
Subject: [PATCH 2/7] CI: Add OSX dependencies

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 629017d..1fb3fdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: cpp
 
 os:
-  - linux
   - osx
 
 compiler:
   - gcc
   - clang
 
+before_install:
+  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
+
 addons:
   apt:
     packages:

From 8a8242fbda3f8deefcc6edc0a354bfb6ee8f3aa2 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:22:06 +0530
Subject: [PATCH 3/7] CI: Fix BSD/OSX compilation by adding missing #include

---
 server/bsdport.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/bsdport.cpp b/server/bsdport.cpp
index 4ac9ab7..ec75bb3 100644
--- a/server/bsdport.cpp
+++ b/server/bsdport.cpp
@@ -34,6 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/route.h>
+#include <unistd.h>
 
 #ifdef Q_OS_MAC
 #define ifr_flagshigh ifr_flags

From f58372b348a1aa59a1f9c809e05b6160947b2f73 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:37:12 +0530
Subject: [PATCH 4/7] CI: Use the 'real' gcc on OSX; restore linux which was
 removed earlier temporarily

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1fb3fdd..a52e022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: cpp
 
 os:
+  - linux
   - osx
 
 compiler:
@@ -8,6 +9,7 @@ compiler:
   - clang
 
 before_install:
+  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8; fi"
   - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
 
 addons:

From b027156384c266d5d3a023f54d7d9af999fb3787 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 20:29:53 +0530
Subject: [PATCH 5/7] CI: Change $CXX also for gcc-4.8 on OSX

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a52e022..9b1f0a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,9 @@ compiler:
   - clang
 
 before_install:
-  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8; fi"
+  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8 && export CXX=gcc-4.8; fi"
   - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
+  - echo $CC; echo $CXX
 
 addons:
   apt:

From 6fbfc4b375fc8015d183fcd57409e886739158cd Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 21:21:56 +0530
Subject: [PATCH 6/7] CI: Another try for OSX/gcc; added build notification
 email

---
 .travis.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9b1f0a2..f7c8319 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,9 @@ compiler:
   - clang
 
 before_install:
-  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8 && export CXX=gcc-4.8; fi"
-  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
+  - export QTCC=""
+  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8 && export CXX=g++-4.8 && export QTCC=--cc=gcc-4.8; fi"
+  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt $QTCC && brew install protobuf; fi"
   - echo $CC; echo $CXX
 
 addons:
@@ -26,3 +27,8 @@ script:
   - qmake
   - make
 
+
+notifications:
+  email:
+    - secure: "LUIBAz/phzOdxlnFuoC6hfNfl3HAGYTkacVfLu0GsrOgNBhqPqsRszhdFuX/kEdGb18GIcqCQn4tLfFVD9YyjZKFCTjjfTEaUlbHYrear4VU6HihBvhu4I+F8nffJ9y77kyZhUfC9RdgTwWEVdwYMi3rjIK8UggPVV1s/FyE2t+UAjmzdGPAb6uxu9znYpldKtY9FosqccPe7tB5uLLcdbX6ojvsOH7lyQPLclFFS7F2yM9nNNxnRwl1v4KlN6vYwBF2scKB8altEMEGnLJKB41S6piVWyQlXc8FotGJf4fg/6lwmKWBzT/aIw8UH8cxJW2q3sHmdcf/nBhSKojLN5HNIQOJ45Xfw0MKQy2uXGHG15DzYRKjsw6zdb7oVJJCVDiwh1wDvfExgJwpIZJuNsMaGEbSo/TxN+6iPaCf2iyFaCW/KkBt5gmcgck2dA0Xc8qd0z3Zjii7cvuM8awrsmtE7UuX7M/lV9M8w5EaYjhr0R2NwgqvRa0hQv+1Ycec/1eVVfMCMFWNsxmVSkQFFbFP2db195axMzeU13G8RIbPY3JsIUEGw1ykj4nXiH77CLYRfZuKvomjhBkzE+P+EyIxRMH65M4zO9lO7SW01hrHty60jKajt5ljPI5AfuKAFHQvoLOwEMwLwbtEy/ggI/SRAXjsKJbueTHaI4719Gg="
+

From 851278a41f58985476a67971d48fffef9e1c557c Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 5 Dec 2015 21:33:56 +0530
Subject: [PATCH 7/7] CI: no luck with OSX/gcc - so excluding this combo for
 now

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7c8319..efefcb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,13 @@ compiler:
   - gcc
   - clang
 
+matrix:
+  exclude:
+    - os: osx
+      compiler: gcc
+
 before_install:
-  - export QTCC=""
-  - "if [ $TRAVIS_OS_NAME = 'osx' ] && [ $CC = 'gcc' ]; then export CC=gcc-4.8 && export CXX=g++-4.8 && export QTCC=--cc=gcc-4.8; fi"
-  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt $QTCC && brew install protobuf; fi"
-  - echo $CC; echo $CXX
+  - "if [ $TRAVIS_OS_NAME = 'osx' ]; then brew update && brew install qt && brew install protobuf; fi"
 
 addons:
   apt:
@@ -27,7 +29,6 @@ script:
   - qmake
   - make
 
-
 notifications:
   email:
     - secure: "LUIBAz/phzOdxlnFuoC6hfNfl3HAGYTkacVfLu0GsrOgNBhqPqsRszhdFuX/kEdGb18GIcqCQn4tLfFVD9YyjZKFCTjjfTEaUlbHYrear4VU6HihBvhu4I+F8nffJ9y77kyZhUfC9RdgTwWEVdwYMi3rjIK8UggPVV1s/FyE2t+UAjmzdGPAb6uxu9znYpldKtY9FosqccPe7tB5uLLcdbX6ojvsOH7lyQPLclFFS7F2yM9nNNxnRwl1v4KlN6vYwBF2scKB8altEMEGnLJKB41S6piVWyQlXc8FotGJf4fg/6lwmKWBzT/aIw8UH8cxJW2q3sHmdcf/nBhSKojLN5HNIQOJ45Xfw0MKQy2uXGHG15DzYRKjsw6zdb7oVJJCVDiwh1wDvfExgJwpIZJuNsMaGEbSo/TxN+6iPaCf2iyFaCW/KkBt5gmcgck2dA0Xc8qd0z3Zjii7cvuM8awrsmtE7UuX7M/lV9M8w5EaYjhr0R2NwgqvRa0hQv+1Ycec/1eVVfMCMFWNsxmVSkQFFbFP2db195axMzeU13G8RIbPY3JsIUEGw1ykj4nXiH77CLYRfZuKvomjhBkzE+P+EyIxRMH65M4zO9lO7SW01hrHty60jKajt5ljPI5AfuKAFHQvoLOwEMwLwbtEy/ggI/SRAXjsKJbueTHaI4719Gg="