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 <aaronpuch...@alice-dsl.net>
+
+- 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_version 1.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 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/ \
@@ -361,6 +343,7 @@
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
\
-DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib}
\
%{?rstudio_boost_requested_version:-DRSTUDIO_BOOST_REQUESTED_VERSION=%{rstudio_boost_requested_version}}
\
+ -DQUARTO_ENABLED:BOOL=FALSE \
-DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt5
%make_build
@@ -447,7 +430,7 @@
%service_del_postun %{rserver_service}
%files
-%license COPYING NOTICE %{rstudio_visual_editor}-bundled-licenses.txt
+%license COPYING NOTICE
%doc README.md
%{_libexecdir}/rstudio
%exclude %{_libexecdir}/rstudio/bin/rserver
++++++ 0006-Fix-libclang-usage.patch ++++++
--- /var/tmp/diff_new_pack.cT3xoY/_old 2023-04-02 19:18:53.432979781 +0200
+++ /var/tmp/diff_new_pack.cT3xoY/_new 2023-04-02 19:18:53.436979801 +0200
@@ -5,8 +5,8 @@
---
src/cpp/core/include/core/libclang/LibClang.hpp | 1 +
- src/cpp/core/libclang/LibClang.cpp | 14 +++++---------
- 2 files changed, 6 insertions(+), 9 deletions(-)
+ src/cpp/core/libclang/LibClang.cpp | 17 +++++++----------
+ 2 files changed, 8 insertions(+), 10 deletions(-)
--- a/src/cpp/core/include/core/libclang/LibClang.hpp
+++ b/src/cpp/core/include/core/libclang/LibClang.hpp
@@ -20,15 +20,17 @@
namespace core {
--- a/src/cpp/core/libclang/LibClang.cpp
+++ b/src/cpp/core/libclang/LibClang.cpp
-@@ -62,12 +62,11 @@ std::vector<std::string> defaultCompileA
+@@ -62,12 +62,12 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion
version)
// we need to add in the associated libclang headers as
// they are not discovered / used by default during compilation
- FilePath llvmPath = s_libraryPath.getParent().getParent();
- boost::format fmt("%1%/lib/clang/%2%/include");
+- fmt % llvmPath.getAbsolutePath() % version.asString();
+ FilePath llvmPath = s_libraryPath.getParent();
+ boost::format fmt("%1%/clang/%2%/include");
- fmt % llvmPath.getAbsolutePath() % version.asString();
++ const std::string& versionStr = version.asString();
++ fmt % llvmPath.getAbsolutePath() % versionStr.substr(0,
versionStr.find('.'));
std::string includePath = fmt.str();
- if (FilePath(includePath).exists())
- compileArgs.push_back(std::string("-I") + includePath);
@@ -36,7 +38,7 @@
return compileArgs;
}
-@@ -89,12 +88,9 @@ std::vector<std::string> systemClangVers
+@@ -89,12 +89,9 @@ std::vector<std::string> systemClangVersions()
#elif defined(__unix__)
// default set of versions
clangVersions = {
++++++ remove-panmirror.patch ++++++
Not easy to build. If someone can figure out how to make this work,
this patch can be removed again.
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 83e9433..9b675c7 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
@@ -83,64 +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="16.14.0"/>
- <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">
- <echo message="yarn location: ${yarn.bin}"/>
- <echo message="panmirror location: ${panmirror.dir}"/>
- <mkdir dir="${panmirror.build.dir}"/>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}"
resolveexecutable="true" failonerror="true">
- <arg value="install"/>
- </exec>
- <exec executable="${yarn.bin}" dir="${panmirror.dir}"
resolveexecutable="true" failonerror="true">
- <arg value="build"/>
- <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
@@ -170,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}"/>
@@ -221,7 +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"/>
</antcall>
</target>
++++++ v2022.12.0+353.tar.gz -> v2023.03.0+386.tar.gz ++++++
/work/SRC/openSUSE:Factory/rstudio/v2022.12.0+353.tar.gz
/work/SRC/openSUSE:Factory/.rstudio.new.9019/v2023.03.0+386.tar.gz differ: char
13, line 1
