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 <aaronpuch...@alice-dsl.net>
+
+- 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 \
+ -DRSTUDIO_DESKTOP:BOOL=ON \
+ -DRSTUDIO_SERVER:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name}
\
-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
\
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
\
@@ -420,7 +422,7 @@
# fix shebangs from /usr/bin/env bash to
BASH_PATH=$(which bash)
-for f in postback/askpass-passthrough postback/rpostback-askpass
postback/rpostback-editfile postback/rpostback-gitssh
postback/rpostback-pdfviewer r-ldpath rstudio-backtrace.sh; do
+for f in
postback/{askpass-passthrough,rpostback-{askpass,editfile,gitssh,pdfviewer}}
r-ldpath rstudio-backtrace.sh; do
full_path=%{buildroot}%{_libexecdir}/%{name}/bin/$f
sed -i.orig 's:^#\!%{_bindir}/env\s\+bash\s\?$:#\!'"${BASH_PATH}"':'
$full_path
touch -r $full_path.orig $full_path
++++++ 0001-Unbundle-mathjax-and-pandoc.patch ++++++
--- /var/tmp/diff_new_pack.tHSnWG/_old 2022-05-24 20:31:52.930946997 +0200
+++ /var/tmp/diff_new_pack.tHSnWG/_new 2022-05-24 20:31:52.934947001 +0200
@@ -7,43 +7,42 @@
dependencies/ subdirectory first. If they are not there, use the system paths
instead.
---
- src/cpp/session/CMakeLists.txt | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ src/cpp/session/CMakeLists.txt | 22 ----------------------
+ 1 file changed, 22 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
-index 54d15d9055..dc383952df 100644
+index 1dfc977..56e2838 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
-@@ -48,14 +48,6 @@ else()
-
+@@ -64,28 +64,6 @@ else()
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")
+
+-# validate our dependencies exist
+-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
+- RSTUDIO_DEPENDENCIES_MATHJAX_DIR
+- RSTUDIO_DEPENDENCIES_PANDOC_DIR
+- RSTUDIO_DEPENDENCIES_QUARTO_DIR)
+-
+-
+- # skip quarto if not enabled
+- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT
QUARTO_ENABLED)
+- continue()
- endif()
+-
+- # validate existence
+- if(NOT EXISTS "${${VAR}}")
+- message(FATAL_ERROR "${${VAR}} not found (re-run install-dependencies
script to install")
+- endif()
+-
+- # cache variables so they can be seen by configure_file
+- set("${VAR}" "${${VAR}}" CACHE INTERNAL "")
+-
-endforeach()
-
# verify embedded packages are available
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
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 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")
-+
- # icons for database connections
- install(DIRECTORY "resources/connections"
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
--
2.31.1
++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++
--- /var/tmp/diff_new_pack.tHSnWG/_old 2022-05-24 20:31:52.946947011 +0200
+++ /var/tmp/diff_new_pack.tHSnWG/_new 2022-05-24 20:31:52.950947015 +0200
@@ -6,41 +6,42 @@
Because we use the system wide version, there's no need to waste time
installing
the files.
---
- src/cpp/session/CMakeLists.txt | 18 ------------------
- 1 file changed, 18 deletions(-)
+ src/cpp/session/CMakeLists.txt | 26 ----------------------
+ 1 file changed, 26 deletions(-)
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
-index dc383952df..682add3b66 100644
+index 56e2838..6086fc0 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
-@@ -554,10 +554,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT
RSESSION_ALTERNATE_BUILD)
- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
+@@ -646,32 +646,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT
RSESSION_ALTERNATE_BUILD)
+ install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install mathjax for local html preview
-- install(DIRECTORY "${MATHJAX_PATH}"
-- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
--
- # icons for database connections
- install(DIRECTORY "resources/connections"
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
-@@ -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
-- 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")
+- # install quarto (or pandoc if quarto disabled)
+- if(QUARTO_ENABLED)
+- # install some quarto folders into Resources, as needed
+- if(APPLE)
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
+- DESTINATION "${RSTUDIO_INSTALL_BIN}"
+- USE_SOURCE_PERMISSIONS
+- PATTERN "*/share" EXCLUDE)
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/share"
+- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/quarto"
+- USE_SOURCE_PERMISSIONS)
+- else()
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}"
+- DESTINATION "${RSTUDIO_INSTALL_BIN}"
+- USE_SOURCE_PERMISSIONS)
+- endif()
+- else()
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}/"
+- DESTINATION "${RSTUDIO_INSTALL_BIN}/pandoc"
+- USE_SOURCE_PERMISSIONS)
+- endif()
-
# install embedded packages
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
++++++ 0007-use-system-node.patch ++++++
--- /var/tmp/diff_new_pack.tHSnWG/_old 2022-05-24 20:31:52.970947033 +0200
+++ /var/tmp/diff_new_pack.tHSnWG/_new 2022-05-24 20:31:52.974947036 +0200
@@ -1,21 +1,22 @@
-From 852801dadb95441c5cc3cdddac62df91006f6d08 Mon Sep 17 00:00:00 2001
+From a619f0ebae4d57a34e4df9ba20b0654a3064e97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iu...@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
-Subject: [PATCH 7/8] use system node
+Date: Fri, 18 Mar 2022 20:39:52 +0100
+Subject: [PATCH] use system node
---
- src/gwt/build.xml | 17 +----------------
- 1 file changed, 1 insertion(+), 16 deletions(-)
+ src/gwt/build.xml | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index 8092344618..d7889d154c 100644
+index ec9d4c9..691b644 100644
--- a/src/gwt/build.xml
+++ b/src/gwt/build.xml
-@@ -82,22 +82,7 @@
+@@ -84,23 +84,7 @@
</target>
<!-- panmirror typescript library -->
-- <property name="node.version" value="10.19.0"/>
+- <!-- ensure version matches RSTUDIO_NODE_VERSION -->
+- <property name="node.version" value="14.17.5"/>
- <property name="node.dir"
value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
