The package rpms/rstudio.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rstudio.git/commit/?id=96ff56cba7....
Change:
-%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit 17edcaff3d30f460ab18ff6bc0369f89087ddaac
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Sat May 30 17:22:47 2020 +0200
Update to 1.3.959
diff --git a/.gitignore b/.gitignore
index 8962fb0..f73489b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/gwt-2.8.1.zip
/rstudio-1.2.5033.tar.gz
/rstudio-1.2.5042.tar.gz
+/rstudio-1.3.959.tar.gz
diff --git a/0000-unbundle-dependencies-common.patch
b/0000-unbundle-dependencies-common.patch
index 1df3bf6..e612c95 100644
--- a/0000-unbundle-dependencies-common.patch
+++ b/0000-unbundle-dependencies-common.patch
@@ -1,14 +1,14 @@
-From dc5d9b6c5fc48853fa22d12d116caaee5676a2ba Mon Sep 17 00:00:00 2001
+From 3c9f189a672453f32b57b94687ae4eec77f43781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
-Date: Thu, 20 Feb 2020 18:22:09 +0100
-Subject: [PATCH] unbundle dependencies/common
+Date: Sat, 30 May 2020 14:09:30 +0200
+Subject: [PATCH] unbundle dependencies common
---
- src/cpp/session/CMakeLists.txt | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
+ src/cpp/session/CMakeLists.txt | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
-index 1fd7718..8ab972c 100644
+index 8f0daa5..628d968 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -17,18 +17,6 @@ project (SESSION)
@@ -20,17 +20,17 @@ index 1fd7718..8ab972c 100644
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
- message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script
to install)")
-endif()
--if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
-- message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to
install)")
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
+- message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to
install)")
-endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to
install)")
-endif()
-
- # we often install embedded versions of these packages but don't do so currently
-
- # if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
-@@ -478,31 +466,10 @@ if (NOT RSTUDIO_SESSION_WIN32)
+ # verify embedded packages are available
+ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+ file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
+@@ -496,14 +484,6 @@ if (NOT RSTUDIO_SESSION_WIN32)
install(FILES ${R_MODULE_SRC_FILES}
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
@@ -39,19 +39,18 @@ index 1fd7718..8ab972c 100644
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
- # install mathjax for local html preview
-- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26"
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27"
- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
-
# icons for database connections
install(DIRECTORY "resources/connections"
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+@@ -516,15 +496,6 @@ if (NOT RSTUDIO_SESSION_WIN32)
+ install(DIRECTORY "resources/dependencies"
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
- # install pandoc
-- if(WIN32)
-- set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version")
-- else()
-- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
-- endif()
+- set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
-
- set(PANDOC_BIN
"${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
@@ -59,9 +58,9 @@ index 1fd7718..8ab972c 100644
- 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}
+ # install embedded packages
+ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
+ file(GLOB PKG_FILES
"${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
--
-2.24.1
+2.25.2
diff --git a/0001-unbundle-qtsingleapplication.patch
b/0001-unbundle-qtsingleapplication.patch
index 8533492..33c2f35 100644
--- a/0001-unbundle-qtsingleapplication.patch
+++ b/0001-unbundle-qtsingleapplication.patch
@@ -1,6 +1,6 @@
-From 080a23e9f2802692eb8f02a9d7532c554145b527 Mon Sep 17 00:00:00 2001
+From 2c0fb75409f38e149151f29f994ce513c18956ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
-Date: Thu, 20 Feb 2020 20:09:35 +0100
+Date: Sat, 30 May 2020 14:13:27 +0200
Subject: [PATCH] unbundle qtsingleapplication
---
@@ -9,10 +9,10 @@ Subject: [PATCH] unbundle qtsingleapplication
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
-index dabe4f4..ec28567 100644
+index 8028a68..3b05e20 100644
--- a/src/cpp/desktop/CMakeLists.txt
+++ b/src/cpp/desktop/CMakeLists.txt
-@@ -158,7 +158,6 @@ endif (NOT WIN32)
+@@ -156,7 +156,6 @@ endif (NOT WIN32)
set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
@@ -20,10 +20,10 @@ index dabe4f4..ec28567 100644
${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
-@@ -224,8 +223,6 @@ set(DESKTOP_SOURCE_FILES
- DesktopSlotBinders.cpp
- DesktopSubMenu.cpp
+@@ -225,8 +224,6 @@ set(DESKTOP_SOURCE_FILES
DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
)
@@ -36,8 +36,8 @@ index dabe4f4..ec28567 100644
+ Qt5Solutions_SingleApplication-2.6
${Boost_LIBRARIES}
rstudio-core
- ${LINK_FLAGS}
-@@ -429,6 +427,7 @@ else()
+ ${CRASHPAD_LIBRARIES}
+@@ -430,6 +428,7 @@ else()
target_link_libraries(RStudio
${RSTUDIO_QTMODULES}
${QT_LIBRARIES}
@@ -46,7 +46,7 @@ index dabe4f4..ec28567 100644
${APPLICATION_SERVICES_LIBRARY}
${COCOA_LIBRARY}
diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp
b/src/cpp/desktop/DesktopPosixApplication.hpp
-index 03d09d9..ca2eaee 100644
+index b1cbe33..c83951d 100644
--- a/src/cpp/desktop/DesktopPosixApplication.hpp
+++ b/src/cpp/desktop/DesktopPosixApplication.hpp
@@ -16,7 +16,7 @@
@@ -59,5 +59,5 @@ index 03d09d9..ca2eaee 100644
#include "DesktopApplicationLaunch.hpp"
--
-2.24.1
+2.25.2
diff --git a/0004-fix-build-under-Rv4.0.patch b/0004-fix-build-under-Rv4.0.patch
index 149a8aa..1712645 100644
--- a/0004-fix-build-under-Rv4.0.patch
+++ b/0004-fix-build-under-Rv4.0.patch
@@ -1,39 +1,38 @@
-From 226b0a0191245f0d63132c85f1a94ad9ad4ef4aa Mon Sep 17 00:00:00 2001
-From: Kevin Ushey <kevinushey(a)gmail.com>
-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
-
+From e167fc4f223d8ab9b456daaf527f5d5b0fad99bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
+Date: Sat, 30 May 2020 15:30:30 +0200
+Subject: [PATCH] fix build under Rv4.0
+
+---
+ 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 dc8ea49..4e9dd77 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 <shared_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.25.2
+
diff --git a/0006-boost-173-global-placeholders.patch
b/0006-boost-173-global-placeholders.patch
index 2b97eb6..cffd7cb 100644
--- a/0006-boost-173-global-placeholders.patch
+++ b/0006-boost-173-global-placeholders.patch
@@ -1,7 +1,7 @@
-From 6b6f5a9b6a536b87aa5ddc568b2011628b5454d2 Mon Sep 17 00:00:00 2001
+From ea8aa234b48331d34b8002fab58b4b393864e79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
-Date: Sat, 30 May 2020 11:42:59 +0200
-Subject: [PATCH] boost deprecated global placeholders
+Date: Sat, 30 May 2020 15:33:38 +0200
+Subject: [PATCH] boost-173-global-placeholders
---
src/cpp/CMakeLists.txt | 1 +
@@ -11,7 +11,7 @@ Subject: [PATCH] boost deprecated global placeholders
4 files changed, 5 insertions(+)
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index bd392c5..3a2e974 100644
+index af79150..d049524 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -28,6 +28,7 @@
include("${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeGlobals.txt")
@@ -23,7 +23,7 @@ index bd392c5..3a2e974 100644
# 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 095973b..fbeb60d 100644
+index 2ee1a81..976da4f 100644
--- a/src/cpp/core/system/PosixChildProcessTracker.cpp
+++ b/src/cpp/core/system/PosixChildProcessTracker.cpp
@@ -18,6 +18,7 @@
@@ -35,7 +35,7 @@ index 095973b..fbeb60d 100644
namespace rstudio {
namespace core {
diff --git a/src/cpp/core/system/PosixOutputCapture.cpp
b/src/cpp/core/system/PosixOutputCapture.cpp
-index 786eedd..ccdd611 100644
+index e531e00..01dedd3 100644
--- a/src/cpp/core/system/PosixOutputCapture.cpp
+++ b/src/cpp/core/system/PosixOutputCapture.cpp
@@ -28,6 +28,8 @@
@@ -48,12 +48,12 @@ index 786eedd..ccdd611 100644
namespace core {
namespace system {
diff --git a/src/cpp/core/system/PosixSystem.cpp b/src/cpp/core/system/PosixSystem.cpp
-index 04706b3..2a6e618 100644
+index c25cb32..8dae263 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/foreach.hpp>
#include <boost/range/as_array.hpp>
+#include <boost/bind.hpp>
diff --git a/rstudio.spec b/rstudio.spec
index f56a7fc..5ccc5c1 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -1,12 +1,14 @@
-%global bundled_gwt_version 2.8.1
+%global bundled_gwt_version 2.8.2
%global bundled_websockets_version 1.0.4
%global bundled_gin_version 2.1.2
%global bundled_guice_version 3.0
%global bundled_aopalliance_version 1.0
-%global bundled_jsonspirit_version 4.03
+%global bundled_rapidjson_version 5cd62c2
%global bundled_sundown_version 07d0d98
%global bundled_hunspell_version 1.3
%global bundled_synctex_version 1.17
+%global bundled_gsllite_version 0.34.0
+%global bundled_ace_version 1.4.5
%global bundled_datatables_version 1.10.4
%global bundled_jquery_version 3.4.0
%global bundled_pdfjs_version 1.3.158
@@ -15,40 +17,35 @@
%global bundled_highlightjs_version c589dcc
%global bundled_qunitjs_version 1.18.0
%global bundled_xtermjs_version 0.0.7
-%global mathjax_short 26
+%global mathjax_short 27
%global rstudio_version_major 1
-%global rstudio_version_minor 2
-%global rstudio_version_patch 5042
-%global rstudio_git_revision_hash e4a1c219cbf6c10d9aec41461d80171ab3009bef
+%global rstudio_version_minor 3
+%global rstudio_version_patch 959
+%global rstudio_git_revision_hash 3a09be39fd51a8fafa8ae330007937d31924b395
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: RStudio base package
# AGPLv3: RStudio, hunspell, icomoon glyphs
-# ASL 2.0: gwt, gwt-websockets, gin, guice, pdf.js
-# MIT: synctex, json-spirit, sundown, datatables, jquery, reveal.js,
-# jsbn, qunit.js, xterm.js
-# BSD: highlight.js
+# ASL 2.0: gwt, gwt-websockets, gin, guice, pdf.js, fast-text-encoding
+# MIT: synctex, sundown, datatables, jquery, reveal.js, jsbn, qunit.js
+# MIT: xterm.js, guidelines-support-library-lite
+# BSD: ace, highlight.js
+# W3C: inert-polyfill.js, focus-visible.js
# Public: aopalliance
-License: AGPLv3 and ASL 2.0 and MIT and BSD and Public Domain
+License: AGPLv3 and ASL 2.0 and MIT and BSD and W3C and Public Domain
URL:
https://github.com/%{name}/%{name}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1:
https://s3.amazonaws.com/%{name}-buildtools/gwt-%{bundled_gwt_version}.zip
-Source2:
https://s3.amazonaws.com/%{name}-buildtools/gin-%{bundled_gin_version}.zip
# Unbundle mathjax, pandoc, hunspell dictionaries, qtsingleapplication
Patch0: 0000-unbundle-dependencies-common.patch
Patch1: 0001-unbundle-qtsingleapplication.patch
# Remove the installation prefix from the exec path in the .desktop file
Patch2: 0002-fix-rstudio-exec-path.patch
-#
https://github.com/rstudio/rstudio/pull/6244
-Patch3: 0003-fix-STL-access-undefined-behaviour.patch
#
https://github.com/rstudio/rstudio/pull/6017
Patch4: 0004-fix-build-under-Rv4.0.patch
-# Support for Boost > 1.69
-#
https://github.com/rstudio/rstudio/pull/5353
-Patch5: 0005-boost-170-asio-service.patch
+#
https://github.com/rstudio/rstudio/pull/7011
Patch6: 0006-boost-173-global-placeholders.patch
BuildRequires: cmake, ant
@@ -89,10 +86,12 @@ Provides: bundled(gwt-websockets) =
%{bundled_websockets_version}
Provides: bundled(gin) = %{bundled_gin_version}
Provides: bundled(guice) = %{bundled_guice_version}
Provides: bundled(aopalliance) = %{bundled_aopalliance_version}
-Provides: bundled(json-spirit) = %{bundled_jsonspirit_version}
+Provides: bundled(rapidjson-devel) = %{bundled_rapidjson_version}
Provides: bundled(sundown) = %{bundled_sundown_version}
Provides: bundled(hunspell) = %{bundled_hunspell_version}
Provides: bundled(synctex) = %{bundled_synctex_version}
+Provides: bundled(guidelines-support-library-lite-devel) =
%{bundled_gsllite_version}
+Provides: bundled(js-ace) = %{bundled_ace_version}
Provides: bundled(js-datatables) = %{bundled_datatables_version}
Provides: bundled(js-jquery) = %{bundled_jquery_version}
Provides: bundled(js-pdf) = %{bundled_pdfjs_version}
@@ -133,14 +132,6 @@ This package provides the Server version, a browser-based interface
to the RStud
%prep
%autosetup -p1
-# unpack gwt
-mkdir -p src/gwt/lib/gwt
-unzip -q -d src/gwt/lib/gwt/ %{SOURCE1}
-mv src/gwt/lib/gwt/gwt-%{bundled_gwt_version} src/gwt/lib/gwt/%{bundled_gwt_version}
-# unpack gin
-mkdir -p src/gwt/lib/gin/%{bundled_gin_version}
-unzip -q -d src/gwt/lib/gin/%{bundled_gin_version} %{SOURCE2}
-
# use system libraries when available
rm -rf src/cpp/desktop/3rdparty src/cpp/ext/websocketpp
ln -sf %{_includedir}/rapidxml.h src/cpp/core/include/core/rapidxml/rapidxml.hpp
@@ -290,6 +281,7 @@ exit 0
%{_bindir}/%{name}-server
%{_bindir}/rserver
%{_bindir}/rserver-pam
+%{_libexecdir}/%{name}/bin/crash-handler-proxy
%{_libexecdir}/%{name}/bin/rserver
%{_libexecdir}/%{name}/bin/rserver-pam
%{_libexecdir}/%{name}/bin/%{name}-server
@@ -298,6 +290,16 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
+* Sat May 30 2020 Iaki car <iucar(a)fedoraproject.org> - 1.3.959-1
+- Update to 1.3.959
+- Bump gwt version; gwt and gin are now included in the main source
+- Bump MathJax version (now matches the one shipped in Fedora)
+- Provide bundled rapidjson (devel version, not in Fedora); drop json-spirit
+- Provide bundled guidelines-support-library-lite
+- Provide bundled Ace (it was present before, but missing in Provides)
+- Drop patches already merged upstream; rebase other patches
+- Add new binary crash-handler-proxy to rstudio-server
+
* Sat May 30 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-5
- Fix compatibility with boost 1.73
diff --git a/sources b/sources
index 36421c0..9ef16fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (rstudio-1.2.5042.tar.gz) =
e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
-SHA512 (gwt-2.8.1.zip) =
feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae
-SHA512 (gin-2.1.2.zip) =
03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb
+SHA512 (rstudio-1.3.959.tar.gz) =
e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac
commit fb93b3619bcfef3dcfe815e43c93659546e69376
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Sat May 30 12:48:45 2020 +0200
Fix compatibility with boost 1.73
diff --git a/0005-boost-170-asio-service.patch b/0005-boost-170-asio-service.patch
new file mode 100644
index 0000000..b7b6c4b
--- /dev/null
+++ b/0005-boost-170-asio-service.patch
@@ -0,0 +1,107 @@
+From e8ad32b8e9dbb081d729f3e311d36f889880da78 Mon Sep 17 00:00:00 2001
+From: Kevin Ushey <kevinushey(a)gmail.com>
+Date: Tue, 3 Sep 2019 13:23:23 -0700
+Subject: [PATCH 01/11] First pass at Boost 1.70 support
+
+---
+ src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp | 6 ++++--
+ src/cpp/ext/websocketpp/transport/asio/connection.hpp | 2 +-
+ src/cpp/ext/websocketpp/transport/asio/endpoint.hpp | 10 +++-------
+ .../ext/websocketpp/transport/asio/security/none.hpp | 3 +--
+ 4 files changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp
b/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp
+index b8ea6658a1..a3578318a3 100644
+--- a/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp
++++ b/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp
+@@ -54,7 +54,8 @@ public:
+ public:
+ TcpIpAsyncConnector(boost::asio::io_service& ioService,
+ boost::asio::ip::tcp::socket* pSocket)
+- : pSocket_(pSocket),
++ : service_(ioService),
++ pSocket_(pSocket),
+ resolver_(ioService),
+ isConnected_(false),
+ hasFailed_(false)
+@@ -77,7 +78,7 @@ public:
+ {
+ // start a timer that will cancel any outstanding asynchronous operations
+ // when it elapses if the connection operation has not succeeded
+- pConnectionTimer_.reset(new
boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
++ pConnectionTimer_.reset(new boost::asio::deadline_timer(service_, timeout));
+
pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
+
TcpIpAsyncConnector::shared_from_this(),
+ boost::asio::placeholders::error));
+@@ -232,6 +233,7 @@ private:
+ }
+
+ private:
++ boost::asio::io_service& service_;
+ boost::asio::ip::tcp::socket* pSocket_;
+ boost::asio::ip::tcp::resolver resolver_;
+ ConnectedHandler connectedHandler_;
+diff --git a/src/cpp/ext/websocketpp/transport/asio/connection.hpp
b/src/cpp/ext/websocketpp/transport/asio/connection.hpp
+index 395632c3f3..ef35d295ac 100644
+--- a/src/cpp/ext/websocketpp/transport/asio/connection.hpp
++++ b/src/cpp/ext/websocketpp/transport/asio/connection.hpp
+@@ -296,7 +296,7 @@ public:
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+ timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
+- lib::ref(*m_io_service),
++ *m_io_service,
+ boost::posix_time::milliseconds(duration)
+ );
+
+diff --git a/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
b/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
+index ef3b07db46..b418060a85 100644
+--- a/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
++++ b/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
+@@ -183,8 +183,7 @@ public:
+
+ m_io_service = ptr;
+ m_external_io_service = true;
+- m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+- lib::ref(*m_io_service));
++ m_acceptor =
lib::make_shared<boost::asio::ip::tcp::acceptor>(*m_io_service);
+
+ m_state = READY;
+ ec = lib::error_code();
+@@ -609,9 +608,7 @@ public:
+ * @since 0.3.0
+ */
+ void start_perpetual() {
+- m_work = lib::make_shared<boost::asio::io_service::work>(
+- lib::ref(*m_io_service)
+- );
++ m_work = lib::make_shared<boost::asio::io_service::work>(*m_io_service);
+ }
+
+ /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+@@ -775,8 +772,7 @@ protected:
+
+ // Create a resolver
+ if (!m_resolver) {
+- m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
+- lib::ref(*m_io_service));
++ m_resolver =
lib::make_shared<boost::asio::ip::tcp::resolver>(*m_io_service);
+ }
+
+ std::string proxy = tcon->get_proxy();
+diff --git a/src/cpp/ext/websocketpp/transport/asio/security/none.hpp
b/src/cpp/ext/websocketpp/transport/asio/security/none.hpp
+index 14b6f8b5f7..5876c981ce 100644
+--- a/src/cpp/ext/websocketpp/transport/asio/security/none.hpp
++++ b/src/cpp/ext/websocketpp/transport/asio/security/none.hpp
+@@ -166,8 +166,7 @@ protected:
+ return socket::make_error_code(socket::error::invalid_state);
+ }
+
+- m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+- lib::ref(*service));
++ m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(*service);
+
+ m_state = READY;
+
+--
+2.26.2
diff --git a/0006-boost-173-global-placeholders.patch
b/0006-boost-173-global-placeholders.patch
new file mode 100644
index 0000000..2b97eb6
--- /dev/null
+++ b/0006-boost-173-global-placeholders.patch
@@ -0,0 +1,64 @@
+From 6b6f5a9b6a536b87aa5ddc568b2011628b5454d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
+Date: Sat, 30 May 2020 11:42:59 +0200
+Subject: [PATCH] boost deprecated global placeholders
+
+---
+ 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 bd392c5..3a2e974 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 095973b..fbeb60d 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 786eedd..ccdd611 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 04706b3..2a6e618 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/foreach.hpp>
+ #include <boost/range/as_array.hpp>
++#include <boost/bind.hpp>
+
+ #include <signal.h>
+ #include <fcntl.h>
+--
+2.25.2
+
diff --git a/rstudio.spec b/rstudio.spec
index ff85f5f..f56a7fc 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -23,7 +23,7 @@
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: RStudio base package
# AGPLv3: RStudio, hunspell, icomoon glyphs
@@ -46,6 +46,10 @@ Patch2: 0002-fix-rstudio-exec-path.patch
Patch3: 0003-fix-STL-access-undefined-behaviour.patch
#
https://github.com/rstudio/rstudio/pull/6017
Patch4: 0004-fix-build-under-Rv4.0.patch
+# Support for Boost > 1.69
+#
https://github.com/rstudio/rstudio/pull/5353
+Patch5: 0005-boost-170-asio-service.patch
+Patch6: 0006-boost-173-global-placeholders.patch
BuildRequires: cmake, ant
BuildRequires: gcc-c++, java-1.8.0-openjdk-devel, R-core-devel
@@ -294,6 +298,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
+* Sat May 30 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-5
+- Fix compatibility with boost 1.73
+
* Tue May 12 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-4
- More granularity in file ownership under bin, sanitize requires
commit 96ff56cba75563654be3148832251ab1102e4ffe
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Tue May 12 22:25:55 2020 +0200
More granularity in file ownership under bin, sanitize requires
diff --git a/rstudio.spec b/rstudio.spec
index 338036e..ff85f5f 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -23,7 +23,7 @@
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: RStudio base package
# AGPLv3: RStudio, hunspell, icomoon glyphs
@@ -53,8 +53,10 @@ BuildRequires: pandoc, pandoc-citeproc
BuildRequires: mathjax
BuildRequires: lato-fonts, glyphography-newscycle-fonts
BuildRequires: boost-devel
-BuildRequires: pam-devel
BuildRequires: rapidxml-devel
+BuildRequires: pam-devel
+BuildRequires: systemd
+BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(websocketpp)
@@ -69,20 +71,15 @@ BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: qtsingleapplication-qt5-devel
BuildRequires: hicolor-icon-theme
BuildRequires: desktop-file-utils
+Suggests: rstudio-desktop
%endif
-BuildRequires: pkgconfig(systemd)
-BuildRequires: systemd
-%{?systemd_requires}
-Requires(pre): shadow-utils
+Suggests: rstudio-server
+Recommends: git
Requires: hunspell
Requires: pandoc, pandoc-citeproc
Requires: mathjax
Requires: lato-fonts, glyphography-newscycle-fonts
-Recommends: git
-%ifarch %{qt5_qtwebengine_arches}
-Suggests: rstudio-desktop
-%endif
-Suggests: rstudio-server
+
Provides: bundled(gwt) = %{bundled_gwt_version}
Provides: bundled(gwt-websockets) = %{bundled_websockets_version}
Provides: bundled(gin) = %{bundled_gin_version}
@@ -123,7 +120,8 @@ This package provides the Desktop version, to access the RStudio IDE
locally.
%package server
Summary: Access RStudio via a web browser
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pam
+Requires(pre): shadow-utils
+%{?systemd_requires}
%description server %_description
This package provides the Server version, a browser-based interface to the RStudio IDE.
@@ -260,7 +258,12 @@ exit 0
%doc README.md
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/R
-%{_libexecdir}/%{name}/bin
+%dir %{_libexecdir}/%{name}/bin
+%{_libexecdir}/%{name}/bin/pandoc
+%{_libexecdir}/%{name}/bin/postback
+%{_libexecdir}/%{name}/bin/r-ldpath
+%{_libexecdir}/%{name}/bin/rpostback
+%{_libexecdir}/%{name}/bin/rsession
%{_libexecdir}/%{name}/resources
%{_libexecdir}/%{name}/www
%{_libexecdir}/%{name}/www-symbolmaps
@@ -269,6 +272,9 @@ exit 0
%files desktop
%{_bindir}/%{name}
%{_libexecdir}/%{name}/%{name}.png
+%{_libexecdir}/%{name}/bin/diagnostics
+%{_libexecdir}/%{name}/bin/%{name}
+%{_libexecdir}/%{name}/bin/%{name}-backtrace.sh
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/mimetypes/*
@@ -280,11 +286,17 @@ exit 0
%{_bindir}/%{name}-server
%{_bindir}/rserver
%{_bindir}/rserver-pam
+%{_libexecdir}/%{name}/bin/rserver
+%{_libexecdir}/%{name}/bin/rserver-pam
+%{_libexecdir}/%{name}/bin/%{name}-server
%dir %{_sharedstatedir}/%{name}-server
%{_unitdir}/%{name}-server.service
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
+* Tue May 12 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-4
+- More granularity in file ownership under bin, sanitize requires
+
* Wed May 06 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-3
- Depend specifically on java-1.8.0-openjdk-devel
- Export JAVA_HOME to point to java-1.8.0
commit d8c45e3e2b5e59e76de0bef21129ca54c7398138
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Wed May 6 20:05:32 2020 +0200
Export JAVA_HOME to point to java-1.8.0
diff --git a/rstudio.spec b/rstudio.spec
index 6713dd4..338036e 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -23,7 +23,7 @@
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: RStudio base package
# AGPLv3: RStudio, hunspell, icomoon glyphs
@@ -170,6 +170,7 @@ export GIT_COMMIT=%{rstudio_git_revision_hash}
-DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib} \
-DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name}
%make_build # ALL
+export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
%make_build gwt_build
%install
@@ -284,8 +285,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
-* Wed May 06 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-2
+* Wed May 06 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-3
- Depend specifically on java-1.8.0-openjdk-devel
+- Export JAVA_HOME to point to java-1.8.0
* Wed Apr 29 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-1
- Update to 1.2.5042, which adds support for R 4.0
commit b9a8c38ac8932b06ae05d92e388e0add5396eb60
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Wed May 6 15:44:55 2020 +0200
Depend specifically on java-1.8.0-openjdk-devel
diff --git a/rstudio.spec b/rstudio.spec
index 3772f3b..6713dd4 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -48,7 +48,7 @@ Patch3: 0003-fix-STL-access-undefined-behaviour.patch
Patch4: 0004-fix-build-under-Rv4.0.patch
BuildRequires: cmake, ant
-BuildRequires: gcc-c++, java-devel <= 1:1.8.0, R-core-devel
+BuildRequires: gcc-c++, java-1.8.0-openjdk-devel, R-core-devel
BuildRequires: pandoc, pandoc-citeproc
BuildRequires: mathjax
BuildRequires: lato-fonts, glyphography-newscycle-fonts
@@ -285,7 +285,7 @@ exit 0
%changelog
* Wed May 06 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-2
-- Depend specifically on java-devel <= 1:1.8.0
+- Depend specifically on java-1.8.0-openjdk-devel
* Wed Apr 29 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-1
- Update to 1.2.5042, which adds support for R 4.0
commit cf0fd93ca6e5d54ce82bfb7a641fef32d3275129
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Wed May 6 10:08:33 2020 +0200
Depend specifically on java-devel <= 1:1.8.0
diff --git a/rstudio.spec b/rstudio.spec
index e0e71d3..3772f3b 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -23,7 +23,7 @@
Name: rstudio
Version:
%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RStudio base package
# AGPLv3: RStudio, hunspell, icomoon glyphs
@@ -48,7 +48,7 @@ Patch3: 0003-fix-STL-access-undefined-behaviour.patch
Patch4: 0004-fix-build-under-Rv4.0.patch
BuildRequires: cmake, ant
-BuildRequires: gcc-c++, java-devel, R-core-devel
+BuildRequires: gcc-c++, java-devel <= 1:1.8.0, R-core-devel
BuildRequires: pandoc, pandoc-citeproc
BuildRequires: mathjax
BuildRequires: lato-fonts, glyphography-newscycle-fonts
@@ -284,6 +284,9 @@ exit 0
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
+* Wed May 06 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-2
+- Depend specifically on java-devel <= 1:1.8.0
+
* Wed Apr 29 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5042-1
- Update to 1.2.5042, which adds support for R 4.0