Hello community, here is the log from the commit of package rstudio for openSUSE:Leap:15.2 checked in at 2020-06-17 11:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/rstudio (Old) and /work/SRC/openSUSE:Leap:15.2/.rstudio.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Wed Jun 17 11:37:30 2020 rev:3 rq:814705 version:1.2.5042 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/rstudio/rstudio.changes 2020-03-15 07:11:45.120977387 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.rstudio.new.3606/rstudio.changes 2020-06-17 11:38:07.568169450 +0200 @@ -1,0 +2,26 @@ +Mon Jun 15 10:35:14 UTC 2020 - Dan Čermák <[email protected]> + +- Fix wrong unbundling of pandoc (boo#1172426) + +------------------------------------------------------------------- +Wed Apr 29 12:27:11 UTC 2020 - Dan Čermák <[email protected]> + +- New upstream release 1.2.5042 + + Rebase patches: + * 0001-First-pass-at-Boost-1.70-support.patch + * 0002-Bump-bundled-gwt-version.patch + * 0003-Remove-boost-signals-from-the-required-Boost-librari.patch + * 0004-Unbundle-mathjax-and-pandoc.patch + * 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch + * 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch + * 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch + * 0008-Don-t-install-pandoc-and-mathjax.patch + * 0009-Fix-rstudio-exec-path.patch + * 0010-fix-STL-access-undefined-behaviour.patch + + Add patch: + * 0011-R_Slave-R_NoEcho-for-non-Windows.patch + (fixes FTBFS with newest version of R) + +------------------------------------------------------------------- Old: ---- v1.2.5033.tar.gz New: ---- 0011-R_Slave-R_NoEcho-for-non-Windows.patch v1.2.5042.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.192174270 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.196174282 +0200 @@ -24,9 +24,9 @@ %global bundled_mathjax_short_version 26 %global rstudio_version_major 1 %global rstudio_version_minor 2 -%global rstudio_version_patch 5033 +%global rstudio_version_patch 5042 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 330255ddec489e7a147ace3e8a9a3e4157d8d5ad +%global rstudio_git_revision_hash e4a1c219cbf6c10d9aec41461d80171ab3009bef Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch} Release: 0 @@ -64,6 +64,7 @@ Patch7: 0008-Don-t-install-pandoc-and-mathjax.patch Patch8: 0009-Fix-rstudio-exec-path.patch Patch9: 0010-fix-STL-access-undefined-behaviour.patch +Patch10: 0011-R_Slave-R_NoEcho-for-non-Windows.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel BuildRequires: ant @@ -178,6 +179,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # TW & Leap 15.2 specific patches %if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150200 @@ -266,11 +268,6 @@ ln -sf %{_datadir}/javascript/mathjax \ %{buildroot}%{_libexecdir}/%{name}/resources/mathjax-%{bundled_mathjax_short_version} -# redo the same for pandoc & pandoc-citeproc -for pd in pandoc pandoc-citeproc; do - ln -sf %{_bindir}/${pd} %{buildroot}%{_libexecdir}/%{name}/bin/${pd} -done - # cleanup find %{buildroot}%{_libexecdir}/%{name} -name .gitignore -delete find %{buildroot}%{_libexecdir}/%{name} -name .Rbuildignore -delete ++++++ 0001-First-pass-at-Boost-1.70-support.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.212174329 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.212174329 +0200 @@ -1,7 +1,7 @@ -From 1fb2258dc456ecbbdecc9b366ba4a6758e4e0421 Mon Sep 17 00:00:00 2001 +From e8ad32b8e9dbb081d729f3e311d36f889880da78 Mon Sep 17 00:00:00 2001 From: Kevin Ushey <[email protected]> Date: Tue, 3 Sep 2019 13:23:23 -0700 -Subject: [PATCH 01/10] First pass at Boost 1.70 support +Subject: [PATCH 01/11] First pass at Boost 1.70 support --- src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp | 6 ++++-- @@ -104,5 +104,5 @@ m_state = READY; -- -2.25.1 +2.26.2 ++++++ 0002-Bump-bundled-gwt-version.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.224174365 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.224174365 +0200 @@ -1,7 +1,7 @@ -From 6ec5616ce3dbbd059aff4012599f2706f6e6fb1a Mon Sep 17 00:00:00 2001 +From 80c16b98b7fdaa0659d6a82f2991c8280ec637e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 10:43:27 +0100 -Subject: [PATCH 02/10] Bump bundled gwt version +Subject: [PATCH 02/11] Bump bundled gwt version --- src/gwt/build.xml | 2 +- @@ -21,5 +21,5 @@ <property name="gwt.extra.args" value=""/> <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> -- -2.25.1 +2.26.2 ++++++ 0003-Remove-boost-signals-from-the-required-Boost-librari.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.236174401 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.236174401 +0200 @@ -1,7 +1,7 @@ -From 933b8de98363f190033b78febe6c0fce0845c592 Mon Sep 17 00:00:00 2001 +From a6e3162bc46b5e8c7b2aac3feefa5e198686ed0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 10:45:46 +0100 -Subject: [PATCH 03/10] Remove boost-signals from the required Boost libraries +Subject: [PATCH 03/11] Remove boost-signals from the required Boost libraries --- src/cpp/CMakeLists.txt | 1 - @@ -20,5 +20,5 @@ thread ) -- -2.25.1 +2.26.2 ++++++ 0004-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.244174425 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.248174436 +0200 @@ -1,7 +1,7 @@ -From 281a613295988be038f61b4198b6f513aad9f963 Mon Sep 17 00:00:00 2001 +From d7f4ceb4b6dc0c9e1dbb006260e7fa0ba85ec561 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 04/10] Unbundle mathjax and pandoc +Subject: [PATCH 04/11] 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 @@ -11,7 +11,7 @@ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index 1fd7718254..b0a9515fb9 100644 +index 8ba9c0f56e..3e2caa1b2e 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt @@ -22,11 +22,26 @@ add_subdirectory(workers) @@ -71,5 +71,5 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- -2.25.1 +2.26.2 ++++++ 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.268174496 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.268174496 +0200 @@ -1,7 +1,7 @@ -From 5682be6d2e4c7020bf8395486dfeba81b16ab9f5 Mon Sep 17 00:00:00 2001 +From 39fef0fb8724c9067321b8eef5159a450c201e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:05:12 +0100 -Subject: [PATCH 05/10] Use std::thread instead of QThread for Qt < 5.10 +Subject: [PATCH 05/11] Use std::thread instead of QThread for Qt < 5.10 support --- @@ -55,5 +55,5 @@ #endif } -- -2.25.1 +2.26.2 ++++++ 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.280174532 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.280174532 +0200 @@ -1,7 +1,7 @@ -From 4c41e7d8cb820da3d57036ec894103a1c54606d9 Mon Sep 17 00:00:00 2001 +From 5611cde8a9e008e39cc9c3759584061aa69e59e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:22:35 +0100 -Subject: [PATCH 06/10] Add explicit #include <mutex> for gcc 7 to +Subject: [PATCH 06/11] Add explicit #include <mutex> for gcc 7 to DesktopWebpage.cpp --- @@ -21,5 +21,5 @@ #include <QFileDialog> #include <QWebEngineSettings> -- -2.25.1 +2.26.2 ++++++ 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.292174567 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.292174567 +0200 @@ -1,7 +1,7 @@ -From 9c45e92e88d1efb405c60f0d5907f3a38f4a63e6 Mon Sep 17 00:00:00 2001 +From 18576119e8756ff8c6997ae46cc50fa7b6353316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 13 Jan 2020 15:48:54 +0100 -Subject: [PATCH 07/10] Remove PauseChanged related handler from DownloadHelper +Subject: [PATCH 07/11] Remove PauseChanged related handler from DownloadHelper for Qt < 5.10 --- @@ -47,5 +47,5 @@ private: -- -2.25.1 +2.26.2 ++++++ 0008-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.300174591 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.300174591 +0200 @@ -1,7 +1,7 @@ -From 04536f1a133a5f2958919b7a85bc344d77e99f47 Mon Sep 17 00:00:00 2001 +From 75bef4a26bfd71183354637e9d1f74c863227290 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 08/10] Don't install pandoc and mathjax +Subject: [PATCH 08/11] Don't install pandoc and mathjax Because we use the system wide version, there's no need to waste time installing the files. @@ -10,7 +10,7 @@ 1 file changed, 10 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index b0a9515fb9..77ec70ab2c 100644 +index 3e2caa1b2e..24e8008edb 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt @@ -497,20 +497,10 @@ if (NOT RSTUDIO_SESSION_WIN32) @@ -35,5 +35,5 @@ # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") # install(FILES ${RMARKDOWN_PACKAGE} -- -2.25.1 +2.26.2 ++++++ 0009-Fix-rstudio-exec-path.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.308174615 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.308174615 +0200 @@ -1,7 +1,7 @@ -From 66bd4b40e24d67068ac4b326a011aa862bf22c0b Mon Sep 17 00:00:00 2001 +From 4b93f9c3bf16ce1fddbfdd85e7a4560f9bcea1da Mon Sep 17 00:00:00 2001 From: Marco Varlese <[email protected]> Date: Mon, 27 Jan 2020 14:29:40 +0100 -Subject: [PATCH 09/10] Fix rstudio exec path +Subject: [PATCH 09/11] Fix rstudio exec path Fix the path to the rstudio executable in the rstudio.desktop file. --- @@ -20,5 +20,5 @@ Type=Application Terminal=false -- -2.25.1 +2.26.2 ++++++ 0010-fix-STL-access-undefined-behaviour.patch ++++++ --- /var/tmp/diff_new_pack.C1pBOw/_old 2020-06-17 11:38:09.316174638 +0200 +++ /var/tmp/diff_new_pack.C1pBOw/_new 2020-06-17 11:38:09.316174638 +0200 @@ -1,7 +1,7 @@ -From a981ad4af4cd9aef344cbc0b6accda48926bd23c Mon Sep 17 00:00:00 2001 +From 03aace0d96edc298c7c9e4fbfb88574d83493e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <[email protected]> Date: Sun, 16 Feb 2020 19:31:47 +0100 -Subject: [PATCH 10/10] fix STL access undefined behaviour +Subject: [PATCH 10/11] fix STL access undefined behaviour (cherry picked from commit 42bbb21db66d10e9fd824b812e4f88e9c8cae532) --- @@ -29,5 +29,5 @@ } -- -2.25.1 +2.26.2 ++++++ 0011-R_Slave-R_NoEcho-for-non-Windows.patch ++++++ >From 226b0a0191245f0d63132c85f1a94ad9ad4ef4aa Mon Sep 17 00:00:00 2001 From: Kevin Ushey <[email protected]> Date: Wed, 1 Apr 2020 10:43:13 -0700 Subject: [PATCH 11/11] R_Slave -> R_NoEcho for non-Windows (cherry picked from commit 3fb2397c2f208bb8ace0bbaf269481ccb96b5b20) --- src/cpp/r/session/REmbeddedPosix.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cpp/r/session/REmbeddedPosix.cpp b/src/cpp/r/session/REmbeddedPosix.cpp index 6518330db6..851ddbb011 100644 --- a/src/cpp/r/session/REmbeddedPosix.cpp +++ b/src/cpp/r/session/REmbeddedPosix.cpp @@ -13,6 +13,8 @@ * */ +#include <Rversion.h> + #include <r/RExec.hpp> #include <core/FilePath.hpp> @@ -104,7 +106,11 @@ void runEmbeddedR(const core::FilePath& /*rHome*/, // ignored on posix structRstart rp; Rstart Rp = &rp; R_DefParams(Rp) ; - Rp->R_Slave = FALSE ; +#if R_VERSION < R_Version(4, 0, 0) + Rp->R_Slave = FALSE; +#else + Rp->R_NoEcho = FALSE; +#endif Rp->R_Quiet = quiet ? TRUE : FALSE; Rp->R_Interactive = TRUE ; Rp->SaveAction = defaultSaveAction ; -- 2.26.2 ++++++ v1.2.5033.tar.gz -> v1.2.5042.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/rstudio/v1.2.5033.tar.gz /work/SRC/openSUSE:Leap:15.2/.rstudio.new.3606/v1.2.5042.tar.gz differ: char 15, line 1
