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-04-08 21:32:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rstudio" Thu Apr 8 21:32:02 2021 rev:16 rq:883540 version:1.4.1106 Changes: -------- --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2021-03-30 21:38:17.442766958 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2401/rstudio.changes 2021-04-08 21:32:07.839804829 +0200 @@ -1,0 +2,31 @@ +Tue Apr 6 10:09:27 UTC 2021 - Dan ??erm??k <[email protected]> + +New upstream release v1.4.1106 + +Add nodejs dependency bundle for the new visual markdown editor: +https://rstudio.github.io/visual-markdown-editing/ + +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 + +RStudio 1.4 "Tiger Daylily" +Bugfixes + + Fixed issue where R code input could be executed in the wrong order in some cases (#8837) + Fixed issue where default initial working directory was incorrectly set to a project directory (#8683) + Fixed issue causing the second inline equation in a paragraph to fail to render in visual editing mode (#8810) + Fixed issue where session source database sentinel file was not being written correctly when the session is suspended (#8903) + +Misc + + Update Pandoc to 2.11.4 (#8848) + Update jQuery to 3.5.1 (Pro #2314) + +------------------------------------------------------------------- Old: ---- v1.4.1103.tar.gz New: ---- nodejs-bundler.sh panmirror-0.1.0-bundled-licenses.txt panmirror-0.1.0-nm.tgz v1.4.1106.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rstudio.spec ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:10.943808236 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:10.947808240 +0200 @@ -21,7 +21,7 @@ # - QtSingleApplication => bundled at some version, using BSD-3-Clause # - Ace (LGPL v2.1) => bundled at version 1.4.5 (see ./src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/ace/ace-uncompressed.js), license is BSD-3-Clause %global bundled_ace_version 1.4.5 -# - Stan Ace Mode (LGPL 2.1) => does not appear to exist? +# - Stan Ace Mode (LGPL 2.1) => bundled in ./src/gwt/acesupport/acemode/stan.js # - Boost => unbundled # - RapidXml => bundled in ./src/cpp/core/include/core/rapidxml/rapidxml.hpp at version 1.13, license is (BSL-1.0 OR MIT) %global bundled_rapidxml_version 1.13 @@ -55,8 +55,8 @@ # - JSCustomBadge => used as inspiration for ./src/cpp/desktop/DockTileView.mm # - DataTables => bundled in ./src/cpp/session/resources/grid/datatables/js, license is MIT %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 +# - jQuery => bundled in ./src/cpp/session/resources/grid/datatables/js/jquery.js, version 3.5.1, license is MIT +%global bundled_jquery_version 3.5.1 # - 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 @@ -78,37 +78,46 @@ %global bundled_focus_visible_js_version 5.0.2 # - fast-text-encoding => bundled in ./src/gwt/www/js/text.min.js, version 1.0.2, license is Apache-2.0 %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 +%global rstudio_visual_editor panmirror-0.1.0 # 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: +# - 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 15.2, +# override upstream's choice for the boost version on Leap, # but not on Tumbleweed -%if 0%{?sle_version} == 150200 +%if 0%{?sle_version} %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 1103 +%global rstudio_version_patch 1106 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 458706c38764ec79d06ef1214acf07af87ef5795 +%global rstudio_git_revision_hash 2389bc246c7946a8eb2f1a14e5a822bd5f6e1159 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 -# MIT: rsa.js/jsbn, synctex, datatables, jquery, reveal.js, jsbn, qunit.js, xterm.js, guidelines-support-library-lite, rapidjson +# 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 # BSD-3-Clause qtsingleapplication, ace, highlight.js, msinttypes # W3C (2015): focus-visible.js # BSL or MIT: rapidxml # Public Domain: AOP Alliance # GPL-3.0-only: tree.hh # ISC: sundown +# EPL-1.0: junit # dictionaries: see below -License: AGPL-3.0-only AND Apache-2.0 AND MPL-1.1 AND LGPL-2.1-or-later AND GPL-2.0-only AND MIT AND W3C-20150513 AND BSD-3-Clause AND (BSL-1.0 OR MIT) AND GPL-3.0-only AND ISC AND OFL-1.1 AND Zlib AND NPL-1.1 AND CC-BY-4.0 +License: AGPL-3.0-only AND Apache-2.0 AND MPL-1.1 AND LGPL-2.1-or-later AND GPL-2.0-only AND MIT AND W3C-20150513 AND BSD-3-Clause AND (BSL-1.0 OR MIT) AND GPL-3.0-only AND ISC AND OFL-1.1 AND Zlib AND NPL-1.1 AND CC-BY-4.0 AND EPL-1.0 URL: https://github.com/%{name}/ Source0: %{URL}/%{name}/archive/v%{version}.tar.gz # these appear to have been taken from Chromium's source code, see: @@ -119,8 +128,12 @@ # Upstream claims that the only licenses are: # GPL 2.0, LGPL 2.1 (or later), MPL 1.1 and Apache 2.0 Source1: https://s3.amazonaws.com/%{name}-dictionaries/core-dictionaries.zip +# Node dependencies to build visual editor (use ./nodejs-bundler.sh rstudio-%%{version}/src/gwt/panmirror/src/editor/) +Source2: %{rstudio_visual_editor}-nm.tgz +Source3: %{rstudio_visual_editor}-bundled-licenses.txt Source4: %{name}-server-user.conf Source99: %{name}-rpmlintrc +Source100: nodejs-bundler.sh Patch0: 0001-Unbundle-mathjax-and-pandoc.patch # shorten the installation time a bit by not installing mathjax Patch1: 0002-Don-t-install-pandoc-and-mathjax.patch @@ -204,18 +217,19 @@ BuildRequires: pkgconfig(zlib) Requires: R-base Requires: R-core-libs +Recommends: gcc +Recommends: gcc-c++ Recommends: ghc-pandoc-citeproc +Recommends: git Recommends: libclang%{_llvm_sonum} Recommends: mathjax Recommends: pandoc -Recommends: git -Recommends: gcc -Recommends: gcc-c++ Suggests: rstudio-desktop Suggests: rstudio-server Provides: bundled(ace.js) = %{bundled_ace_version} Provides: bundled(aopalliance) = %{bundled_aopalliance_version} Provides: bundled(datatables) = %{bundled_datatables_version} +Provides: bundled(elemental2) = %{bundled_elemental2_version} Provides: bundled(fast-text-encoding) = %{bundled_fast_text_encoding_version} Provides: bundled(focus-visible.js) = %{bundled_focus_visible_js_version} Provides: bundled(fontawesome) @@ -279,6 +293,12 @@ %autopatch -p1 -M 6 %endif +tar -xf %{SOURCE2} +mkdir src/gwt/panmirror/src/editor/node_modules +cp -r node_modules_prod/* src/gwt/panmirror/src/editor/node_modules +cp -r node_modules_dev/* src/gwt/panmirror/src/editor/node_modules +cp %{SOURCE3} . + # use system libraries when available rm -r \ src/cpp/core/include/core/libclang/clang-c/ \ @@ -396,7 +416,7 @@ %service_del_postun %{rserver_service} %files -%license COPYING NOTICE +%license COPYING NOTICE %{rstudio_visual_editor}-bundled-licenses.txt %doc README.md %{_libexecdir}/rstudio %exclude %{_libexecdir}/rstudio/bin/rserver ++++++ 0001-Unbundle-mathjax-and-pandoc.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:10.971808266 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:10.975808270 +0200 @@ -1,4 +1,4 @@ -From a3cb2b39f555f999ffa3d1d0c8f775ab57a83665 Mon Sep 17 00:00:00 2001 +From 16da5903326d13ecc32794b4561967c15bbe8a50 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 @@ -11,7 +11,7 @@ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt -index 9b6017f211..d0b41b13d2 100644 +index cb45b35ecc..d0b41b13d2 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt @@ -22,13 +22,13 @@ add_subdirectory(workers) @@ -26,7 +26,7 @@ +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() --set(PANDOC_VERSION "2.11.2" CACHE INTERNAL "Pandoc version") +-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() @@ -51,5 +51,5 @@ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- -2.29.2 +2.30.2 ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:10.983808280 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:10.983808280 +0200 @@ -1,4 +1,4 @@ -From b96c1517d5c36e75a871cebd048dfc80f441e45b Mon Sep 17 00:00:00 2001 +From 4a54997e63577ce3161b8f86f729fe3951d730be 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 @@ -40,5 +40,5 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -- -2.29.2 +2.30.2 ++++++ 0003-Fix-rstudio-exec-path.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:10.991808288 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:10.991808288 +0200 @@ -1,4 +1,4 @@ -From d62749fea817e91fa24fb47195eceb629d5269c7 Mon Sep 17 00:00:00 2001 +From dec32816aee440573ade653d3b7de9bb606e1da6 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.29.2 +2.30.2 ++++++ 0004-Add-additional-includes-for-aarch64.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:11.003808301 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:11.003808301 +0200 @@ -1,4 +1,4 @@ -From 866b9b941197c842cec59fd1b7a0e5145919ea2f Mon Sep 17 00:00:00 2001 +From 9d38291824497beb433020bd3b58855816936024 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 @@ -46,5 +46,5 @@ #include <boost/regex.hpp> -- -2.29.2 +2.30.2 ++++++ 0005-Use-system-hunspell.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:11.011808310 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:11.011808310 +0200 @@ -1,4 +1,4 @@ -From e0ac60fad5ded87d3145fd887e328775ff5869e9 Mon Sep 17 00:00:00 2001 +From 548e39fa5b7b117b20d4283d49f0be523c94b378 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 @@ -45,5 +45,5 @@ return Success(); } -- -2.29.2 +2.30.2 ++++++ 0006-Fix-libclang-usage.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:11.019808319 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:11.023808323 +0200 @@ -1,4 +1,4 @@ -From fa79914a93db99f8ac4be9dd3ae3664c002867be Mon Sep 17 00:00:00 2001 +From e3bde2087456926b429262253889b8593b4fdc9e 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.29.2 +2.30.2 ++++++ 0007-use-system-node.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:11.031808332 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:11.031808332 +0200 @@ -1,4 +1,4 @@ -From fd74c87287fbedf70479d7b68f95987ab5fb1e34 Mon Sep 17 00:00:00 2001 +From 05f77b171f06b8a66619f4c00b12f521e87e5d1c 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 @@ -33,5 +33,5 @@ <property name="panmirror.dir" value="./panmirror/src/editor"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> -- -2.29.2 +2.30.2 ++++++ 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch ++++++ --- /var/tmp/diff_new_pack.4eF24Q/_old 2021-04-08 21:32:11.039808341 +0200 +++ /var/tmp/diff_new_pack.4eF24Q/_new 2021-04-08 21:32:11.039808341 +0200 @@ -1,4 +1,4 @@ -From 1b1cab3e8967f5db3be28f140f147b90ab7d8d36 Mon Sep 17 00:00:00 2001 +From 0dd9edcdceb1c673e1c96fe54223d03b31f2495a 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.29.2 +2.30.2 ++++++ nodejs-bundler.sh ++++++ #!/bin/bash usage() { echo "Usage `basename $0` <path>" >&2 echo >&2 echo " Given a npm module path, download dependencies," >&2 echo " each in their own tarball." >&2 echo " Also finds licenses prod dependencies." >&2 echo >&2 exit 1 } if ! [ -f /usr/bin/npm ]; then echo >&2 echo "`basename $0` requires npm to run" >&2 echo >&2 echo "Run the following to fix this" >&2 echo " sudo dnf install npm" >&2 echo >&2 exit 2 fi if [ $# -lt 1 ]; then usage else case $1 in -h | --help ) usage ;; * ) PACKAGE="$1" ;; esac fi download_deps () { pushd ${PACKAGE} echo " Downloading $1 dependencies..." npm install --no-optional --only=$1 status=$? popd if [ ${status} -ge 1 ] ; then echo " ERROR WILL ROBINSON" rm -rf ${PACKAGE}/node_modules exit 1 fi mv ${PACKAGE}/node_modules node_modules_$1 } NAME=$(jq -r .name ${PACKAGE}/package.json) VERSION=$(jq -r .version ${PACKAGE}/package.json) download_deps prod echo " Licenses in bundle..." LICENSES="${NAME}-${VERSION}-bundled-licenses.txt" find node_modules* -name "package.json" -exec jq -r .license {} \; > ${LICENSES} find node_modules* -name "package.json" -exec jq -r '.licenses[] .type' {} \; \ >> ${LICENSES} 2>/dev/null sed -i "/^null$/d" ${LICENSES} sort -u -o ${LICENSES} ${LICENSES} echo " Done. Please, check ${LICENSES} and remove the garbage." download_deps dev tar cfz ${NAME}-${VERSION}-nm.tgz node_modules_* rm -rf node_modules_* ++++++ panmirror-0.1.0-bundled-licenses.txt ++++++ Apache-2.0 BSD BSD-2-Clause BSD-3-Clause ISC LGPL-3.0 MIT Unlicense ++++++ v1.4.1103.tar.gz -> v1.4.1106.tar.gz ++++++ /work/SRC/openSUSE:Factory/rstudio/v1.4.1103.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.2401/v1.4.1106.tar.gz differ: char 14, line 1
