Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2020-09-02 15:56:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Wed Sep 2 15:56:08 2020 rev:13 rq:831471 version:1.3.1073 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2020-08-29 20:38:29.641368024 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.3399/rstudio.changes 2020-09-02 15:56:10.079473515 +0200 @@ -1,0 +2,14 @@ +Wed Sep 2 10:36:02 UTC 2020 - Dan Čermák <[email protected]> + +- Add patches to support boost >= 1.73 + + Add patches: + * 0004-add-support-for-boost-1.73.patch + * 0005-Add-additional-includes-for-aarch64.patch + + Rebase patches: + * 0001-Unbundle-mathjax-and-pandoc.patch + * 0002-Don-t-install-pandoc-and-mathjax.patch + * 0003-Fix-rstudio-exec-path.patch + +------------------------------------------------------------------- New: ---- 0004-add-support-for-boost-1.73.patch 0005-Add-additional-includes-for-aarch64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.Jg5OOQ/_old 2020-09-02 15:56:11.215473968 +0200 +++ /var/tmp/diff_new_pack.Jg5OOQ/_new 2020-09-02 15:56:11.219473970 +0200 @@ -120,6 +120,9 @@ # shorten the installation time a bit by not installing mathjax Patch1: 0002-Don-t-install-pandoc-and-mathjax.patch Patch2: 0003-Fix-rstudio-exec-path.patch +# https://github.com/rstudio/rstudio/pull/7011 +Patch3: 0004-add-support-for-boost-1.73.patch +Patch4: 0005-Add-additional-includes-for-aarch64.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel ++++++ 0001-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.Jg5OOQ/_old 2020-09-02 15:56:11.243473979 +0200 +++ /var/tmp/diff_new_pack.Jg5OOQ/_new 2020-09-02 15:56:11.243473979 +0200 @@ -1,7 +1,7 @@ From 04766193f0582261cb2cb849e3be0caea7d7a88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 11:27:06 +0100 -Subject: [PATCH 1/3] Unbundle mathjax and pandoc +Subject: [PATCH 1/5] Unbundle mathjax and pandoc Use find_file() & find_program() functions to find the dependencies in the dependencies/ subdirectory first. If they are not there, use the system paths ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.Jg5OOQ/_old 2020-09-02 15:56:11.259473985 +0200 +++ /var/tmp/diff_new_pack.Jg5OOQ/_new 2020-09-02 15:56:11.259473985 +0200 @@ -1,7 +1,7 @@ From df0ce1039f881c35bdc78ce91d1944be5384b593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Tue, 14 Jan 2020 14:20:40 +0100 -Subject: [PATCH 2/3] Don't install pandoc and mathjax +Subject: [PATCH 2/5] Don't install pandoc and mathjax Because we use the system wide version, there's no need to waste time installing the files. ++++++ 0003-Fix-rstudio-exec-path.patch ++++++ --- /var/tmp/diff_new_pack.Jg5OOQ/_old 2020-09-02 15:56:11.271473990 +0200 +++ /var/tmp/diff_new_pack.Jg5OOQ/_new 2020-09-02 15:56:11.271473990 +0200 @@ -1,7 +1,7 @@ From 173105fc0f0df38596135a2e3522ee0359bde603 Mon Sep 17 00:00:00 2001 From: Marco Varlese <[email protected]> Date: Mon, 27 Jan 2020 14:29:40 +0100 -Subject: [PATCH 3/3] Fix rstudio exec path +Subject: [PATCH 3/5] Fix rstudio exec path Fix the path to the rstudio executable in the rstudio.desktop file. --- ++++++ 0004-add-support-for-boost-1.73.patch ++++++ >From eccc7e7627caf33c4226d987d8ff9c7494646cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <[email protected]> Date: Sat, 30 May 2020 16:34:46 +0200 Subject: [PATCH 4/5] add support for boost 1.73 * enable BOOST_BIND_GLOBAL_PLACEHOLDERS to retain placeholders in the global namespace * add some missing includes of <boost/bind.hpp> (cherry picked from commit 9b9a200712cfd334ec87256f75876b91b41242a8) --- src/cpp/CMakeLists.txt | 1 + src/cpp/core/system/PosixChildProcessTracker.cpp | 1 + src/cpp/core/system/PosixOutputCapture.cpp | 2 ++ src/cpp/core/system/PosixSystem.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index af791506eb..d049524dbc 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -28,6 +28,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeGlobals.txt") # global directives add_definitions(-DBOOST_ENABLE_ASSERT_HANDLER) +add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) # explicitly do not use new c++ 11 features for websocketpp # they currently do not work with our source diff --git a/src/cpp/core/system/PosixChildProcessTracker.cpp b/src/cpp/core/system/PosixChildProcessTracker.cpp index 2ee1a81dcc..976da4f6f9 100644 --- a/src/cpp/core/system/PosixChildProcessTracker.cpp +++ b/src/cpp/core/system/PosixChildProcessTracker.cpp @@ -18,6 +18,7 @@ #include <sys/wait.h> #include <boost/format.hpp> +#include <boost/bind.hpp> namespace rstudio { namespace core { diff --git a/src/cpp/core/system/PosixOutputCapture.cpp b/src/cpp/core/system/PosixOutputCapture.cpp index 762cc415e8..4c76915b82 100644 --- a/src/cpp/core/system/PosixOutputCapture.cpp +++ b/src/cpp/core/system/PosixOutputCapture.cpp @@ -28,6 +28,8 @@ #include <core/system/System.hpp> +#include <boost/bind.hpp> + namespace rstudio { namespace core { namespace system { diff --git a/src/cpp/core/system/PosixSystem.cpp b/src/cpp/core/system/PosixSystem.cpp index c25cb32875..8dae263288 100644 --- a/src/cpp/core/system/PosixSystem.cpp +++ b/src/cpp/core/system/PosixSystem.cpp @@ -23,6 +23,7 @@ #include <boost/algorithm/string.hpp> #include <boost/range/as_array.hpp> +#include <boost/bind.hpp> #include <signal.h> #include <fcntl.h> -- 2.28.0 ++++++ 0005-Add-additional-includes-for-aarch64.patch ++++++ >From f2f23822915d220b425e779f226206b9f1f9f780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 2 Sep 2020 13:47:59 +0200 Subject: [PATCH 5/5] Add additional includes for aarch64 --- src/cpp/core/HtmlUtils.cpp | 1 + src/cpp/core/file_lock/FileLock.cpp | 1 + src/cpp/r/session/RStdCallbacks.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/cpp/core/HtmlUtils.cpp b/src/cpp/core/HtmlUtils.cpp index 3581791c07..270656e4a5 100644 --- a/src/cpp/core/HtmlUtils.cpp +++ b/src/cpp/core/HtmlUtils.cpp @@ -18,6 +18,7 @@ #include <core/system/System.hpp> #include <boost/format.hpp> +#include <boost/bind.hpp> #include <boost/algorithm/string/predicate.hpp> #include <core/Base64.hpp> diff --git a/src/cpp/core/file_lock/FileLock.cpp b/src/cpp/core/file_lock/FileLock.cpp index 26de666b08..c19ad82bf7 100644 --- a/src/cpp/core/file_lock/FileLock.cpp +++ b/src/cpp/core/file_lock/FileLock.cpp @@ -26,6 +26,7 @@ #include <core/system/Environment.hpp> #include <boost/algorithm/string.hpp> +#include <boost/bind.hpp> // borrowed from SessionConstants.hpp #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE" diff --git a/src/cpp/r/session/RStdCallbacks.cpp b/src/cpp/r/session/RStdCallbacks.cpp index ef4aba238c..286445cc4f 100644 --- a/src/cpp/r/session/RStdCallbacks.cpp +++ b/src/cpp/r/session/RStdCallbacks.cpp @@ -17,6 +17,7 @@ #include <gsl/gsl> +#include <boost/bind.hpp> #include <boost/function.hpp> #include <boost/regex.hpp> -- 2.28.0
