[rkward/releases/0.6.4] /: Fix package installation problem on Mac

[Thomas Friedrichsmeier]

Git commit fd63a6d0d512f9fc1308690db326d6a9848f5b3d by Thomas Friedrichsmeier.
Committed on 14/01/2016 at 15:30.
Pushed by tfry into branch 'releases/0.6.4'.

Fix package installation problem on Mac

M  +2    -0    ChangeLog
M  +1    -0    rkward/settings/rksettingsmoduler.cpp

http://commits.kde.org/rkward/fd63a6d0d512f9fc1308690db326d6a9848f5b3d

diff --git a/ChangeLog b/ChangeLog
index 4f50aac..a9edc32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+- Use package type option "binary" from R 3.1.3 onwards, for automatic selection of the appropriate binary package
+
 --- Version 0.6.4 - Dec-20-2015
 - Fixed: Plugin variable slots taking more than one object would not be hightlighted in red while invalid
 - Plugins check for correct object type, in more places, but allow to proceed with questionable object selections
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index e4ecdca..4ffbcec 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -496,6 +496,7 @@ QString RKSettingsModuleRPackages::pkgTypeOption () {
 #if defined Q_WS_WIN || defined Q_WS_MAC
 	ret.append ("options (pkgType=\"");
 	if (source_packages) ret.append ("source");
+	else if (RKSessionVars::compareRVersion ("3.1.3") <= 0) ret.append ("binary");   // "automatically select appropriate binary", unfortunately it's only available from R 3.1.3. onwards.
 #	if defined Q_WS_WIN
 	else ret.append ("win.binary");
 #	else