Hello community,
here is the log from the commit of package rstudio for openSUSE:Factory checked
in at 2020-01-20 22:53:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rstudio (Old)
and /work/SRC/openSUSE:Factory/.rstudio.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio"
Mon Jan 20 22:53:58 2020 rev:2 rq:765713 version:1.2.5033
Changes:
--------
--- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2020-01-18
12:18:18.535144629 +0100
+++ /work/SRC/openSUSE:Factory/.rstudio.new.26092/rstudio.changes
2020-01-20 22:54:08.943313609 +0100
@@ -1,0 +2,30 @@
+Tue Jan 14 15:57:38 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- Set RStudio versions properly via ENV variables
+
+-------------------------------------------------------------------
+Tue Jan 14 13:48:39 UTC 2020 - Dan Čermák <dcer...@suse.com>
+
+- Fix shebangs on Leap 15 properly
+
+- Add patch to skip the installation of the bundled mathjax and pandoc as we'd
+ rm -rf them again:
+ * 0009-Don-t-install-pandoc-and-mathjax.patch
+
+- Rebase:
+ * 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-find_program-to-find-qmake-if-it-is-not-in-the-p.patch
+ * 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch
+ * 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch
+ * 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch
+
+-------------------------------------------------------------------
+Tue Jan 14 12:14:49 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Lower ram and disk in _constraints to match requirements
+ and get more workers
+
+-------------------------------------------------------------------
New:
----
0009-Don-t-install-pandoc-and-mathjax.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rstudio.spec ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.683314279 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.687314280 +0100
@@ -24,8 +24,14 @@
%global bundled_mathjax_version 2.6.1
%global bundled_mathjax_short_version 26
+%global rstudio_version_major 1
+%global rstudio_version_minor 2
+%global rstudio_version_patch 5033
+# commit of the tag belonging to %%{version}
+%global rstudio_git_revision_hash 330255ddec489e7a147ace3e8a9a3e4157d8d5ad
+
Name: rstudio
-Version: 1.2.5033
+Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
Release: 0
Summary: R-Studio Desktop
# R-Studio: AGPL 3.0
@@ -53,11 +59,14 @@
Patch2: 0002-Bump-bundled-gwt-version.patch
# Tumbleweed and Leap 15.2 only patch
Patch3: 0001-First-pass-at-Boost-1.70-support.patch
+# main ubundling patch
Patch4: 0004-Unbundle-mathjax-and-pandoc.patch
# patches for Leap 15.1 & 15.0
Patch5: 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch
Patch6: 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch
Patch7: 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch
+# shorten the installation time a bit by not installing mathjax
+Patch8: 0009-Don-t-install-pandoc-and-mathjax.patch
BuildRequires: Mesa-devel
BuildRequires: R-core-devel
@@ -143,6 +152,7 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
+%patch8 -p1
# TW & Leap 15.2 specific patches
%if 0%{?suse_version} > 1500 || 0%{?sle_version} == 150200
@@ -167,6 +177,11 @@
%build
%limit_build -m 1500
+export RSTUDIO_VERSION_MAJOR=%{rstudio_version_major}
+export RSTUDIO_VERSION_MINOR=%{rstudio_version_minor}
+export RSTUDIO_VERSION_PATCH=%{rstudio_version_patch}
+export RSTUDIO_GIT_REVISION_HASH=%{rstudio_git_revision_hash}
+export GIT_COMMIT=%{rstudio_git_revision_hash}
%cmake -DRSTUDIO_TARGET=Desktop -DCMAKE_BUILD_TYPE=Release
-DRSTUDIO_BOOST_SIGNALS_VERSION=2 -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/rstudio
# dirty hack:
@@ -188,16 +203,14 @@
install -d -m 0755 %{buildroot}%{_bindir}
ln -s %{_libexecdir}/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name}
-# remove the "bundled" (actually our) mathjax and symlink it to
+# symlink the location where the bundled mathjax should be to
# /usr/share/javascript/mathjax as mathjax-%%{bundled_mathjax_short_version}
-rm -rf %{buildroot}%{_libexecdir}/%{name}/resources/mathjax
-ln -s %{_datadir}/javascript/mathjax \
+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
- rm -rf %{buildroot}%{_libexecdir}/%{name}/bin/${pd}
- ln -s %{_bindir}/${pd} %{buildroot}%{_libexecdir}/%{name}/bin/${pd}
+ ln -sf %{_bindir}/${pd} %{buildroot}%{_libexecdir}/%{name}/bin/${pd}
done
# cleanup
@@ -208,10 +221,11 @@
%fdupes -s %{buildroot}%{_libexecdir}/%{name}
%fdupes -s %{buildroot}%{_datadir}
-# fix shebangs
+# fix shebangs from /usr/bin/env bash to
+BASH_PATH=$(which bash)
for f in postback/askpass-passthrough postback/rpostback-askpass
postback/rpostback-editfile postback/rpostback-gitssh
postback/rpostback-pdfviewer r-ldpath rstudio-backtrace.sh; do
full_path=%{buildroot}%{_libexecdir}/%{name}/bin/$f
- sed -i.orig "s:^#\!/usr/bin/env\s\+bash\s\?$:#!/usr/bin/bash:" $full_path
+ sed -i.orig 's:^#\!/usr/bin/env\s\+bash\s\?$:#\!'"${BASH_PATH}"':'
$full_path
touch -r $full_path.orig $full_path
rm $full_path.orig
done
++++++ 0001-First-pass-at-Boost-1.70-support.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.699314285 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.699314285 +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/8] First pass at Boost 1.70 support
+Subject: [PATCH 1/9] First pass at Boost 1.70 support
---
src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp | 6 ++++--
++++++ 0002-Bump-bundled-gwt-version.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.703314286 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.707314288 +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/8] Bump bundled gwt version
+Subject: [PATCH 2/9] Bump bundled gwt version
---
src/gwt/build.xml | 2 +-
++++++ 0003-Remove-boost-signals-from-the-required-Boost-librari.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.711314290 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.711314290 +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/8] Remove boost-signals from the required Boost libraries
+Subject: [PATCH 3/9] Remove boost-signals from the required Boost libraries
---
src/cpp/CMakeLists.txt | 1 -
++++++ 0004-Unbundle-mathjax-and-pandoc.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.715314291 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.719314292 +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/8] Unbundle mathjax and pandoc
+Subject: [PATCH 4/9] 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
++++++ 0005-Use-find_program-to-find-qmake-if-it-is-not-in-the-p.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.723314294 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.727314296 +0100
@@ -1,7 +1,7 @@
From aa586f80119eb0ba639bf620c8b4eb426df456c7 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 13:08:59 +0100
-Subject: [PATCH 5/8] Use find_program to find qmake if it is not in the
+Subject: [PATCH 5/9] Use find_program to find qmake if it is not in the
predefined path in /opt/
---
++++++ 0006-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.731314297 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.731314297 +0100
@@ -1,7 +1,7 @@
From abe4dd26e0cbfbf0811a59b04d018c0786ea18b4 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 6/8] Use std::thread instead of QThread for Qt < 5.10 support
+Subject: [PATCH 6/9] Use std::thread instead of QThread for Qt < 5.10 support
---
src/cpp/desktop/DesktopInfo.cpp | 12 ++++++------
++++++ 0007-Add-explicit-include-mutex-for-gcc-7-to-DesktopWebpa.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.735314299 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.739314300 +0100
@@ -1,7 +1,7 @@
From fa95348822ab87aee7a6504fac64a707bc415493 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 7/8] Add explicit #include <mutex> for gcc 7 to
+Subject: [PATCH 7/9] Add explicit #include <mutex> for gcc 7 to
DesktopWebpage.cpp
---
++++++ 0008-Remove-PauseChanged-related-handler-from-DownloadHel.patch ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.743314302 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.743314302 +0100
@@ -1,7 +1,7 @@
From 3d0059cf41e5dbb30d809b6b5fb5ff121e4403d8 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 8/8] Remove PauseChanged related handler from DownloadHelper
+Subject: [PATCH 8/9] Remove PauseChanged related handler from DownloadHelper
for Qt < 5.10
---
++++++ 0009-Don-t-install-pandoc-and-mathjax.patch ++++++
>From 7a76822069916fb2f9d733fed925c46603dc3a6e 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 9/9] Don't install pandoc and mathjax
Because we use the system wide version, there's no need to waste time installing
the files.
---
src/cpp/session/CMakeLists.txt | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index b0a9515fb9..77ec70ab2c 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -497,20 +497,10 @@ if (NOT RSTUDIO_SESSION_WIN32)
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install mathjax for local html preview
- install(DIRECTORY "${MATHJAX_PATH}"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
# icons for database connections
install(DIRECTORY "resources/connections"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- # install pandoc
- set(PANDOC_FILES ${PANDOC_CITEPROC_BIN_LOCATION} ${PANDOC_BIN_LOCATION})
- install(FILES ${PANDOC_FILES}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
-
# install rmarkdown package
# file(GLOB RMARKDOWN_PACKAGE
"${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
# install(FILES ${RMARKDOWN_PACKAGE}
--
2.24.1
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.bmtwgM/_old 2020-01-20 22:54:10.759314308 +0100
+++ /var/tmp/diff_new_pack.bmtwgM/_new 2020-01-20 22:54:10.763314310 +0100
@@ -1,10 +1,10 @@
<constraints>
<hardware>
<disk>
- <size unit="G">16</size>
+ <size unit="G">9</size>
</disk>
<physicalmemory>
- <size unit="G">16</size>
+ <size unit="G">9</size>
</physicalmemory>
</hardware>
</constraints>
