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 <[email protected]> + +- 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 <[email protected]> + +- boost_patches.diff old-boost.patch: fix building with Boost 1.66 + +------------------------------------------------------------------- +Sun Oct 16 09:04:54 UTC 2022 - Libor Pechacek <[email protected]> + +- 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 >= %{boost_version} -BuildRequires: libboost_filesystem-devel-impl >= %{boost_version} -BuildRequires: libboost_headers-devel-impl >= %{boost_version} -BuildRequires: libboost_iostreams-devel-impl >= %{boost_version} -BuildRequires: libboost_program_options-devel-impl >= %{boost_version} -BuildRequires: libboost_random-devel-impl >= %{boost_version} -BuildRequires: libboost_regex-devel-impl >= %{boost_version} -BuildRequires: libboost_system-devel-impl >= %{boost_version} -BuildRequires: libboost_thread-devel-impl >= %{boost_version} +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_chrono-devel +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_headers-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_program_options-devel +BuildRequires: libboost_random-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel BuildRequires: libqt5-qtbase-devel BuildRequires: make BuildRequires: mathjax @@ -190,6 +190,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools BuildRequires: unzip +BuildRequires: cmake(fmt) BuildRequires: cmake(yaml-cpp) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -227,7 +228,7 @@ Recommends: gcc-c++ Recommends: ghc-pandoc-citeproc Recommends: git -Recommends: libclang%{_llvm_sonum} +Recommends: libclang%{_libclang_sonum} Recommends: mathjax Recommends: pandoc Suggests: rstudio-desktop @@ -306,6 +307,9 @@ %patch5 -p1 %patch6 -p1 %patch8 -p1 +%patch9 -p1 +%patch100 -p1 +%patch101 -p1 %endif tar -xf %{SOURCE2} @@ -318,6 +322,7 @@ rm -r \ src/cpp/core/include/core/libclang/clang-c/ \ src/cpp/core/spelling/hunspell/ \ + src/cpp/ext/fmt \ src/cpp/ext/websocketpp \ src/cpp/shared_core/include/shared_core/json/rapidjson/ find src/cpp/core/zlib -type f -not -name '*.cpp' -delete @@ -334,7 +339,7 @@ sed -i 's@gwt_build ALL@gwt_build@g' src/gwt/CMakeLists.txt # The unversioned libclang.so is only part of clang-devel, so we use the versioned so instead. -sed -i 's#LIBCLANG_PLACEHOLDER#%{_libdir}/libclang.so.%{_llvm_sonum}#' src/cpp/core/libclang/LibClang.cpp +sed -i 's#LIBCLANG_PLACEHOLDER#%{_libdir}/libclang.so.%{_libclang_sonum}#' src/cpp/core/libclang/LibClang.cpp %build %sysusers_generate_pre %{SOURCE4} %{name}-server ++++++ 0002-Don-t-install-pandoc-and-mathjax.patch ++++++ --- /var/tmp/diff_new_pack.fErzdV/_old 2023-03-06 18:55:08.988541776 +0100 +++ /var/tmp/diff_new_pack.fErzdV/_new 2023-03-06 18:55:08.992541796 +0100 @@ -9,11 +9,9 @@ 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 56e2838..6086fc0 100644 --- a/src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt -@@ -646,32 +646,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD) +@@ -649,38 +649,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSE install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") @@ -25,13 +23,19 @@ - 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) +- if (RSTUDIO_ELECTRON) +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" +- DESTINATION "${RSTUDIO_INSTALL_RESOURCES}/app" +- USE_SOURCE_PERMISSIONS) +- else() +- 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) +- endif() - else() - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}" - DESTINATION "${RSTUDIO_INSTALL_BIN}" @@ -46,7 +50,4 @@ # install embedded packages foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") --- -2.31.1 - ++++++ 0006-Fix-libclang-usage.patch ++++++ --- /var/tmp/diff_new_pack.fErzdV/_old 2023-03-06 18:55:09.012541898 +0100 +++ /var/tmp/diff_new_pack.fErzdV/_new 2023-03-06 18:55:09.016541919 +0100 @@ -8,11 +8,9 @@ src/cpp/core/libclang/LibClang.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) -diff --git a/src/cpp/core/include/core/libclang/LibClang.hpp b/src/cpp/core/include/core/libclang/LibClang.hpp -index fbb9282b86..f260dd792d 100644 --- a/src/cpp/core/include/core/libclang/LibClang.hpp +++ b/src/cpp/core/include/core/libclang/LibClang.hpp -@@ -35,6 +35,7 @@ +@@ -36,6 +36,7 @@ #include "clang-c/Index.h" #include "clang-c/CXCompilationDatabase.h" @@ -20,11 +18,9 @@ namespace rstudio { namespace core { -diff --git a/src/cpp/core/libclang/LibClang.cpp b/src/cpp/core/libclang/LibClang.cpp -index 1186f3a55a..db80fec800 100644 --- a/src/cpp/core/libclang/LibClang.cpp +++ b/src/cpp/core/libclang/LibClang.cpp -@@ -58,12 +58,11 @@ std::vector<std::string> defaultCompileArgs(LibraryVersion version) +@@ -62,12 +62,11 @@ std::vector<std::string> defaultCompileA // we need to add in the associated libclang headers as // they are not discovered / used by default during compilation @@ -40,7 +36,7 @@ return compileArgs; } -@@ -85,12 +84,9 @@ std::vector<std::string> systemClangVersions() +@@ -89,12 +88,9 @@ std::vector<std::string> systemClangVers #elif defined(__unix__) // default set of versions clangVersions = { @@ -55,7 +51,4 @@ // iterate through the set of available 'llvm' directories for (const char* prefix : {"/usr/lib", "/usr/lib64"}) { --- -2.31.1 - ++++++ 0007-use-system-node.patch ++++++ --- /var/tmp/diff_new_pack.fErzdV/_old 2023-03-06 18:55:09.028541980 +0100 +++ /var/tmp/diff_new_pack.fErzdV/_new 2023-03-06 18:55:09.028541980 +0100 @@ -7,8 +7,6 @@ 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 ec9d4c9..691b644 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml @@ -84,23 +84,7 @@ @@ -16,7 +14,7 @@ <!-- panmirror typescript library --> - <!-- ensure version matches RSTUDIO_NODE_VERSION --> -- <property name="node.version" value="14.17.5"/> +- <property name="node.version" value="16.14.0"/> - <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> - <condition property="node.bin" value="../../../${node.dir}/bin/node"> - <not> @@ -36,7 +34,4 @@ <property name="panmirror.dir" value="./panmirror/src/editor"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> --- -2.31.1 - ++++++ 0009-Fix-false-quarto-warning.patch ++++++ From: Libor Pechacek <[email protected]> Date: Mon, 17 Oct 2022 22:14:12 +0200 Subject: [PATCH] Avoid false warning in absence of Quarto When Quarto is not found, RStudio should not issue the CLI warning. --- a/src/cpp/session/modules/quarto/SessionQuarto.cpp +++ b/src/cpp/session/modules/quarto/SessionQuarto.cpp @@ -268,7 +268,7 @@ void detectQuartoInstallation() LOG_ERROR(error); } } - else + else if (!embeddedVersion.empty()) { showQuartoVersionWarning(embeddedVersion, kQuartoRequiredVersion); } ++++++ missing-include.patch ++++++ diff --git a/src/cpp/core/include/core/Thread.hpp b/src/cpp/core/include/core/Thread.hpp index 9ca7f33..df3a0ad 100644 --- a/src/cpp/core/include/core/Thread.hpp +++ b/src/cpp/core/include/core/Thread.hpp @@ -17,6 +17,7 @@ #define CORE_THREAD_HPP #include <queue> +#include <set> #include <boost/utility.hpp> #include <boost/function.hpp> ++++++ old-boost.patch ++++++ Index: rstudio-2022.07.2-576/src/cpp/CMakeLists.txt =================================================================== --- rstudio-2022.07.2-576.orig/src/cpp/CMakeLists.txt +++ rstudio-2022.07.2-576/src/cpp/CMakeLists.txt @@ -233,7 +233,7 @@ endif() # default Boost versions if(NOT RSTUDIO_BOOST_REQUESTED_VERSION) - set(RSTUDIO_BOOST_REQUESTED_VERSION 1.78.0) + set(RSTUDIO_BOOST_REQUESTED_VERSION 1.66.0) endif() # disable system boost if we're not using it. @@ -281,7 +281,7 @@ if(UNIX) else() add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost) find_package(Boost ${RSTUDIO_BOOST_REQUESTED_VERSION} REQUIRED) - if(NOT Boost_VERSION LESS 106900) + if(NOT Boost_VERSION LESS 106600) list(REMOVE_ITEM BOOST_LIBS signals) endif() find_package(Boost ${RSTUDIO_BOOST_REQUESTED_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS}) ++++++ unbundle-fmt.patch ++++++ diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index b1a91eb..ff44703 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -580,7 +580,7 @@ endif() # external libraries add_subdirectory(ext) -include_directories(SYSTEM "${FMT_SOURCE_DIR}/include") +find_package(fmt REQUIRED) # shared library add_subdirectory(shared_core) diff --git a/src/cpp/ext/CMakeLists.txt b/src/cpp/ext/CMakeLists.txt index 2e08e79..0b4d5fa 100644 --- a/src/cpp/ext/CMakeLists.txt +++ b/src/cpp/ext/CMakeLists.txt @@ -14,6 +14,3 @@ # project (EXT) - -add_subdirectory(fmt) - ++++++ v2022.02.2+485.tar.gz -> v2022.12.0+353.tar.gz ++++++ /work/SRC/openSUSE:Factory/rstudio/v2022.02.2+485.tar.gz /work/SRC/openSUSE:Factory/.rstudio.new.31432/v2022.12.0+353.tar.gz differ: char 13, line 1
