Hello community,
here is the log from the commit of package rstudio for openSUSE:Factory checked
in at 2020-03-11 18:48:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rstudio (Old)
and /work/SRC/openSUSE:Factory/.rstudio.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio"
Wed Mar 11 18:48:53 2020 rev:7 rq:783402 version:1.2.5033
Changes:
--------
--- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2020-02-14
16:40:57.571705620 +0100
+++ /work/SRC/openSUSE:Factory/.rstudio.new.3160/rstudio.changes
2020-03-11 18:50:59.351557989 +0100
@@ -1,0 +2,21 @@
+Tue Mar 10 11:51:03 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- Add 0010-fix-STL-access-undefined-behaviour.patch & fix double rebuild
+
+ 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
+
+ Add patch: 0010-fix-STL-access-undefined-behaviour.patch
+
+ Add fix into spec from Fedora to not rebuild gwt twice by removing it from
the
+ ALL target.
+
+-------------------------------------------------------------------
New:
----
0010-fix-STL-access-undefined-behaviour.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rstudio.spec ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.183558808 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.187558809 +0100
@@ -27,7 +27,6 @@
%global rstudio_version_patch 5033
# commit of the tag belonging to %%{version}
%global rstudio_git_revision_hash 330255ddec489e7a147ace3e8a9a3e4157d8d5ad
-
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
Release: 0
@@ -64,6 +63,7 @@
# shorten the installation time a bit by not installing mathjax
Patch7: 0008-Don-t-install-pandoc-and-mathjax.patch
Patch8: 0009-Fix-rstudio-exec-path.patch
+Patch9: 0010-fix-STL-access-undefined-behaviour.patch
BuildRequires: Mesa-devel
BuildRequires: R-core-devel
BuildRequires: ant
@@ -97,9 +97,8 @@
BuildRequires: pandoc
BuildRequires: pkgconfig
BuildRequires: systemd-rpm-macros
-BuildRequires: unzip
-%{?systemd_requires}
BuildRequires: sysuser-tools
+BuildRequires: unzip
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
@@ -135,6 +134,7 @@
Suggests: rstudio-server
Provides: bundled(gin) = %{bundled_gin_version}
Provides: bundled(gwt) = %{bundled_gwt_version}
+%{?systemd_requires}
%description
This package provides the common files of RStudio Desktop and RStudio server.
@@ -177,6 +177,7 @@
%patch3 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
# TW & Leap 15.2 specific patches
%if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150200
@@ -199,6 +200,10 @@
mkdir -p src/gwt/lib/gin/%{bundled_gin_version}
unzip -d src/gwt/lib/gin/%{bundled_gin_version} %{SOURCE3}
+# don't include gwt_build in ALL to avoid recompilation, but then we must build
+# it manually
+sed -i 's@gwt_build ALL@gwt_build@g' src/gwt/CMakeLists.txt
+
%build
%sysusers_generate_pre %{SOURCE4} %{name}-server
@@ -215,20 +220,10 @@
-DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib}
\
-DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt5
-# dirty hack:
-# gwtc compilation runs via make -> ant -> java and something in that chain
-# starts a lot of threads that can OOM the worker. Unfortunately, the
-# parallelism cannot be turned off...
-#
-# So we just build everything that doesn't require gwt first and then start a
-# single make task (in %%install) and cross our fingers hoping that gwt itself
-# is not enough to OOM the machine. We don't add an addional make call here,
-# because the gwt compilation is *always* re-run on make (i.e. it will run
again
-# in %%cmake_install), so adding that would be a waste of resources.
-%make_build rstudio rsession rpostback rstudio-core rstudio-monitor rstudio-r
rstudio-session-workers diagnostics rserver rserver-pam
+%make_build
+%make_build gwt_build
%install
-# fun fact: this recompiles gwt…
%cmake_install
# sysuser for rstudio-server
++++++ 0001-First-pass-at-Boost-1.70-support.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.207558818 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.207558818 +0100
@@ -1,7 +1,7 @@
From 1fb2258dc456ecbbdecc9b366ba4a6758e4e0421 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinus...@gmail.com>
Date: Tue, 3 Sep 2019 13:23:23 -0700
-Subject: [PATCH 1/9] First pass at Boost 1.70 support
+Subject: [PATCH 01/10] 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.0
+2.25.1
++++++ 0002-Bump-bundled-gwt-version.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.211558820 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.211558820 +0100
@@ -1,7 +1,7 @@
From 6ec5616ce3dbbd059aff4012599f2706f6e6fb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 10:43:27 +0100
-Subject: [PATCH 2/9] Bump bundled gwt version
+Subject: [PATCH 02/10] 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.0
+2.25.1
++++++ 0003-Remove-boost-signals-from-the-required-Boost-librari.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.219558824 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.219558824 +0100
@@ -1,7 +1,7 @@
From 933b8de98363f190033b78febe6c0fce0845c592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 10:45:46 +0100
-Subject: [PATCH 3/9] Remove boost-signals from the required Boost libraries
+Subject: [PATCH 03/10] Remove boost-signals from the required Boost libraries
---
src/cpp/CMakeLists.txt | 1 -
@@ -20,5 +20,5 @@
thread
)
--
-2.25.0
+2.25.1
++++++ 0004-Unbundle-mathjax-and-pandoc.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.227558827 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.227558827 +0100
@@ -1,7 +1,7 @@
From 281a613295988be038f61b4198b6f513aad9f963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 11:27:06 +0100
-Subject: [PATCH 4/9] Unbundle mathjax and pandoc
+Subject: [PATCH 04/10] 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
@@ -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.0
+2.25.1
++++++ 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.239558833 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.239558833 +0100
@@ -1,7 +1,8 @@
From 5682be6d2e4c7020bf8395486dfeba81b16ab9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 15:05:12 +0100
-Subject: [PATCH 5/9] Use std::thread instead of QThread for Qt < 5.10 support
+Subject: [PATCH 05/10] Use std::thread instead of QThread for Qt < 5.10
+ support
---
src/cpp/desktop/DesktopInfo.cpp | 12 ++++++------
@@ -54,5 +55,5 @@
#endif
}
--
-2.25.0
+2.25.1
++++++ 0006-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.243558835 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.247558836 +0100
@@ -1,7 +1,7 @@
From 4c41e7d8cb820da3d57036ec894103a1c54606d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 15:22:35 +0100
-Subject: [PATCH 6/9] Add explicit #include <mutex> for gcc 7 to
+Subject: [PATCH 06/10] Add explicit #include <mutex> for gcc 7 to
DesktopWebpage.cpp
---
@@ -21,5 +21,5 @@
#include <QFileDialog>
#include <QWebEngineSettings>
--
-2.25.0
+2.25.1
++++++ 0007-Remove-PauseChanged-related-handler-from-DownloadHel.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.251558838 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.251558838 +0100
@@ -1,7 +1,7 @@
From 9c45e92e88d1efb405c60f0d5907f3a38f4a63e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Mon, 13 Jan 2020 15:48:54 +0100
-Subject: [PATCH 7/9] Remove PauseChanged related handler from DownloadHelper
+Subject: [PATCH 07/10] Remove PauseChanged related handler from DownloadHelper
for Qt < 5.10
---
@@ -47,5 +47,5 @@
private:
--
-2.25.0
+2.25.1
++++++ 0008-Don-t-install-pandoc-and-mathjax.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.259558842 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.259558842 +0100
@@ -1,7 +1,7 @@
From 04536f1a133a5f2958919b7a85bc344d77e99f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcer...@suse.com>
Date: Tue, 14 Jan 2020 14:20:40 +0100
-Subject: [PATCH 8/9] Don't install pandoc and mathjax
+Subject: [PATCH 08/10] Don't install pandoc and mathjax
Because we use the system wide version, there's no need to waste time
installing
the files.
@@ -35,5 +35,5 @@
# file(GLOB RMARKDOWN_PACKAGE
"${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
# install(FILES ${RMARKDOWN_PACKAGE}
--
-2.25.0
+2.25.1
++++++ 0009-Fix-rstudio-exec-path.patch ++++++
--- /var/tmp/diff_new_pack.V4u4nA/_old 2020-03-11 18:51:01.263558844 +0100
+++ /var/tmp/diff_new_pack.V4u4nA/_new 2020-03-11 18:51:01.263558844 +0100
@@ -1,7 +1,7 @@
From 66bd4b40e24d67068ac4b326a011aa862bf22c0b Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varl...@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 9/9] Fix rstudio exec path
+Subject: [PATCH 09/10] 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.0
+2.25.1
++++++ 0010-fix-STL-access-undefined-behaviour.patch ++++++
>From a981ad4af4cd9aef344cbc0b6accda48926bd23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iu...@fedoraproject.org>
Date: Sun, 16 Feb 2020 19:31:47 +0100
Subject: [PATCH 10/10] fix STL access undefined behaviour
(cherry picked from commit 42bbb21db66d10e9fd824b812e4f88e9c8cae532)
---
src/cpp/session/modules/SessionFiles.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cpp/session/modules/SessionFiles.cpp
b/src/cpp/session/modules/SessionFiles.cpp
index a509c100cf..11c80155a7 100644
--- a/src/cpp/session/modules/SessionFiles.cpp
+++ b/src/cpp/session/modules/SessionFiles.cpp
@@ -909,13 +909,13 @@ SEXP rs_readLines(SEXP filePathSEXP)
return r::sexp::create(contents, &protect);
std::vector<std::string> splat = core::algorithm::split(contents, "\n");
- if (splat[splat.size() - 1].empty())
+ if (splat.size() && splat[splat.size() - 1].empty())
splat.pop_back();
for (std::size_t i = 0, n = splat.size(); i < n; ++i)
{
std::string& rElement = splat[i];
- if (rElement[rElement.size() - 1] == '\r')
+ if (rElement.size() && rElement[rElement.size() - 1] == '\r')
rElement.erase(rElement.size() - 1);
}
--
2.25.1
