From b8ff7c4f7d9fca5b0b9c41d6f9e27e9bb5fa5de2 Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Wed, 13 Dec 2017 23:35:00 +0100
Subject: [PATCH 1/4] Attempt to fix #4223 : "i586 build broken (reported by
 Marcin Bajor)"

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

diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index da2659a4f..cd054e7ab 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -47,7 +47,7 @@ ExifPanel::ExifPanel () : idata (nullptr)
     exifTree->set_model (exifTreeModel);
     exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE);
     exifTree->set_row_separator_func (
-    [&] (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator & row) {
+    [&] (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator & row)-> bool {
         return row->get_value (exifColumns.isSeparator);
     }
     );

From acd17ac51044688df1089c29596ea98c8009f19b Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Wed, 13 Dec 2017 16:40:50 -0800
Subject: [PATCH 2/4] MacOS: update macosx_bundle.sh

Copies libiomp5 and liblensfun.1 to Frameworks, and uses lensfun db 2.
---
 tools/osx/macosx_bundle.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index 8b9cbccb6..20a140ce5 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -156,7 +156,13 @@ ditto {"${GTK_PREFIX}","${RESOURCES}"}/share/icons/Adwaita/index.theme
 
 # Copy the Lensfun database into the app bundle
 mkdir -p "${RESOURCES}/share/lensfun"
-cp /opt/local/share/lensfun/version_1/* "${RESOURCES}/share/lensfun"
+cp /opt/local/share/lensfun/version_2/* "${RESOURCES}/share/lensfun"
+
+# Copy liblensfun to Frameworks
+cp /opt/local/lib/liblensfun.1.dylib "${RESOURCES}/../Frameworks"
+
+# Copy libiomp5 to Frameworks
+cp /opt/local/lib/libomp/libiomp5.dylib "${RESOURCES}/../Frameworks"
 
 # Copy the libiomp5 license into the app bundle
 cp "${PROJECT_SOURCE_DIR}/licenses/osx_libiomp5_LICENSE.txt" "${RESOURCES}"

From 566413957965696452223ac41ee86d5d3d1f44df Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Wed, 13 Dec 2017 18:23:21 -0800
Subject: [PATCH 3/4] include string header for colortemp.h

To fix mac clang compilation ````error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
    std::string method;````
---
 rtengine/colortemp.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h
index d96e6f5ce..145c8ed20 100644
--- a/rtengine/colortemp.h
+++ b/rtengine/colortemp.h
@@ -21,6 +21,7 @@
 
 #include <cmath>
 #include <map>
+#include <string>
 
 namespace rtengine
 {

From 1854147ce92ef7c0a9b56dff5024c3f4e331fd2c Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Thu, 14 Dec 2017 09:09:10 +0100
Subject: [PATCH 4/4] Change MINTEMP0 to 2000 in colorapperance to avoid crash

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

diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 7a31ae39f..c9fb1baa3 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -21,7 +21,7 @@
 #include "guiutils.h"
 #include "../rtengine/color.h"
 
-#define MINTEMP0 1500   //1200
+#define MINTEMP0 2000   //1200
 #define MAXTEMP0 12000  //12000
 #define CENTERTEMP0 5000
 #define MINGREEN0 0.8