Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2021-03-30 21:14:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Tue Mar 30 21:14:16 2021 rev:15 rq:877961 version:1.4.1103 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2020-09-21 17:20:34.083796592 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2401/rstudio.changes 2021-03-30 21:38:17.442766958 +0200 @@ -1,0 +2,26 @@ +Mon Jan 18 12:48:44 UTC 2021 - Dan ??erm??k <[email protected]> + +- New upstream release 1.4.1103 + +Renamed / rebased patches: +* 0005-Use-system-hunspell.patch +* 0004-Add-additional-includes-for-aarch64.patch +* 0006-Fix-libclang-usage.patch +* 0007-use-system-node.patch + +------------------------------------------------------------------- +Wed Oct 21 15:43:10 UTC 2020 - Dan ??erm??k <[email protected]> + +New upstream release 1.3.1093 + +Rebase patches: +* 0001-Unbundle-mathjax-and-pandoc.patch +* 0002-Don-t-install-pandoc-and-mathjax.patch +* 0003-Fix-rstudio-exec-path.patch +* 0004-add-support-for-boost-1.73.patch +* 0005-Add-additional-includes-for-aarch64.patch +* 0006-Use-system-hunspell.patch +* 0007-Fix-libclang-usage.patch +* 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch + +------------------------------------------------------------------- Old: ---- 0004-add-support-for-boost-1.73.patch 0005-Add-additional-includes-for-aarch64.patch 0006-Use-system-hunspell.patch 0007-Fix-libclang-usage.patch v1.3.1073.tar.gz New: ---- 0004-Add-additional-includes-for-aarch64.patch 0005-Use-system-hunspell.patch 0006-Fix-libclang-usage.patch 0007-use-system-node.patch v1.4.1103.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.SuFsU1/_old 2021-03-30 21:43:02.442541925 +0200 +++ /var/tmp/diff_new_pack.SuFsU1/_new 2021-03-30 21:43:02.446541929 +0200 @@ -1,7 +1,7 @@ # # spec file for package rstudio # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -57,7 +57,7 @@ %global bundled_datatables_version 1.10.4 # - jQuery => bundled in ./src/cpp/session/resources/grid/datatables/js/jquery.js, version 3.4.0, license is MIT %global bundled_jquery_version 3.4.0 -# - Catch => used for testing only (which we don't run currently) +# - Catch2 => used for testing only (which we don't run currently) # - QUnit => bundled in ./src/gwt/test/acesupport/qunit/, version 1.18.0, license is MIT %global bundled_quinitjs_version 1.18.0 # - xterm.js => bundled in ./src/gwt/src/org/rstudio/studio/client/workbench/views/terminal/xterm/xterm.js, version 3.14.5, license is MIT @@ -90,10 +90,10 @@ %define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} %global rstudio_version_major 1 -%global rstudio_version_minor 3 -%global rstudio_version_patch 1073 +%global rstudio_version_minor 4 +%global rstudio_version_patch 1103 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 718e6d75b094658d999495534badf55fb2ce0047 +%global rstudio_git_revision_hash 458706c38764ec79d06ef1214acf07af87ef5795 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch} Release: 0 @@ -125,13 +125,14 @@ # 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 +Patch3: 0004-Add-additional-includes-for-aarch64.patch # Make compatible with hunspell 1.4.0 or later, use system hunspell. -Patch5: 0006-Use-system-hunspell.patch +Patch4: 0005-Use-system-hunspell.patch # Make sure we find the right libclang.so and builtin headers, make compatible with newer versions. -Patch6: 0007-Fix-libclang-usage.patch +Patch5: 0006-Fix-libclang-usage.patch +# taken from: +# https://src.fedoraproject.org/rpms/rstudio/raw/d6d10b5bfade9014c156761a38b1d7a2db5f28f8/f/0004-use-system-node.patch +Patch6: 0007-use-system-node.patch # Leap 15.2 only patch Patch7: 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch @@ -144,7 +145,7 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: ghc-pandoc-citeproc +BuildRequires: ghc-citeproc BuildRequires: glibc-devel # for dir ownership of /usr/share/icons/hicolor/* BuildRequires: hicolor-icon-theme @@ -163,9 +164,12 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: make BuildRequires: mathjax +BuildRequires: nodejs-common BuildRequires: pam-devel BuildRequires: pandoc BuildRequires: pkgconfig +BuildRequires: soci-postgresql-devel +BuildRequires: soci-sqlite3-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools BuildRequires: unzip @@ -194,6 +198,7 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(websocketpp) BuildRequires: pkgconfig(zlib) @@ -307,6 +312,7 @@ %cmake -DRSTUDIO_TARGET=Desktop -DRSTUDIO_SERVER=TRUE -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name} \ -DRSTUDIO_USE_SYSTEM_BOOST=TRUE \ + -DRSTUDIO_USE_SYSTEM_SOCI=TRUE \ -DRSTUDIO_BOOST_SIGNALS_VERSION=2 \ -DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib} \ %{?rstudio_boost_requested_version:-DRSTUDIO_BOOST_REQUESTED_VERSION=%{rstudio_boost_requested_version}} \ ++++++ 0001-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.SuFsU1/_old 2021-03-30 21:43:02.466541946 +0200 +++ /var/tmp/diff_new_pack.SuFsU1/_new 2021-03-30 21:43:02.466541946 +0200 @@ -1,4 +1,4 @@ -From 04766193f0582261cb2cb849e3be0caea7d7a88e Mon Sep 17 00:00:00 2001 +From a3cb2b39f555f999ffa3d1d0c8f775ab57a83665 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/8] Unbundle mathjax and pandoc @@ -7,14 +7,14 @@ dependencies/ subdirectory first. If they are not there, use the system paths instead. --- - src/cpp/session/CMakeLists.txt | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) + src/cpp/session/CMakeLists.txt | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index 8f0daa57ea..31d0ee2227 100644 +index 9b6017f211..d0b41b13d2 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -22,11 +22,26 @@ add_subdirectory(workers) +@@ -22,13 +22,13 @@ add_subdirectory(workers) if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)") endif() @@ -26,25 +26,14 @@ +if("${MATHJAX_JS_LOCATION}" STREQUAL "MATHJAX_JS_LOCATION-NOTFOUND") 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)") -+get_filename_component(MATHJAX_PATH ${MATHJAX_JS_LOCATION} DIRECTORY) -+ -+find_program(PANDOC_BIN_LOCATION -+ NAMES pandoc -+ LOCATION "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/" /usr/bin/) -+find_program(PANDOC_CITEPROC_BIN_LOCATION -+ NAMES pandoc-citeproc -+ LOCATION "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/" /usr/bin/) -+if( -+ "${PANDOC_BIN_LOCATION}" STREQUAL "PANDOC_BIN_LOCATION-NOTFOUND" -+ OR -+ "${PANDOC_CITEPROC_BIN_LOCATION}" STREQUAL "PANDOC_CITEPROC_BIN_LOCATION-NOTFOUND") -+ message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") - endif() +-set(PANDOC_VERSION "2.11.2" CACHE INTERNAL "Pandoc version") +-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") +- message(FATAL_ERROR "pandoc ${PANDOC_VERSION} not found (re-run install-dependencies script to install)") +-endif() # verify embedded packages are available -@@ -501,7 +516,7 @@ if (NOT RSTUDIO_SESSION_WIN32) + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) +@@ -535,7 +535,7 @@ if (NOT RSTUDIO_SESSION_WIN32) DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") # install mathjax for local html preview @@ -53,8 +42,8 @@ DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") # icons for database connections -@@ -521,6 +536,7 @@ if (NOT RSTUDIO_SESSION_WIN32) - +@@ -553,6 +553,7 @@ if (NOT RSTUDIO_SESSION_WIN32) + # install pandoc set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") + set(PANDOC_FILES ${PANDOC_CITEPROC_BIN_LOCATION} ${PANDOC_BIN_LOCATION}) @@ -62,5 +51,5 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- -2.28.0 +2.29.2 ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.SuFsU1/_old 2021-03-30 21:43:02.474541953 +0200 +++ /var/tmp/diff_new_pack.SuFsU1/_new 2021-03-30 21:43:02.474541953 +0200 @@ -1,4 +1,4 @@ -From df0ce1039f881c35bdc78ce91d1944be5384b593 Mon Sep 17 00:00:00 2001 +From b96c1517d5c36e75a871cebd048dfc80f441e45b 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/8] Don't install pandoc and mathjax @@ -6,14 +6,14 @@ Because we use the system wide version, there's no need to waste time installing the files. --- - src/cpp/session/CMakeLists.txt | 22 ---------------------- - 1 file changed, 22 deletions(-) + src/cpp/session/CMakeLists.txt | 12 ------------ + 1 file changed, 12 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index 31d0ee2227..4739b4068a 100644 +index d0b41b13d2..69d6cb2b2b 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -515,10 +515,6 @@ if (NOT RSTUDIO_SESSION_WIN32) +@@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32) install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") @@ -24,13 +24,11 @@ # icons for database connections install(DIRECTORY "resources/connections" DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -@@ -531,24 +527,6 @@ if (NOT RSTUDIO_SESSION_WIN32) +@@ -550,14 +546,6 @@ if (NOT RSTUDIO_SESSION_WIN32) install(DIRECTORY "resources/dependencies" DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - # install pandoc -- 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*") - set(PANDOC_FILES ${PANDOC_CITEPROC_BIN_LOCATION} ${PANDOC_BIN_LOCATION}) @@ -38,17 +36,9 @@ - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) - -- # install embedded packages -- foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -- file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -- install( -- FILES "${PKG_FILES}" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/R/packages") -- endforeach() -- - # install PDF.js - install(DIRECTORY "resources/pdfjs" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) + # install embedded packages + foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) + file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -- -2.28.0 +2.29.2 ++++++ 0003-Fix-rstudio-exec-path.patch ++++++ --- /var/tmp/diff_new_pack.SuFsU1/_old 2021-03-30 21:43:02.486541963 +0200 +++ /var/tmp/diff_new_pack.SuFsU1/_new 2021-03-30 21:43:02.490541966 +0200 @@ -1,4 +1,4 @@ -From 173105fc0f0df38596135a2e3522ee0359bde603 Mon Sep 17 00:00:00 2001 +From d62749fea817e91fa24fb47195eceb629d5269c7 Mon Sep 17 00:00:00 2001 From: Marco Varlese <[email protected]> Date: Mon, 27 Jan 2020 14:29:40 +0100 Subject: [PATCH 3/8] Fix rstudio exec path @@ -20,5 +20,5 @@ Type=Application Terminal=false -- -2.28.0 +2.29.2 ++++++ 0005-Add-additional-includes-for-aarch64.patch -> 0004-Add-additional-includes-for-aarch64.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0005-Add-additional-includes-for-aarch64.patch 2020-09-21 17:20:16.711783185 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2401/0004-Add-additional-includes-for-aarch64.patch 2021-03-30 21:38:12.326761684 +0200 @@ -1,7 +1,7 @@ -From f2f23822915d220b425e779f226206b9f1f9f780 Mon Sep 17 00:00:00 2001 +From 866b9b941197c842cec59fd1b7a0e5145919ea2f 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/8] Add additional includes for aarch64 +Subject: [PATCH 4/8] Add additional includes for aarch64 --- src/cpp/core/HtmlUtils.cpp | 1 + @@ -10,7 +10,7 @@ 3 files changed, 3 insertions(+) diff --git a/src/cpp/core/HtmlUtils.cpp b/src/cpp/core/HtmlUtils.cpp -index 3581791c07..270656e4a5 100644 +index 73de8eebbf..47ba6178f4 100644 --- a/src/cpp/core/HtmlUtils.cpp +++ b/src/cpp/core/HtmlUtils.cpp @@ -18,6 +18,7 @@ @@ -22,11 +22,11 @@ #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 +index e68d4b0441..714db65629 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> +@@ -27,6 +27,7 @@ + #include <core/system/Xdg.hpp> #include <boost/algorithm/string.hpp> +#include <boost/bind.hpp> @@ -34,17 +34,17 @@ // 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 +index 214349b0c6..a4e174f1f1 100644 --- a/src/cpp/r/session/RStdCallbacks.cpp +++ b/src/cpp/r/session/RStdCallbacks.cpp -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ - #include <gsl/gsl> + #include <iostream> +#include <boost/bind.hpp> #include <boost/function.hpp> #include <boost/regex.hpp> -- -2.28.0 +2.29.2 ++++++ 0006-Use-system-hunspell.patch -> 0005-Use-system-hunspell.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0006-Use-system-hunspell.patch 2020-09-21 17:20:19.267785157 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2401/0005-Use-system-hunspell.patch 2021-03-30 21:38:13.922763330 +0200 @@ -1,7 +1,7 @@ -From 3ab89e66aedbd071fa89af603754a31f1e2f051a Mon Sep 17 00:00:00 2001 +From e0ac60fad5ded87d3145fd887e328775ff5869e9 Mon Sep 17 00:00:00 2001 From: Aaron Puchert <[email protected]> Date: Mon, 7 Sep 2020 11:09:01 +0200 -Subject: [PATCH 6/8] Use system hunspell +Subject: [PATCH 5/8] Use system hunspell --- src/cpp/core/CMakeLists.txt | 6 +++++- @@ -9,7 +9,7 @@ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/cpp/core/CMakeLists.txt b/src/cpp/core/CMakeLists.txt -index 05f5ad67b4..47b6662ff4 100644 +index 40a889b5ea..166df01af2 100644 --- a/src/cpp/core/CMakeLists.txt +++ b/src/cpp/core/CMakeLists.txt @@ -15,7 +15,11 @@ @@ -26,7 +26,7 @@ # include files diff --git a/src/cpp/core/spelling/HunspellSpellingEngine.cpp b/src/cpp/core/spelling/HunspellSpellingEngine.cpp -index 6cc1315c9d..9c8a61e098 100644 +index 861417db6e..60763c5fc1 100644 --- a/src/cpp/core/spelling/HunspellSpellingEngine.cpp +++ b/src/cpp/core/spelling/HunspellSpellingEngine.cpp @@ -195,11 +195,10 @@ public: @@ -45,5 +45,5 @@ return Success(); } -- -2.28.0 +2.29.2 ++++++ 0007-Fix-libclang-usage.patch -> 0006-Fix-libclang-usage.patch ++++++ --- /work/SRC/openSUSE:Factory/rstudio/0007-Fix-libclang-usage.patch 2020-09-21 17:20:23.215788204 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2401/0006-Fix-libclang-usage.patch 2021-03-30 21:38:14.602764031 +0200 @@ -1,7 +1,7 @@ -From 42fe2eb6367c27a912a2edcd13bc1f1a1a44338a Mon Sep 17 00:00:00 2001 +From fa79914a93db99f8ac4be9dd3ae3664c002867be Mon Sep 17 00:00:00 2001 From: Aaron Puchert <[email protected]> Date: Mon, 7 Sep 2020 11:12:26 +0200 -Subject: [PATCH 7/8] Fix libclang usage +Subject: [PATCH 6/8] Fix libclang usage --- src/cpp/core/include/core/libclang/LibClang.hpp | 1 + @@ -9,7 +9,7 @@ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/cpp/core/include/core/libclang/LibClang.hpp b/src/cpp/core/include/core/libclang/LibClang.hpp -index b67a53ee50..63c5a906be 100644 +index fbb9282b86..f260dd792d 100644 --- a/src/cpp/core/include/core/libclang/LibClang.hpp +++ b/src/cpp/core/include/core/libclang/LibClang.hpp @@ -35,6 +35,7 @@ @@ -21,7 +21,7 @@ namespace rstudio { namespace core { diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp -index 33f113f2f1..f1100b0422 100644 +index 1186f3a55a..db80fec800 100644 --- a/src/cpp/core/libclang/LibClang.cpp +++ b/src/cpp/core/libclang/LibClang.cpp @@ -58,12 +58,11 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version) @@ -56,5 +56,5 @@ for (const char* prefix : {"/usr/lib", "/usr/lib64"}) { -- -2.28.0 +2.29.2 ++++++ 0007-use-system-node.patch ++++++ >From fd74c87287fbedf70479d7b68f95987ab5fb1e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <[email protected]> Date: Sat, 16 Jan 2021 19:11:23 +0100 Subject: [PATCH 7/8] use system node --- src/gwt/build.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gwt/build.xml b/src/gwt/build.xml index 899ae7fecd..ac90566667 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml @@ -82,19 +82,7 @@ </target> <!-- panmirror typescript library --> - <property name="node.version" value="10.19.0"/> - <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> - <condition property="node.bin" value="../../../${node.dir}/bin/node"> - <not> - <os family="windows" /> - </not> - </condition> - <condition property="node.bin" value="${node.dir}/node.exe"> - <os family="windows" /> - </condition> - - <!-- use node from /opt/rstudio-tools if installed (typical for Docker) --> - <available property="node.bin" value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node" file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/> + <property name="node.bin" value="/usr/bin/node"/> <property name="panmirror.dir" value="./panmirror/src/editor"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> -- 2.29.2 ++++++ 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch ++++++ --- /var/tmp/diff_new_pack.SuFsU1/_old 2021-03-30 21:43:02.538542006 +0200 +++ /var/tmp/diff_new_pack.SuFsU1/_new 2021-03-30 21:43:02.538542006 +0200 @@ -1,4 +1,4 @@ -From dfaa947fc5e3969f2bce910281e5fc25f096b344 Mon Sep 17 00:00:00 2001 +From 1b1cab3e8967f5db3be28f140f147b90ab7d8d36 Mon Sep 17 00:00:00 2001 From: Adam Majer <[email protected]> Date: Thu, 10 Sep 2020 14:56:17 +0200 Subject: [PATCH 8/8] Add support for RapidJSON 1.1.0 in Leap 15.2 @@ -8,10 +8,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp/shared_core/json/Json.cpp b/src/cpp/shared_core/json/Json.cpp -index aaac8a3f66..d4149c5c51 100644 +index a7a3521e4f..9ad01ce8dc 100644 --- a/src/cpp/shared_core/json/Json.cpp +++ b/src/cpp/shared_core/json/Json.cpp -@@ -746,7 +746,7 @@ std::string Value::write() const +@@ -795,7 +795,7 @@ std::string Value::write() const rapidjson::Writer<rapidjson::StringBuffer> writer(buffer); m_impl->Document->Accept(writer); @@ -20,7 +20,7 @@ } void Value::write(std::ostream& os) const -@@ -760,7 +760,7 @@ std::string Value::writeFormatted() const +@@ -809,7 +809,7 @@ std::string Value::writeFormatted() const rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer); m_impl->Document->Accept(writer); @@ -30,5 +30,5 @@ void Value::writeFormatted(std::ostream& os) const -- -2.28.0 +2.29.2 ++++++ v1.3.1073.tar.gz -> v1.4.1103.tar.gz ++++++ /work/SRC/openSUSE:Factory/rstudio/v1.3.1073.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.2401/v1.4.1103.tar.gz differ: char 15, line 1
