From d8d96784a492d446ff714d06c1049aea80361ab9 Mon Sep 17 00:00:00 2001
From: Richard Barber <kd6kxr@gmail.com>
Date: Sun, 16 Feb 2020 20:21:07 -0800
Subject: [PATCH] mac: set config path in options.cc

---
 rtgui/options.cc           | 6 +++++-
 tools/osx/Info.plist.in    | 8 ++++----
 tools/osx/macosx_bundle.sh | 1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index dcb16e1ea..fe19bf42e 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2270,8 +2270,12 @@ void Options::load(bool lightweight)
     const gchar* path;
     Glib::ustring dPath;
 
+#ifdef __APPLE__
+    path = g_getenv("HOME") + "Library/Application Support/RawTherapee/config";
+#else
     path = g_getenv("RT_SETTINGS");
-
+#endif
+    
     if (path != nullptr) {
         rtdir = Glib::ustring(path);
 
diff --git a/tools/osx/Info.plist.in b/tools/osx/Info.plist.in
index 8e68a165f..cc445c1b0 100644
--- a/tools/osx/Info.plist.in
+++ b/tools/osx/Info.plist.in
@@ -30,13 +30,13 @@
             <string>similar</string>
             <key>GTK_OVERLAY_SCROLLING</key>
             <string>0</string>
-            <key>RT_SETTINGS</key>
-            <string>~/Library/Application Support/RawTherapee/config</string>
-            <key>RT_CACHE</key>
-            <string>~/Library/Application Support/RawTherapee/cache</string>
         </dict>
         <key>ATSApplicationFontsPath</key>
         <string>etc/fonts</string>
+        <key>LSMultipleInstancesProhibited</key>
+        <true/>
+        <key>LSMinimumSystemVersion</key>
+        <string>@minimum_macos_version@</string>
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleDisplayName</key>
diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 35b80a44c..81746ba4b 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -104,6 +104,7 @@ GTK_PREFIX:             ${GTK_PREFIX}
 PWD:                    ${PWD}
 __EOS__
 
+minimum_macos_version=${MINIMUM_SYSTEM_VERSION}
 LOCAL_PREFIX="$(cmake .. -LA -N | grep "LOCAL_PREFIX" | cut -d "=" -f2)"
 EXPATLIB="$(cmake .. -LA -N | grep "pkgcfg_lib_EXPAT_expat" | cut -d "=" -f2)"