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-08-25 20:57:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Wed Aug 25 20:57:58 2021 rev:17 rq:914001 version:1.4.1717 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2021-04-08 21:32:07.839804829 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1899/rstudio.changes 2021-08-25 20:59:24.097067187 +0200 @@ -1,0 +2,15 @@ +Thu Aug 19 13:45:49 UTC 2021 - Dan ??erm??k <[email protected]> + +- New upstream release v1.4.1717 + +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: ---- v1.4.1106.tar.gz New: ---- v1.4.1717.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.561063952 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.565063947 +0200 @@ -80,8 +80,6 @@ %global bundled_fast_text_encoding_version 1.0.2 # - elemental2 => bundled in ./src/gwt/lib/elemental2, version v1.0, license is Apache-2.0 %global bundled_elemental2_version 1.0.0 -# - core.js => bundled in ./src/gwt/www/js/core-js/, version 3.6.4, license is MIT -%global bundled_core_js_version 3.6.4 # - junit => bundled in ./src/gwt/lib/junit-4.9b3.jar, version 3.9b3, license is Eclipse Public License 1.0 (EPL-1.0), but used for testing only # the new (with 1.4) bundled markdown editor @@ -90,25 +88,25 @@ # missing from NOTICE: # - Google Closure Compiler => bundled in ./src/gwt/tools/compiler/ but AFAIK only used for building, version is "compiler-latest.zip as of July 9, 2019", license is Apache-2.0 with bundled dependencies under (NPL-1.1 AND (MPL-1.1 OR GPL-2.0-or-later)) AND MIT AND CPL-1.0 AND BSD-3-Clause AND Apache-2.0 -# override upstream's choice for the boost version on Leap, -# but not on Tumbleweed -%if 0%{?sle_version} +# override upstream's choice for the boost version on Leap 15.2, +# but not on Tumbleweed and Leap >= 15.3 +%if 0%{?sle_version} == 150200 %global rstudio_boost_requested_version 1.66 %endif %define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} %global rstudio_version_major 1 %global rstudio_version_minor 4 -%global rstudio_version_patch 1106 +%global rstudio_version_patch 1717 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 2389bc246c7946a8eb2f1a14e5a822bd5f6e1159 +%global rstudio_git_revision_hash df86b69ebdf62f1a9ed51af59c168572677541f1 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch} Release: 0 Summary: RStudio base package # AGPLv3: RStudio, icomoon glyphs # Apache-2.0: gwt, gwt-websockets, gin, guice, pdf.js, fast-text-encoding, inert-polyfill.js, elemental2 -# MIT: rsa.js/jsbn, synctex, datatables, jquery, reveal.js, qunit.js, xterm.js, guidelines-support-library-lite, rapidjson, core.js +# MIT: rsa.js/jsbn, synctex, datatables, jquery, reveal.js, qunit.js, xterm.js, guidelines-support-library-lite, rapidjson # BSD-3-Clause qtsingleapplication, ace, highlight.js, msinttypes # W3C (2015): focus-visible.js # BSL or MIT: rapidxml @@ -163,17 +161,17 @@ # for dir ownership of /usr/share/icons/hicolor/* BuildRequires: hicolor-icon-theme BuildRequires: java -BuildRequires: libboost_atomic-devel >= %{boost_version} -BuildRequires: libboost_chrono-devel >= %{boost_version} -BuildRequires: libboost_date_time-devel >= %{boost_version} -BuildRequires: libboost_filesystem-devel >= %{boost_version} -BuildRequires: libboost_headers-devel >= %{boost_version} -BuildRequires: libboost_iostreams-devel >= %{boost_version} -BuildRequires: libboost_program_options-devel >= %{boost_version} -BuildRequires: libboost_random-devel >= %{boost_version} -BuildRequires: libboost_regex-devel >= %{boost_version} -BuildRequires: libboost_system-devel >= %{boost_version} -BuildRequires: libboost_thread-devel >= %{boost_version} +BuildRequires: libboost_atomic-devel-impl >= %{boost_version} +BuildRequires: libboost_chrono-devel-impl >= %{boost_version} +BuildRequires: libboost_date_time-devel-impl >= %{boost_version} +BuildRequires: libboost_filesystem-devel-impl >= %{boost_version} +BuildRequires: libboost_headers-devel-impl >= %{boost_version} +BuildRequires: libboost_iostreams-devel-impl >= %{boost_version} +BuildRequires: libboost_program_options-devel-impl >= %{boost_version} +BuildRequires: libboost_random-devel-impl >= %{boost_version} +BuildRequires: libboost_regex-devel-impl >= %{boost_version} +BuildRequires: libboost_system-devel-impl >= %{boost_version} +BuildRequires: libboost_thread-devel-impl >= %{boost_version} BuildRequires: libqt5-qtbase-devel BuildRequires: make BuildRequires: mathjax @@ -186,6 +184,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools BuildRequires: unzip +BuildRequires: cmake(yaml-cpp) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) @@ -290,7 +289,14 @@ %autosetup -p1 %else %autosetup -N -%autopatch -p1 -M 6 +# autopatch is broken in Leap 15.3??? (boo#1189495) +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %endif tar -xf %{SOURCE2} @@ -334,6 +340,7 @@ -DRSTUDIO_USE_SYSTEM_BOOST=TRUE \ -DRSTUDIO_USE_SYSTEM_SOCI=TRUE \ -DRSTUDIO_BOOST_SIGNALS_VERSION=2 \ + -DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE \ -DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib} \ %{?rstudio_boost_requested_version:-DRSTUDIO_BOOST_REQUESTED_VERSION=%{rstudio_boost_requested_version}} \ -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt5 ++++++ 0001-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.585063921 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.585063921 +0200 @@ -1,4 +1,4 @@ -From 16da5903326d13ecc32794b4561967c15bbe8a50 Mon Sep 17 00:00:00 2001 +From 29dab1f5996b759ff3c97362e13a316f25641575 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,49 +7,43 @@ dependencies/ subdirectory first. If they are not there, use the system paths instead. --- - src/cpp/session/CMakeLists.txt | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + src/cpp/session/CMakeLists.txt | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index cb45b35ecc..d0b41b13d2 100644 +index 54d15d9055..dc383952df 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -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() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27") -+ -+find_file(MATHJAX_JS_LOCATION -+ NAMES MathJax.js -+ PATHS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27" /usr/share/javascript/mathjax/) -+if("${MATHJAX_JS_LOCATION}" STREQUAL "MATHJAX_JS_LOCATION-NOTFOUND") - message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)") +@@ -48,14 +48,6 @@ else() + endif() --set(PANDOC_VERSION "2.11.4" 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() +-foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" +- "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" +- "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}") +- if(NOT EXISTS "${DEP}") +- message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install") +- endif() +-endforeach() +- # verify embedded packages are available foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) -@@ -535,7 +535,7 @@ if (NOT RSTUDIO_SESSION_WIN32) - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") + file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") +@@ -558,6 +550,14 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) + install(FILES ${R_MODULE_SRC_FILES} + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules) - # install mathjax for local html preview -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27" ++ # install hunspell dictionaries ++ 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") - ++ DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") ++ # icons for database connections -@@ -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}) - 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(DIRECTORY "resources/connections" + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -- -2.30.2 +2.31.1 ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.597063905 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.597063905 +0200 @@ -1,4 +1,4 @@ -From 4a54997e63577ce3161b8f86f729fe3951d730be Mon Sep 17 00:00:00 2001 +From 9a025e6aaa577dfefa02cc8b25272d454db6dcba 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 | 12 ------------ - 1 file changed, 12 deletions(-) + src/cpp/session/CMakeLists.txt | 18 ------------------ + 1 file changed, 18 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index d0b41b13d2..69d6cb2b2b 100644 +index dc383952df..682add3b66 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32) +@@ -554,10 +554,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") @@ -24,21 +24,27 @@ # icons for database connections install(DIRECTORY "resources/connections" DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -@@ -550,14 +546,6 @@ if (NOT RSTUDIO_SESSION_WIN32) +@@ -570,20 +566,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) install(DIRECTORY "resources/dependencies" DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) +- # install hunspell dictionaries +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" +- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") +- +- # install mathjax for local html preview +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" +- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") +- - # 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}) +- file(GLOB PANDOC_FILES "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/pandoc*") - install(FILES ${PANDOC_FILES} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) +- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc") - # install embedded packages foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -- -2.30.2 +2.31.1 ++++++ 0003-Fix-rstudio-exec-path.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.629063863 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.629063863 +0200 @@ -1,4 +1,4 @@ -From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001 +From 8754e2f6b8b46ca57fc3c446c8da48b55a49ceec 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.30.2 +2.31.1 ++++++ 0004-Add-additional-includes-for-aarch64.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.637063852 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.641063847 +0200 @@ -1,16 +1,15 @@ -From 9d38291824497beb433020bd3b58855816936024 Mon Sep 17 00:00:00 2001 +From e2a3f7df916a4959d126e0c34b8f70b1e23de41a 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 4/8] Add additional includes for aarch64 --- src/cpp/core/HtmlUtils.cpp | 1 + - src/cpp/core/file_lock/FileLock.cpp | 1 + src/cpp/r/session/RStdCallbacks.cpp | 1 + - 3 files changed, 3 insertions(+) + 2 files changed, 2 insertions(+) diff --git a/src/cpp/core/HtmlUtils.cpp b/src/cpp/core/HtmlUtils.cpp -index 73de8eebbf..47ba6178f4 100644 +index ca0adb40de..8b083f461f 100644 --- a/src/cpp/core/HtmlUtils.cpp +++ b/src/cpp/core/HtmlUtils.cpp @@ -18,6 +18,7 @@ @@ -19,22 +18,10 @@ #include <boost/format.hpp> +#include <boost/bind.hpp> #include <boost/algorithm/string/predicate.hpp> + #include <boost/bind/bind.hpp> - #include <core/Base64.hpp> -diff --git a/src/cpp/core/file_lock/FileLock.cpp b/src/cpp/core/file_lock/FileLock.cpp -index e68d4b0441..714db65629 100644 ---- a/src/cpp/core/file_lock/FileLock.cpp -+++ b/src/cpp/core/file_lock/FileLock.cpp -@@ -27,6 +27,7 @@ - #include <core/system/Xdg.hpp> - - #include <boost/algorithm/string.hpp> -+#include <boost/bind.hpp> - - // 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 214349b0c6..a4e174f1f1 100644 +index f461632102..937ffcc471 100644 --- a/src/cpp/r/session/RStdCallbacks.cpp +++ b/src/cpp/r/session/RStdCallbacks.cpp @@ -19,6 +19,7 @@ @@ -44,7 +31,7 @@ +#include <boost/bind.hpp> #include <boost/function.hpp> #include <boost/regex.hpp> - + #include <boost/bind/bind.hpp> -- -2.30.2 +2.31.1 ++++++ 0005-Use-system-hunspell.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.645063842 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.649063836 +0200 @@ -1,4 +1,4 @@ -From 548e39fa5b7b117b20d4283d49f0be523c94b378 Mon Sep 17 00:00:00 2001 +From 8baa44c18668f4af96fc0838ac66c745a0d14c0b Mon Sep 17 00:00:00 2001 From: Aaron Puchert <[email protected]> Date: Mon, 7 Sep 2020 11:09:01 +0200 Subject: [PATCH 5/8] Use system hunspell @@ -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 40a889b5ea..166df01af2 100644 +index 06303de4aa..377c377721 100644 --- a/src/cpp/core/CMakeLists.txt +++ b/src/cpp/core/CMakeLists.txt @@ -15,7 +15,11 @@ @@ -45,5 +45,5 @@ return Success(); } -- -2.30.2 +2.31.1 ++++++ 0006-Fix-libclang-usage.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.653063831 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.657063826 +0200 @@ -1,4 +1,4 @@ -From e3bde2087456926b429262253889b8593b4fdc9e Mon Sep 17 00:00:00 2001 +From e93996837bceb3bdae376332be5aca964a2737ff Mon Sep 17 00:00:00 2001 From: Aaron Puchert <[email protected]> Date: Mon, 7 Sep 2020 11:12:26 +0200 Subject: [PATCH 6/8] Fix libclang usage @@ -56,5 +56,5 @@ for (const char* prefix : {"/usr/lib", "/usr/lib64"}) { -- -2.30.2 +2.31.1 ++++++ 0007-use-system-node.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.665063815 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.669063810 +0200 @@ -1,17 +1,17 @@ -From 05f77b171f06b8a66619f4c00b12f521e87e5d1c Mon Sep 17 00:00:00 2001 +From 852801dadb95441c5cc3cdddac62df91006f6d08 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 +Date: Sat, 5 Jun 2021 18:32:16 +0200 Subject: [PATCH 7/8] use system node --- - src/gwt/build.xml | 14 +------------- - 1 file changed, 1 insertion(+), 13 deletions(-) + src/gwt/build.xml | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 899ae7fecd..ac90566667 100644 +index 8092344618..d7889d154c 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -82,19 +82,7 @@ +@@ -82,22 +82,7 @@ </target> <!-- panmirror typescript library --> @@ -27,11 +27,14 @@ - </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"/> +- <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.30.2 +2.31.1 ++++++ 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.681063794 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.681063794 +0200 @@ -1,4 +1,4 @@ -From 0dd9edcdceb1c673e1c96fe54223d03b31f2495a Mon Sep 17 00:00:00 2001 +From 31a42867cabd2680fb3a198d25a1d1d81d046459 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 @@ -30,5 +30,5 @@ void Value::writeFormatted(std::ostream& os) const -- -2.30.2 +2.31.1 ++++++ panmirror-0.1.0-bundled-licenses.txt ++++++ --- /var/tmp/diff_new_pack.A9AJbt/_old 2021-08-25 20:59:26.729063731 +0200 +++ /var/tmp/diff_new_pack.A9AJbt/_new 2021-08-25 20:59:26.733063726 +0200 @@ -1,3 +1,5 @@ +{ +} Apache-2.0 BSD BSD-2-Clause @@ -5,4 +7,6 @@ ISC LGPL-3.0 MIT + "type": "MIT", Unlicense + "url": "https://github.com/isaacs/nopt/raw/master/LICENSE"; ++++++ panmirror-0.1.0-nm.tgz ++++++ /work/SRC/openSUSE:Factory/rstudio/panmirror-0.1.0-nm.tgz /work/SRC/openSUSE:Factory/.rstudio.new.1899/panmirror-0.1.0-nm.tgz differ: char 12, line 1 ++++++ v1.4.1106.tar.gz -> v1.4.1717.tar.gz ++++++ /work/SRC/openSUSE:Factory/rstudio/v1.4.1106.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.1899/v1.4.1717.tar.gz differ: char 13, line 1
