aboutsummaryrefslogtreecommitdiff
path: root/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp')
-rw-r--r--devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp19
1 files changed, 14 insertions, 5 deletions
diff --git a/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp b/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
index 137c909e382d..a6b0d11ee8bb 100644
--- a/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
+++ b/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
@@ -1,14 +1,23 @@
---- src/cpp/desktop/DesktopMain.cpp.orig 2018-05-16 18:21:36 UTC
+--- src/cpp/desktop/DesktopMain.cpp.orig 2019-02-16 02:00:24 UTC
+++ src/cpp/desktop/DesktopMain.cpp
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@
#include "DesktopProgressActivator.hpp"
#include "DesktopNetworkProxyFactory.hpp"
#include "DesktopActivationOverlay.hpp"
+#include "global-setenv.h"
- QProcess* pRSessionProcess;
- QString sharedSecret;
-@@ -262,6 +263,7 @@ bool useChromiumDevtools()
+ #ifdef _WIN32
+ #include <Windows.h>
+@@ -324,7 +325,7 @@ QString inferDefaultRenderingEngine()
+
+ #endif
+
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+
+ QString inferDefaultRenderingEngine()
+ {
+@@ -383,6 +384,7 @@ void initializeRenderingEngine(std::vect
int main(int argc, char* argv[])
{