commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2024-05-02 23:47:54 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1880 (New) Package is "rstudio" Thu May 2 23:47:54 2024 rev:28 rq:1171310 version:2024.04.0+735 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2024-02-23 16:47:54.988965346 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1880/rstudio.changes 2024-05-03 10:46:00.244435531 +0200 @@ -1,0 +2,88 @@ +Tue Apr 30 21:25:36 UTC 2024 - Aaron Puchert + +- New upstream release 2024.04.0+735. (boo#1223378) + * RStudio now requires R 3.6.0 or newer. + * RStudio's auto-completion system now supports ggplot2 aesthetic +names and data columns. + * RStudio's auto-completion system now supports the display of +the "label" attribute. + * RStudio Desktop on Windows and Linux supports auto-hiding the +menu bar. + * RStudio Desktop on Windows and Linux supports full-screen mode +via F11. + * RStudio Desktop now supports pasting of file paths for files +copied to the clipboard. + * RStudio now reports a diagnostics warning when `=` (rather than +`==`) is used in `if`, `for`, and `while` conditionals. + * R projects can be given a custom display name in Project Options. + * The automatic display of Copilot code completions can now be +controlled via a user preference. + * Copilot code suggestions can now be requested via the keyboard +shortcut `Ctrl + \`. + * The next word in a Copilot code suggestion can now be accepted +via `Ctrl + Right` (`Cmd + Right` on macOS). + * RStudio now highlights and lints Quarto chunk options in Python +code chunks. + * RStudio no longer highlights `\[ \]` and `\( \)` Mathjax +equations; prefer `$$ $$` and `$ $` instead. + * Added cmake option to build RStudio without the check for +updates feature. + * Allow choosing R from non-standard location at startup. + * Add `EnvironmentFile` support to systemd service definitions. + * RStudio's GWT sources can now be built with JDKs > 11. + * Show grey background instead of solid-white during Desktop +startup. + * The 'restartSession()' API method gains the 'clean' argument. + * 'dot' chunks in R Markdown documents are now executable. + * (rstudioapi) Fixed an issue where selectFile() did not parse +filter strings in a cross-platform way. + * RStudio now reports repository validation errors (if any) when +adding secondary repositories in the Global Options -> Packages +pane. + * The working directory of a background job now defaults to the +.Rproj location when a project is open. + * Add search results copy button and search results breadcrumbs +to RStudio User Guide. + * RStudio now supports generation of a Copilot diagnostic report +from the Copilot preferences pane. + * The RStudio debugger is now better at matching debugged code to +source documents. + * RStudio no longer includes spurious chunk markers from Copilot +completion results. + * Added new commands which toggle the maximized state of Console, +Source, and Tab Group quadrants [Accessibility]. + * RStudio now prints a warning if an overly-long line of console +input is truncated when sending to R. + * RStudio now supports highlighting of inline YAML chunk options +in R Markdown / Quarto documents. + * RStudio now supports auto-completion following `@` via +`.AtNames`. + * RStudio now supports the execution and display of GraphViz +(`dot`) graphs in R Markdown / Quarto chunks. + * RStudio now supports the execution of chunks with the 'file' +option set. + * RStudio now supports `LuaLaTeX` to compile Sweave/Rnw +documents. + * RStudio now supports pasting of file paths for files copied to +the clipboard. + * Improved support for development documentation when a package +has been loaded via `devtools::load_all()`. + * Better error message when user preferences fail to save due to +folder permissions. + * With screen reader support enabled, hitting ESC key allows +Tabbing away from editor. +- Rebase patches: + * 0002-Don-t-install-pandoc-and-mathjax.patch + * old-boost.patch + * remove-panmirror.patch +- Set RSTUDIO_BOOST_REQUESTED_VERSION on all Leap versions. +- Relax Java version requirement, Java > 11 is now supported. +- Add fix-boost-1.85-build.patch to fix build with Boost 1.85. +- Add fix-boost-1.66-build.patch from Michael Pujos to fix build + with Leap's older Boost 1.66. We can't use Boost 1.75 because it + conflicts with Boost 1.66 required by soci-devel. +- Add respect-system-yaml-cpp.patch to make sure our choice of + RSTUDIO_USE_SYSTEM_YAML_CPP=TRUE is respected. +- Add
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2024-02-23 16:46:58 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1770 (New) Package is "rstudio" Fri Feb 23 16:46:58 2024 rev:27 rq:1149925 version:2023.09.1+494 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2023-12-04 23:01:59.512684034 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1770/rstudio.changes 2024-02-23 16:47:54.988965346 +0100 @@ -1,0 +2,6 @@ +Fri Feb 23 11:41:36 UTC 2024 - Dominique Leuenberger + +- USe %autosetup: all supported openSUSE versions support this by + now. + +--- Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.u5Q2Uj/_old 2024-02-23 16:47:56.685026851 +0100 +++ /var/tmp/diff_new_pack.u5Q2Uj/_new 2024-02-23 16:47:56.689026996 +0100 @@ -1,7 +1,7 @@ # # spec file for package rstudio # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -284,21 +284,7 @@ supporting libraries %prep -%if 0%{?sle_version} == 150200 %autosetup -p1 -n %{name}-%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}-%{rstudio_version_suffix} -%else -%autosetup -N -n %{name}-%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}-%{rstudio_version_suffix} -# autopatch is broken in Leap 15.3⦠(boo#1189495) -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch9 -p1 -%patch100 -p1 -%endif # use system libraries when available rm -r \
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2023-06-21 22:39:58 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.15902 (New) Package is "rstudio" Wed Jun 21 22:39:58 2023 rev:25 rq:1094313 version:2023.06.0+421 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2023-04-02 19:18:47.556950277 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.15902/rstudio.changes 2023-06-21 22:40:58.626774853 +0200 @@ -1,0 +2,5 @@ +Tue Jun 20 09:22:08 UTC 2023 - Haochuan Chen + +- New upstream release 2023.06.0+421. + +--- Old: v2023.03.0+386.tar.gz New: v2023.06.0+421.tar.gz Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.xbY9uy/_old 2023-06-21 22:41:02.342797216 +0200 +++ /var/tmp/diff_new_pack.xbY9uy/_new 2023-06-21 22:41:02.346797241 +0200 @@ -94,11 +94,11 @@ %define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} %global rstudio_version_major 2023 -%global rstudio_version_minor 03 +%global rstudio_version_minor 06 %global rstudio_version_patch 0 -%global rstudio_version_suffix 386 +%global rstudio_version_suffix 421 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 3c53477afb13ab959aeb5b34df1f10c237b256c3 +%global rstudio_git_revision_hash 583b465ecc45e60ee9de085148cd2f9741cc5214 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}+%{rstudio_version_suffix} Release:0 ++ v2023.03.0+386.tar.gz -> v2023.06.0+421.tar.gz ++ /work/SRC/openSUSE:Factory/rstudio/v2023.03.0+386.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.15902/v2023.06.0+421.tar.gz differ: char 13, line 1
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2023-04-02 19:18:46 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.9019 (New) Package is "rstudio" Sun Apr 2 19:18:46 2023 rev:24 rq:1076735 version:2023.03.0+386 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2023-03-06 18:55:04.048516570 +0100 +++ /work/SRC/openSUSE:Factory/.rstudio.new.9019/rstudio.changes 2023-04-02 19:18:47.556950277 +0200 @@ -1,0 +2,12 @@ +Sun Apr 2 12:19:26 UTC 2023 - Aaron Puchert + +- New upstream release 2023.03.0+386. +- Replace 0007-use-system-node.patch by remove-panmirror.patch. + Building panmirror seems to have gotten more complicated, and I + can't figure out how to make it work. So let's remove it for now. +- Remove obsolete patches: + * 0009-Fix-false-quarto-warning.patch + * missing-include.patch +- Make 0006-Fix-libclang-usage.patch work with Clang 16. + +--- Old: 0007-use-system-node.patch 0009-Fix-false-quarto-warning.patch missing-include.patch panmirror-0.1.0-bundled-licenses.txt panmirror-0.1.0-nm.tgz v2022.12.0+353.tar.gz New: remove-panmirror.patch v2023.03.0+386.tar.gz Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.cT3xoY/_old 2023-04-02 19:18:53.380979520 +0200 +++ /var/tmp/diff_new_pack.cT3xoY/_new 2023-04-02 19:18:53.388979560 +0200 @@ -83,9 +83,6 @@ %global bundled_elemental2_version1.0.0 # - 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 @@ -96,12 +93,12 @@ %endif %define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} -%global rstudio_version_major 2022 -%global rstudio_version_minor 12 +%global rstudio_version_major 2023 +%global rstudio_version_minor 03 %global rstudio_version_patch 0 -%global rstudio_version_suffix 353 +%global rstudio_version_suffix 386 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 7d165dcfc1b6d300eb247738db2c7076234f6ef0 +%global rstudio_git_revision_hash 3c53477afb13ab959aeb5b34df1f10c237b256c3 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}+%{rstudio_version_suffix} Release:0 @@ -128,9 +125,6 @@ # 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 @@ -143,15 +137,12 @@ Patch4: 0005-Use-system-hunspell.patch # Make sure we find the right libclang.so and builtin headers, make compatible with newer versions. 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 +# Remove panmirror until someone figures out how to include it again. +Patch6: remove-panmirror.patch # Leap 15.2 only patch Patch7: 0008-Add-support-for-RapidJSON-1.1.0-in-Leap-15.2.patch -Patch8: 0009-Fix-false-quarto-warning.patch Patch9: unbundle-fmt.patch Patch100: old-boost.patch -Patch101: missing-include.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel @@ -181,7 +172,6 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: make BuildRequires: mathjax -BuildRequires: nodejs-common BuildRequires: pam-devel BuildRequires: pandoc BuildRequires: pkgconfig @@ -306,18 +296,10 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch8 -p1 %patch9 -p1 %patch100 -p1 -%patch101 -p1 %endif -tar -xf %{SOURCE2} -mkdir
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2023-03-06 18:55:00 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.31432 (New) Package is "rstudio" Mon Mar 6 18:55:00 2023 rev:23 rq:1069470 version:2022.12.0+353 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2022-05-24 20:31:48.882943384 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.31432/rstudio.changes 2023-03-06 18:55:04.048516570 +0100 @@ -1,0 +2,25 @@ +Sat Mar 4 20:15:56 UTC 2023 - Aaron Puchert + +- New upstream release 2022.12.0+353. +- Add missing-include.patch to fix build by adding include. +- Add unbundle-fmt.patch to use the system version of fmt. +- Drop boost_patches.diff that landed upstream. +- Use the correct soname for libclang. + +--- +Tue Oct 18 12:17:40 UTC 2022 - Adam Majer + +- boost_patches.diff old-boost.patch: fix building with Boost 1.66 + +--- +Sun Oct 16 09:04:54 UTC 2022 - Libor Pechacek + +- New upstream release v2022.07.2+576. +- Added patch 0009-Fix-false-quarto-warning.patch. +- Refreshed patches: + * 0002-Don-t-install-pandoc-and-mathjax.patch + * 0006-Fix-libclang-usage.patch + * 0007-use-system-node.patch +- Removed patch 0009-Fix-catch-build.patch. + +--- Old: 0009-Fix-catch-build.patch v2022.02.2+485.tar.gz New: 0009-Fix-false-quarto-warning.patch missing-include.patch old-boost.patch unbundle-fmt.patch v2022.12.0+353.tar.gz Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.fErzdV/_old 2023-03-06 18:55:08.956541613 +0100 +++ /var/tmp/diff_new_pack.fErzdV/_new 2023-03-06 18:55:08.960541633 +0100 @@ -1,7 +1,7 @@ # # spec file for package rstudio # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ # - 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 +# - fmt => unbundled # - Google Web Toolkit => bundled as gwt-rstudio (version 1.3), new upstream https://github.com/rstudio/gwt, license is Apache-2.0 %global bundled_gwt_rstudio_version 1.3 # - Guice=> bundled in ./src/gwt/lib/gin/%%{bundled_gin_version}/, version 3.0, license is Apache-2.0 @@ -96,11 +97,11 @@ %define boost_version %{?rstudio_boost_requested_version}%{?!rstudio_boost_requested_version:1.69} %global rstudio_version_major 2022 -%global rstudio_version_minor 02 -%global rstudio_version_patch 2 -%global rstudio_version_suffix 485 +%global rstudio_version_minor 12 +%global rstudio_version_patch 0 +%global rstudio_version_suffix 353 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash 8acbd38b0d4ca3c86c570cf4112a8180c48cc6fb +%global rstudio_git_revision_hash 7d165dcfc1b6d300eb247738db2c7076234f6ef0 Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}+%{rstudio_version_suffix} Release:0 @@ -147,11 +148,10 @@ 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 -# Quick fix for MINSIGSTKSZ no longer being compile-time constant with glibc 2.34. -# This is only used in unit tests, and hopefully they just don't run into signals anyway. -# Upstream fix is https://github.com/catchorg/Catch2/commit/8f277a54c0b9c1d1024dedcb2dec1d206971e745, -# but that's quite large and is hard to apply because the files are concatenated here. -Patch8: 0009-Fix-catch-build.patch +Patch8: 0009-Fix-false-quarto-warning.patch +Patch9: unbundle-fmt.patch +Patch100: old-boost.patch +Patch101: missing-include.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel @@ -167,17 +167,17 @@ # for dir ownership of /usr/share/icons/hicolor/* BuildRequires: hicolor-icon-theme BuildRequires: java -BuildRequires: libboost_atomic-devel-impl >= %{boost_version} -BuildRequires: libboost_chrono-devel-impl >= %{boost_version} -BuildRequires: libboost_date_time-devel-impl >=
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2022-05-24 20:31:21 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.2254 (New) Package is "rstudio" Tue May 24 20:31:21 2022 rev:22 rq:978950 version:2022.02.2+485 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2022-05-22 20:27:26.494265383 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.2254/rstudio.changes 2022-05-24 20:31:48.882943384 +0200 @@ -1,0 +2,10 @@ +Sat May 21 19:48:08 UTC 2022 - Aaron Puchert + +- New upstream release v2022.02.2+485. (boo#1198936) +- Rebase and simplify patches: + * 0001-Unbundle-mathjax-and-pandoc.patch + * 0002-Don-t-install-pandoc-and-mathjax.patch + * 0007-use-system-node.patch +- Drop obsolete 0010-Fix-R-build.patch. + +--- Old: 0010-Fix-R-build.patch v1.4.1743.tar.gz New: v2022.02.2+485.tar.gz Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.tHSnWG/_old 2022-05-24 20:31:52.898946968 +0200 +++ /var/tmp/diff_new_pack.tHSnWG/_new 2022-05-24 20:31:52.902946972 +0200 @@ -95,13 +95,14 @@ %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 1743 +%global rstudio_version_major 2022 +%global rstudio_version_minor 02 +%global rstudio_version_patch 2 +%global rstudio_version_suffix 485 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash bca6ea9e38e43802db1919b6554424eded7a2f5c +%global rstudio_git_revision_hash 8acbd38b0d4ca3c86c570cf4112a8180c48cc6fb Name: rstudio -Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch} +Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}+%{rstudio_version_suffix} Release:0 Summary:RStudio base package # AGPLv3: RStudio, icomoon glyphs @@ -116,7 +117,7 @@ # 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 AND EPL-1.0 -URL:https://github.com/%{name}/ +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: # https://raw.githubusercontent.com/rstudio/rstudio/master/dependencies/tools/sync-hunspell-dictionaries @@ -151,8 +152,6 @@ # Upstream fix is https://github.com/catchorg/Catch2/commit/8f277a54c0b9c1d1024dedcb2dec1d206971e745, # but that's quite large and is hard to apply because the files are concatenated here. Patch8: 0009-Fix-catch-build.patch -# Upstream fix for compilation with newer R. -Patch9: https://github.com/rstudio/rstudio/commit/872e2806f74e922a25e0f9586faa6624883728ca.patch#/0010-Fix-R-build.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel @@ -295,9 +294,9 @@ %prep %if 0%{?sle_version} == 150200 -%autosetup -p1 +%autosetup -p1 -n %{name}-%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}-%{rstudio_version_suffix} %else -%autosetup -N +%autosetup -N -n %{name}-%{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}-%{rstudio_version_suffix} # autopatch is broken in Leap 15.3??? (boo#1189495) %patch0 -p1 %patch1 -p1 @@ -307,7 +306,6 @@ %patch5 -p1 %patch6 -p1 %patch8 -p1 -%patch9 -p1 %endif tar -xf %{SOURCE2} @@ -328,8 +326,8 @@ ln -sf %{_includedir}/rapidjson src/cpp/shared_core/include/shared_core/json/rapidjson # unpack common-dictionaries -mkdir -p dependencies/common/dictionaries -unzip -d dependencies/common/dictionaries %{SOURCE1} +mkdir -p dependencies/dictionaries +unzip -d dependencies/dictionaries %{SOURCE1} # don't include gwt_build in ALL to avoid recompilation, but then we must build # it manually @@ -344,9 +342,13 @@ export RSTUDIO_VERSION_MAJOR=%{rstudio_version_major} export RSTUDIO_VERSION_MINOR=%{rstudio_version_minor} export RSTUDIO_VERSION_PATCH=%{rstudio_version_patch} +export RSTUDIO_VERSION_SUFFIX=+%{rstudio_version_suffix} export RSTUDIO_GIT_REVISION_HASH=%{rstudio_git_revision_hash} export GIT_COMMIT=%{rstudio_git_revision_hash} -%cmake -DRSTUDIO_TARGET=Desktop -DRSTUDIO_SERVER=TRUE -DCMAKE_BUILD_TYPE=Release\ +%cmake -DRSTUDIO_TARGET=Desktop \ +
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2022-05-22 20:27:25 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1538 (New) Package is "rstudio" Sun May 22 20:27:25 2022 rev:21 rq:978438 version:1.4.1743 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2022-04-13 21:07:13.084691870 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1538/rstudio.changes 2022-05-22 20:27:26.494265383 +0200 @@ -1,0 +2,7 @@ +Thu May 19 21:19:48 UTC 2022 - Aaron Puchert + +- New upstream release v1.4.1743. +- Add 0010-Fix-R-build.patch from upstream to fix build with newer + R-core-devel: it just declares the Rf_countContexts locally. + +--- Old: v1.4.1717.tar.gz New: 0010-Fix-R-build.patch v1.4.1743.tar.gz Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.uK7YQG/_old 2022-05-22 20:27:30.834271773 +0200 +++ /var/tmp/diff_new_pack.uK7YQG/_new 2022-05-22 20:27:30.842271785 +0200 @@ -97,9 +97,9 @@ %global rstudio_version_major 1 %global rstudio_version_minor 4 -%global rstudio_version_patch 1717 +%global rstudio_version_patch 1743 # commit of the tag belonging to %%{version} -%global rstudio_git_revision_hash df86b69ebdf62f1a9ed51af59c168572677541f1 +%global rstudio_git_revision_hash bca6ea9e38e43802db1919b6554424eded7a2f5c Name: rstudio Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch} Release:0 @@ -151,6 +151,8 @@ # Upstream fix is https://github.com/catchorg/Catch2/commit/8f277a54c0b9c1d1024dedcb2dec1d206971e745, # but that's quite large and is hard to apply because the files are concatenated here. Patch8: 0009-Fix-catch-build.patch +# Upstream fix for compilation with newer R. +Patch9: https://github.com/rstudio/rstudio/commit/872e2806f74e922a25e0f9586faa6624883728ca.patch#/0010-Fix-R-build.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel @@ -305,6 +307,7 @@ %patch5 -p1 %patch6 -p1 %patch8 -p1 +%patch9 -p1 %endif tar -xf %{SOURCE2} ++ 0010-Fix-R-build.patch ++ >From 872e2806f74e922a25e0f9586faa6624883728ca Mon Sep 17 00:00:00 2001 From: Kevin Ushey Date: Wed, 21 Jul 2021 19:56:34 -0700 Subject: [PATCH] support compilation with r-devel --- src/cpp/r/session/RSession.cpp | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cpp/r/session/RSession.cpp b/src/cpp/r/session/RSession.cpp index 0066a61c1b6..6c5f986f6a0 100644 --- a/src/cpp/r/session/RSession.cpp +++ b/src/cpp/r/session/RSession.cpp @@ -68,6 +68,9 @@ #include +extern "C" { +int Rf_countContexts(int, int); +} #define CTXT_BROWSER 16 // get rid of windows TRUE and FALSE definitions @@ -493,7 +496,7 @@ bool isSuspendable(const std::string& currentPrompt) return true; } - + bool browserContextActive() { ++ v1.4.1717.tar.gz -> v1.4.1743.tar.gz ++ /work/SRC/openSUSE:Factory/rstudio/v1.4.1717.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.1538/v1.4.1743.tar.gz differ: char 14, line 1
commit rstudio for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rstudio for openSUSE:Factory checked in at 2022-04-13 21:06:17 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1900 (New) Package is "rstudio" Wed Apr 13 21:06:17 2022 rev:20 rq:969884 version:1.4.1717 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2021-10-25 15:18:04.453699672 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1900/rstudio.changes 2022-04-13 21:07:13.084691870 +0200 @@ -1,0 +2,5 @@ +Wed Apr 13 10:24:11 UTC 2022 - Andreas Schwab + +- Build with jdk 11 to fix build failure + +--- Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.mgDRuw/_old 2022-04-13 21:07:14.444693242 +0200 +++ /var/tmp/diff_new_pack.mgDRuw/_new 2022-04-13 21:07:14.448693246 +0200 @@ -1,7 +1,7 @@ # # spec file for package rstudio # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -219,6 +219,7 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(websocketpp) BuildRequires: pkgconfig(zlib) +BuildConflicts: java-devel >= 12 Requires: R-base Requires: R-core-libs Recommends: gcc
commit rstudio for openSUSE:Factory
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-10-25 15:17:20 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1890 (New) Package is "rstudio" Mon Oct 25 15:17:20 2021 rev:19 rq:927136 version:1.4.1717 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2021-09-03 21:27:08.094254539 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1890/rstudio.changes 2021-10-25 15:18:04.453699672 +0200 @@ -1,0 +2,10 @@ +Sat Oct 23 15:45:10 UTC 2021 - Aaron Puchert + +- Add 0009-Fix-catch-build.patch to fix build with glibc 2.34. + +--- +Fri Sep 10 12:52:54 UTC 2021 - Dominique Leuenberger + +- Exclude build for %ix86: not all dependencies are available. + +--- New: 0009-Fix-catch-build.patch Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.fPytXF/_old 2021-10-25 15:18:05.717700462 +0200 +++ /var/tmp/diff_new_pack.fPytXF/_new 2021-10-25 15:18:05.725700468 +0200 @@ -146,6 +146,11 @@ 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 +# Quick fix for MINSIGSTKSZ no longer being compile-time constant with glibc 2.34. +# This is only used in unit tests, and hopefully they just don't run into signals anyway. +# Upstream fix is https://github.com/catchorg/Catch2/commit/8f277a54c0b9c1d1024dedcb2dec1d206971e745, +# but that's quite large and is hard to apply because the files are concatenated here. +Patch8: 0009-Fix-catch-build.patch BuildRequires: Mesa-devel BuildRequires: R-core-devel @@ -248,6 +253,7 @@ Provides: bundled(reveal.js) = %{bundled_revealjs_version} Provides: bundled(sundown) = %{bundled_sundown_version} Provides: bundled(tree.hh) = %{bundled_treehh_version} +ExcludeArch:%ix86 %{?systemd_requires} %description @@ -297,6 +303,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch8 -p1 %endif tar -xf %{SOURCE2} ++ 0009-Fix-catch-build.patch ++ --- a/src/cpp/tests/cpp/tests/vendor/catch.hpp +++ b/src/cpp/tests/cpp/tests/vendor/catch.hpp @@ -10824,7 +10824,7 @@ // 32kb for the alternate stack seems to be sufficient. However, this value // is experimentally determined, so that's not guaranteed. -static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ; +static constexpr std::size_t sigStackSize = 32768; static SignalDefs signalDefs[] = { { SIGINT, "SIGINT - Terminal interrupt signal" },
commit rstudio for openSUSE:Factory
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-09-03 21:26:19 Comparing /work/SRC/openSUSE:Factory/rstudio (Old) and /work/SRC/openSUSE:Factory/.rstudio.new.1899 (New) Package is "rstudio" Fri Sep 3 21:26:19 2021 rev:18 rq:916738 version:1.4.1717 Changes: --- /work/SRC/openSUSE:Factory/rstudio/rstudio.changes 2021-08-25 20:59:24.097067187 +0200 +++ /work/SRC/openSUSE:Factory/.rstudio.new.1899/rstudio.changes 2021-09-03 21:27:08.094254539 +0200 @@ -1,0 +2,5 @@ +Fri Aug 27 12:43:56 UTC 2021 - Dan ??erm??k + +- Add missing symlink to pandoc + +--- Other differences: -- ++ rstudio.spec ++ --- /var/tmp/diff_new_pack.3WtcWc/_old 2021-09-03 21:27:09.278256880 +0200 +++ /var/tmp/diff_new_pack.3WtcWc/_new 2021-09-03 21:27:09.278256880 +0200 @@ -386,6 +386,12 @@ install -m 0644 %{buildroot}%{_libexecdir}/%{name}/extras/pam/%{name} \ %{buildroot}%{_sysconfdir}/pam.d/%{name} +# symlink the location where the bundled dependencies should be +pushd %{buildroot}%{_libexecdir}/%{name}/bin +mkdir -p pandoc +ln -sf %{_bindir}/pandoc pandoc/pandoc +popd + # symlink the location where the bundled mathjax should be to # /usr/share/javascript/mathjax as mathjax-%%{bundled_mathjax_short_version} ln -sf %{_datadir}/javascript/mathjax \
commit rstudio for openSUSE:Factory
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 + +- 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_version1.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-Clauseqtsingleapplication, 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 >=
commit rstudio for openSUSE:Factory
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 + +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_version1.10.4 -# - jQuery => bundled in ./src/cpp/session/resources/grid/datatables/js/jquery.js, version 3.4.0, license is MIT -%global bundled_jquery_version3.4.0 +# - jQuery => bundled in ./src/cpp/session/resources/grid/datatables/js/jquery.js, version 3.5.1, license is MIT +%global bundled_jquery_version3.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_version1.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
commit rstudio for openSUSE:Factory
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 + +- 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 + +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_version1.10.4 # - jQuery => bundled in ./src/cpp/session/resources/grid/datatables/js/jquery.js, version 3.4.0, license is MIT %global bundled_jquery_version3.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: