From b27c78916e5a432b7485537bf300cbce1d9849fb Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Mon, 17 Feb 2020 14:30:46 -0800
Subject: [PATCH 1/5] mac:travis adjustment

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bab7397a6..45c877559 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         CMAKE_CXX_STANDARD: 11
         PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
         RAW_THERAPEE_MAJOR: '5'
-        RAW_THERAPEE_MINOR: '7'
+        RAW_THERAPEE_MINOR: '8'
         C_FLAGS: -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include
       run: |
         # GITHUB_REF is the ref that triggered the build, like refs/heads/new-feature - the next line parses that to REF: the branch name only (new-feature)
@@ -54,6 +54,7 @@ jobs:
           -DOpenMP_CXX_FLAGS="${C_FLAGS}" \
           -DCMAKE_AR="/usr/local/opt/llvm/bin/llvm-ar" \
           -DCMAKE_RANLIB="/usr/local/opt/llvm/bin/llvm-ranlib" \
+          -DCMAKE_OSX_DEPLOYMENT_TARGET="10.11"
           ..
         make --jobs
         make install

From 9047e89bd3b461d4c4f3593dbba382ed7523ce2d Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Mon, 17 Feb 2020 14:55:01 -0800
Subject: [PATCH 2/5] options.cc: remove a whitespace

---
 rtgui/options.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index d85317c9d..71e77fa70 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2334,7 +2334,7 @@ void Options::load(bool lightweight)
 #endif
     if (path != nullptr) {
         cacheBaseDir = Glib::ustring(path);
-        
+
         if (!Glib::path_is_absolute(cacheBaseDir)) {
             Glib::ustring msg = Glib::ustring::compose("Cache base dir %1 is not absolute", cacheBaseDir);
             throw Error(msg);

From 6bc7e16d9b473302ba6236d1149f0072a52f1496 Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Mon, 17 Feb 2020 15:26:41 -0800
Subject: [PATCH 3/5] remove another whitespace

---
 rtgui/options.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index 71e77fa70..b0f8d714e 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2291,7 +2291,6 @@ void Options::load(bool lightweight)
         }
     } else {
 
-        
 #ifdef WIN32
         WCHAR pathW[MAX_PATH] = {0};
 

From 007fe17e48d2dab6849968e012b04c8f20ef408c Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Mon, 17 Feb 2020 15:27:59 -0800
Subject: [PATCH 4/5] another whitespace removed

---
 rtgui/options.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index b0f8d714e..5e9d48cc5 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2340,7 +2340,6 @@ void Options::load(bool lightweight)
         }
     }
 
-    
     // No environment variable provided, so falling back to the multi user mode, if enabled
     else if (options.multiUser) {
 #ifdef WIN32

From 85bffa10381450bee541283616e3572665f12314 Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Mon, 17 Feb 2020 15:35:31 -0800
Subject: [PATCH 5/5] mac: use the LIB var to refer to frameworks dir.

---
 tools/osx/macosx_bundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index be76face3..aa6228500 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -254,7 +254,7 @@ ModifyInstallNames
 
 # fix @rpath in Frameworks
 msg "Registering @rpath in Frameworks folder:"
-for frameworklibs in "${CONTENTS}"/Frameworks/* ; do
+for frameworklibs in "${LIB}"/* ; do
 echo "   install_name_tool -delete_rpath ${LOCAL_PREFIX}/local/lib '${frameworklibs}'" | bash -v
 echo "   install_name_tool -add_rpath /Applications/RawTherapee.app/Contents/Frameworks '${frameworklibs}'" | bash -v
 done