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 <aaronpuch...@alice-dsl.net> + +- 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 <kevinus...@gmail.com> 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 <gsl/gsl> +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