commit 8cd69309c0aa115f9f2d2a70c450b444a1e5d8e0
Author: Jan Palus <[email protected]>
Date: Wed Aug 11 10:28:51 2021 +0200
fix build with gcc 11
gcc11.patch | 21 +++++++++++++++++++++
rstudio.spec | 2 ++
2 files changed, 23 insertions(+)
---
diff --git a/rstudio.spec b/rstudio.spec
index 1a0e078..afaa6b0 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -28,6 +28,7 @@ Patch1: %{name}-openssl.patch
Patch2: %{name}-boost.patch
Patch3: websocketpp-boost.patch
Patch4: boost1.75.patch
+Patch5: gcc11.patch
URL: http://rstudio.org/
BuildRequires: Qt5Core-devel >= 5.4.0
BuildRequires: Qt5DBus-devel >= 5.4.0
@@ -86,6 +87,7 @@ cd src/cpp/ext
%patch3 -p1
cd ../../..
%patch4 -p1
+%patch5 -p1
mkdir -p dependencies/common/dictionaries
unzip -qq %{SOURCE1} -d dependencies/common/dictionaries
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 0000000..4e60701
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,21 @@
+--- rstudio-1.1.143/src/cpp/core/RegexUtils.cpp.orig 2017-04-12
00:42:14.000000000 +0200
++++ rstudio-1.1.143/src/cpp/core/RegexUtils.cpp 2021-08-11
09:33:16.605646831 +0200
+@@ -15,6 +15,7 @@
+
+ #include <core/RegexUtils.hpp>
+
++#include <sstream>
+ #include <vector>
+
+ #include <boost/regex.hpp>
+--- rstudio-1.1.143/CMakeCompiler.txt.orig 2017-04-12 00:42:14.000000000
+0200
++++ rstudio-1.1.143/CMakeCompiler.txt 2021-08-11 09:45:50.402450033 +0200
+@@ -26,6 +26,8 @@
+
+ endif()
+
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++
+ # use Rtools on Windows (mainly for Qt Creator)
+ if(WIN32 AND NOT DEFINED RSTUDIO_PACKAGE_BUILD)
+ set(RTOOLS_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/windows/Rtools33")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rstudio.git/commitdiff/da1e9fa485c52ebe72f0e3293405b447cd0e8b69
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
