SHA256
1
0
forked from pool/rstudio
Files
rstudio/remove-panmirror.patch
Detlef Steuer 0486675f82 Accepting request 1171055 from home:aaronpuchert:branches:devel:languages:R:released
- New upstream release 2024.04.0+735.
  * 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 skip-osrelease.patch to skip parsing of /etc/os-release.

OBS-URL: https://build.opensuse.org/request/show/1171055
OBS-URL: https://build.opensuse.org/package/show/devel:languages:R:released/rstudio?expand=0&rev=95
2024-05-02 08:10:13 +00:00

125 lines
5.2 KiB
Diff

Not easy to build. If someone can figure out how to make this work,
this patch can be removed again.
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index a0bc394..657c2e9 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -670,12 +670,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install node
- install(
- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/"
- DESTINATION "${RSTUDIO_INSTALL_BIN}/node"
- USE_SOURCE_PERMISSIONS)
-
# install embedded packages
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 27ffe33..24fd98d 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -83,80 +83,6 @@
<echo>Concatenated acesupport files to 'acesupport.js'</echo>
</target>
- <!-- panmirror typescript library -->
- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
- <property name="node.version" value="18.18.2"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <!-- use yarn from system but will prefer yarn from dependencies if available -->
- <condition property="yarn.bin" value="yarn">
- <not>
- <os family="windows" />
- </not>
- </condition>
- <available
- property="yarn.bin"
- value="${node.dir}/bin/yarn"
- file="${node.dir}/bin/yarn"/>
- <condition property="yarn.bin" value="${node.dir}/node_modules/yarn/bin/yarn.cmd">
- <os family="windows" />
- </condition>
- <!-- use yarn from /opt/rstudio-tools if installed (typical for Docker) -->
- <available
- property="yarn.bin"
- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"
- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/>
- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
- <available
- property="yarn.bin"
- value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"
- file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/>
-
- <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
- <property name="panmirror.build.dir" value="./www/js/panmirror"/>
-
- <!-- use panmirror from /opt/rstudio-tools if available (typical for Docker) -->
- <available
- property="panmirror.dir"
- value="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"
- file="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
- <available
- property="panmirror.dir"
- value="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"
- file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/>
-
- <target name="panmirror" description="Compile panmirror library">
-
- <!-- Make sure a default value for panmirror.minify is set -->
- <condition property="panmirror.minify" value="true">
- <not>
- <isset property="panmirror.minify" />
- </not>
- </condition>
-
- <echo message="yarn location: ${yarn.bin}"/>
- <echo message="panmirror location: ${panmirror.dir}"/>
- <echo message="panmirror minify: ${panmirror.minify}"/>
-
- <mkdir dir="${panmirror.build.dir}"/>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
- <arg value="install"/>
- <arg value="--network-timeout"/>
- <arg value="240000"/>
- </exec>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true">
- <arg value="build"/>
- <arg value="--minify"/>
- <arg value="${panmirror.minify}"/>
- <arg value="--sourcemap"/>
- <arg value="true"/>
- <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/>
- </exec>
- <copy todir="${panmirror.build.dir}">
- <fileset dir="${panmirror.dir}/dist-rstudio"/>
- </copy>
- </target>
-
<target name="javac" description="Compile java source">
<mkdir dir="${build.dir}"/>
<!-- Compile com.google stuff separately from org.rstudio stuff since
@@ -186,9 +112,6 @@
</target>
<target name="gwtc" depends="ext,javac" description="GWT compile to JavaScript">
- <antcall target="panmirror">
- <param name="panmirror.target" value="ide-dist"/>
- </antcall>
<java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler">
<classpath>
<pathelement location="${src.dir}"/>
@@ -237,8 +160,6 @@
<antcall target="generate-i18n"/>
<antcall target="codeserver">
<param name="gwt.main.module" value="org.rstudio.studio.RStudioDesktopSuperDevMode"/>
- <param name="panmirror.target" value="ide-dev"/>
- <param name="panmirror.minify" value="false"/>
</antcall>
</target>