From 27eb077454a71bcb26e65a3a0cb91b2f346559d9 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Thu, 9 Mar 2023 19:58:56 +0700 Subject: [PATCH] rstudio: update to 2022.12.0+353 --- ...0001-Check-for-group_member-in-cmake.patch | 52 ------------- ...de-unistd.h-instead-of-sys-unistd.h.patch} | 4 +- ...heck-for-backtrace-function-in-cmake.patch | 69 ---------------- .../0002-don-t-install-mathjax-pandoc.patch | 55 +++++++++++++ .../patches/0003-fix-rstudio-exec-path.patch | 9 +++ ...-node.patch => 0004-use-system-node.patch} | 19 +---- ...h => 0005-disable-check-for-updates.patch} | 2 +- .../0005-don-t-install-mathjax-pandoc.patch | 48 ------------ .../patches/0006-Fix-rstudio-exec-path.patch | 23 ------ .../0006-disable-seccomp-filter-sandbox.patch | 32 ++++++++ srcpkgs/rstudio/patches/boost173.patch | 78 ------------------- srcpkgs/rstudio/patches/boost176.patch | 20 ----- srcpkgs/rstudio/patches/boost181.patch | 6 +- srcpkgs/rstudio/patches/fix-build.patch | 34 -------- srcpkgs/rstudio/template | 18 ++--- 15 files changed, 113 insertions(+), 356 deletions(-) delete mode 100644 srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch rename srcpkgs/rstudio/patches/{0003-Include-unistd.h-instead-of-sys-unistd.h.patch => 0001-include-unistd.h-instead-of-sys-unistd.h.patch} (57%) delete mode 100644 srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch create mode 100644 srcpkgs/rstudio/patches/0002-don-t-install-mathjax-pandoc.patch create mode 100644 srcpkgs/rstudio/patches/0003-fix-rstudio-exec-path.patch rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (66%) rename srcpkgs/rstudio/patches/{0007-disable-check-for-updates.patch => 0005-disable-check-for-updates.patch} (85%) delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch delete mode 100644 srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch create mode 100644 srcpkgs/rstudio/patches/0006-disable-seccomp-filter-sandbox.patch delete mode 100644 srcpkgs/rstudio/patches/boost173.patch delete mode 100644 srcpkgs/rstudio/patches/boost176.patch delete mode 100644 srcpkgs/rstudio/patches/fix-build.patch diff --git a/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch b/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch deleted file mode 100644 index 55283d48780b..000000000000 --- a/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3f00c73f8b4b57bb965ae618f30684421d55f01e Mon Sep 17 00:00:00 2001 -From: John -Date: Fri, 29 Nov 2019 10:35:44 +0100 -Subject: [PATCH 1/3] Check for group_member in cmake - -instead of trying to use it on all non Apple Unix systems -E.g. the musl libc on Linux also does not provide this function since it -is a nonstandard GNU extension ---- - src/cpp/core/CMakeLists.txt | 1 + - src/cpp/core/config.h.in | 1 + - src/cpp/core/r_util/RSessionContext.cpp | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt -index 7395ff24ee..8cd1080ae8 100644 ---- a/src/cpp/core/CMakeLists.txt -+++ b/src/cpp/core/CMakeLists.txt -@@ -155,6 +155,7 @@ if (UNIX) - check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1) - check_function_exists(getpeereid HAVE_GETPEEREID) - check_function_exists(setresuid HAVE_SETRESUID) -+ check_function_exists(group_member HAVE_GROUP_MEMBER) - if(EXISTS "/proc/self") - set(HAVE_PROCSELF TRUE) - endif() -diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in -index fbf5e6ffa3..cb4ef42be0 100644 ---- a/src/cpp/core/config.h.in -+++ b/src/cpp/core/config.h.in -@@ -24,4 +24,5 @@ - #cmakedefine HAVE_PROCSELF - #cmakedefine HAVE_SETRESUID - #cmakedefine HAVE_SCANDIR_POSIX -+#cmakedefine HAVE_GROUP_MEMBER - #cmakedefine RSTUDIO_SERVER -diff --git src/cpp/core/r_util/RSessionContext.cpp src/cpp/core/r_util/RSessionContext.cpp -index a973b8b816..e36d661fd8 100644 ---- a/src/cpp/core/r_util/RSessionContext.cpp -+++ b/src/cpp/core/r_util/RSessionContext.cpp -@@ -182,7 +182,7 @@ bool isSharedPath(const std::string& projectPath, - if (st.st_gid == user.getGroupId()) - return false; - --#ifndef __APPLE__ -+#ifdef HAVE_GROUP_MEMBER - // not shared if we're in any of the groups that own the directory - // (note that this checks supplementary group IDs only, so the check - // against the primary group ID above is still required) --- -2.24.0 - diff --git a/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch b/srcpkgs/rstudio/patches/0001-include-unistd.h-instead-of-sys-unistd.h.patch similarity index 57% rename from srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch rename to srcpkgs/rstudio/patches/0001-include-unistd.h-instead-of-sys-unistd.h.patch index a6940d837897..c908ee1abda4 100644 --- a/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch +++ b/srcpkgs/rstudio/patches/0001-include-unistd.h-instead-of-sys-unistd.h.patch @@ -1,5 +1,5 @@ ---- a/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ b/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 +--- a/src/cpp/shared_core/FilePath.cpp ++++ b/src/cpp/shared_core/FilePath.cpp @@ -36,7 +36,7 @@ #include #else diff --git a/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch b/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch deleted file mode 100644 index b214df88a7bb..000000000000 --- a/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f6b65fb4b1ab174b4aab898f4bb83d0b83a2bcb1 Mon Sep 17 00:00:00 2001 -From: John -Date: Fri, 29 Nov 2019 10:41:03 +0100 -Subject: [PATCH 2/3] Check for backtrace function in cmake - ---- - src/cpp/core/Backtrace.cpp | 8 +++++--- - src/cpp/core/CMakeLists.txt | 1 + - src/cpp/core/config.h.in | 1 + - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git src/cpp/core/Backtrace.cpp src/cpp/core/Backtrace.cpp -index a345648371..def1189eb0 100644 ---- a/src/cpp/core/Backtrace.cpp -+++ b/src/cpp/core/Backtrace.cpp -@@ -16,7 +16,9 @@ - #include - #include - --#ifndef _WIN32 -+#include "config.h" -+ -+#ifdef HAVE_BACKTRACE - # include - # include - # include -@@ -32,7 +34,7 @@ std::string demangle(const std::string& name) - { - std::string result = name; - --#ifndef _WIN32 -+#ifdef HAVE_BACKTRACE - int status = -1; - char* demangled = ::abi::__cxa_demangle(name.c_str(), nullptr, nullptr, &status); - if (status == 0) { -@@ -46,7 +48,7 @@ std::string demangle(const std::string& name) - - void printBacktrace(std::ostream& os) - { --#ifndef _WIN32 -+#ifdef HAVE_BACKTRACE - - os << "Backtrace (most recent calls first):" << std::endl << std::endl; - -diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt -index 8cd1080ae8..9a18bcae77 100644 ---- a/src/cpp/core/CMakeLists.txt -+++ b/src/cpp/core/CMakeLists.txt -@@ -156,6 +156,7 @@ if (UNIX) - check_function_exists(getpeereid HAVE_GETPEEREID) - check_function_exists(setresuid HAVE_SETRESUID) - check_function_exists(group_member HAVE_GROUP_MEMBER) -+ check_function_exists(backtrace HAVE_BACKTRACE) - if(EXISTS "/proc/self") - set(HAVE_PROCSELF TRUE) - endif() -diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in -index cb4ef42be0..a2ec47c51f 100644 ---- a/src/cpp/core/config.h.in -+++ b/src/cpp/core/config.h.in -@@ -25,4 +25,5 @@ - #cmakedefine HAVE_SETRESUID - #cmakedefine HAVE_SCANDIR_POSIX - #cmakedefine HAVE_GROUP_MEMBER -+#cmakedefine HAVE_BACKTRACE - #cmakedefine RSTUDIO_SERVER --- -2.24.0 - diff --git a/srcpkgs/rstudio/patches/0002-don-t-install-mathjax-pandoc.patch b/srcpkgs/rstudio/patches/0002-don-t-install-mathjax-pandoc.patch new file mode 100644 index 000000000000..de48b21f1c62 --- /dev/null +++ b/srcpkgs/rstudio/patches/0002-don-t-install-mathjax-pandoc.patch @@ -0,0 +1,55 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -65,12 +65,8 @@ endif() + + + # validate our dependencies exist +-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR +- RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) ++foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR) + +- + # skip quarto if not enabled + if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) + continue() +@@ -683,38 +679,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 "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}" +- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") +- +- # install quarto (or pandoc if quarto disabled) +- if(QUARTO_ENABLED) +- # install some quarto folders into Resources, as needed +- if(APPLE) +- 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}" +- 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}) + file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") diff --git a/srcpkgs/rstudio/patches/0003-fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0003-fix-rstudio-exec-path.patch new file mode 100644 index 000000000000..02f35b6870d5 --- /dev/null +++ b/srcpkgs/rstudio/patches/0003-fix-rstudio-exec-path.patch @@ -0,0 +1,9 @@ +--- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in ++++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F ++Exec=rstudio %F + Icon=rstudio + Type=Application + Terminal=false diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch similarity index 66% rename from srcpkgs/rstudio/patches/0006-use-system-node.patch rename to srcpkgs/rstudio/patches/0004-use-system-node.patch index 6fdb569599a6..9d52d3a73750 100644 --- a/srcpkgs/rstudio/patches/0006-use-system-node.patch +++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch @@ -1,21 +1,11 @@ -From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= -Date: Sat, 5 Jun 2021 18:32:16 +0200 -Subject: [PATCH] use system node - ---- - src/gwt/build.xml | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 8092344..d7889d1 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -82,22 +82,7 @@ +@@ -84,23 +84,7 @@ -- +- +- - - - @@ -35,6 +25,3 @@ index 8092344..d7889d1 100644 --- -2.31.1 - diff --git a/srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch b/srcpkgs/rstudio/patches/0005-disable-check-for-updates.patch similarity index 85% rename from srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch rename to srcpkgs/rstudio/patches/0005-disable-check-for-updates.patch index dd1eef5eeda2..b34e9df5e5de 100644 --- a/srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch +++ b/srcpkgs/rstudio/patches/0005-disable-check-for-updates.patch @@ -1,6 +1,6 @@ --- a/src/cpp/session/SessionClientInit.cpp +++ b/src/cpp/session/SessionClientInit.cpp -@@ -443,8 +443,7 @@ +@@ -489,8 +489,7 @@ void handleClientInit(const boost::function& initFunction, sessionInfo["disable_packages"] = module_context::disablePackages(); diff --git a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch b/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch deleted file mode 100644 index 6ddea228c47f..000000000000 --- a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4b9b0aa10768df68e80eb8eb03b41b937bc45e9e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= -Date: Sat, 5 Jun 2021 18:21:24 +0200 -Subject: [PATCH] unbundle dependencies common - ---- - 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 54d15d9..a6b41cb 100644 ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -48,14 +48,11 @@ else() - - endif() - --foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}" -+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") - endif() - endforeach() -- - # verify embedded packages are available - foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) - file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") -@@ -574,16 +574,6 @@ - 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 embedded packages - foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES}) - file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz") --- -2.31.1 diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch deleted file mode 100644 index d1ce2c20f973..000000000000 --- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001 -From: Marco Varlese -Date: Mon, 27 Jan 2020 14:29:40 +0100 -Subject: [PATCH 3/8] Fix rstudio exec path - -Fix the path to the rstudio executable in the rstudio.desktop file. ---- - src/cpp/desktop/resources/freedesktop/rstudio.desktop.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in -index ddd96ad34b..99b207ba7c 100644 ---- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in -+++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in -@@ -1,5 +1,5 @@ - [Desktop Entry] --Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F -+Exec=rstudio %F - Icon=rstudio - Type=Application - Terminal=false --- -2.30.2 diff --git a/srcpkgs/rstudio/patches/0006-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-disable-seccomp-filter-sandbox.patch new file mode 100644 index 000000000000..1f19a4b27164 --- /dev/null +++ b/srcpkgs/rstudio/patches/0006-disable-seccomp-filter-sandbox.patch @@ -0,0 +1,32 @@ +--- a/src/cpp/desktop/DesktopMain.cpp ++++ b/src/cpp/desktop/DesktopMain.cpp +@@ -59,10 +59,6 @@ + #include + #endif + +-#ifdef __GLIBC__ +-#include +-#endif +- + QProcess* pRSessionProcess; + QString sharedSecret; + +@@ -645,17 +641,7 @@ int main(int argc, char* argv[]) + + static char disableSeccompFilterSandbox[] = "--disable-seccomp-filter-sandbox"; + +- // newer versions of glibc require us to disable the seccomp filter +- // sandbox, as the sandbox included with the version of chromium bundled +- // with Qt 5.12.x does not play well with newer versions of glibc. +- // +- // the seccomp filter sandbox is used to prevent user-mode applications +- // from executing potentially malicious system calls; however, it doesn't +- // understand some of the newer syscalls introduced in newer versions of +- // Linux (and used by newer versions of glibc) +- const char* libcVersion = gnu_get_libc_version(); +- if (core::Version(libcVersion) >= core::Version("2.34")) +- arguments.push_back(disableSeccompFilterSandbox); ++ arguments.push_back(disableSeccompFilterSandbox); + + #endif + diff --git a/srcpkgs/rstudio/patches/boost173.patch b/srcpkgs/rstudio/patches/boost173.patch deleted file mode 100644 index 24ae1dff66dd..000000000000 --- a/srcpkgs/rstudio/patches/boost173.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 -+++ b/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 -@@ -60,7 +60,7 @@ - std::for_each(processes.begin(), - processes.end(), - boost::bind(&ChildProcessTracker::attemptToReapProcess, -- this, _1)); -+ this, boost::placeholders::_1)); - } - - void ChildProcessTracker::attemptToReapProcess( ---- a/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ b/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 -@@ -104,13 +104,13 @@ - if (dupStdoutFd != -1) - { - boost::shared_ptr pSkipStdoutWrite = boost::make_shared(false); -- outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, "Stdout", pSkipStdoutWrite, _1); -+ outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, "Stdout", pSkipStdoutWrite, boost::placeholders::_1); - } - - if (dupStderrFd != -1) - { - boost::shared_ptr pSkipStderrWrite = boost::make_shared(false); -- errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, "Stderr", pSkipStderrWrite, _1); -+ errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, "Stderr", pSkipStderrWrite, boost::placeholders::_1); - } - - try ---- a/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 -+++ b/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 -@@ -56,7 +56,7 @@ - : boost::iostreams::regex_filter( - boost::regex( - R"((<\s*[Ii][Mm][Gg] [^\>]*[Ss][Rr][Cc]\s*=\s*)(["'])(.*?)(\2))"), -- boost::bind(&Base64ImageFilter::toBase64Image, this, _1)), -+ boost::bind(&Base64ImageFilter::toBase64Image, this, boost::placeholders::_1)), - basePath_(basePath) - { - } -@@ -98,7 +98,7 @@ - CssUrlFilter::CssUrlFilter(const FilePath& basePath) - : boost::iostreams::regex_filter( - boost::regex("url\\('([^'']+)'\\)"), -- boost::bind(&CssUrlFilter::toBase64Url, this, _1)), -+ boost::bind(&CssUrlFilter::toBase64Url, this, boost::placeholders::_1)), - basePath_(basePath) - { - } ---- a/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ b/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 -@@ -577,7 +577,7 @@ - try - { - doHistoryFileOperation(args, boost::bind(&ConsoleHistory::loadFromFile, -- &consoleHistory(), _1, true)); -+ &consoleHistory(), boost::placeholders::_1, true)); - - s_callbacks.consoleHistoryReset(); - } -@@ -592,7 +592,7 @@ - try - { - doHistoryFileOperation(args, boost::bind(&ConsoleHistory::saveToFile, -- &consoleHistory(), _1)); -+ &consoleHistory(), boost::placeholders::_1)); - } - catch(r::exec::RErrorException& e) - { -@@ -614,7 +614,7 @@ - ConsoleHistory& history = consoleHistory(); - std::for_each(commands.begin(), - commands.end(), -- boost::bind(&ConsoleHistory::add, &history, _1)); -+ boost::bind(&ConsoleHistory::add, &history, boost::placeholders::_1)); - } - catch(r::exec::RErrorException& e) - { diff --git a/srcpkgs/rstudio/patches/boost176.patch b/srcpkgs/rstudio/patches/boost176.patch deleted file mode 100644 index ea161d34fe31..000000000000 --- a/srcpkgs/rstudio/patches/boost176.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ b/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 -@@ -17,6 +17,7 @@ - - #include - -+#include - #include - #include - ---- a/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ b/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 -@@ -26,6 +26,7 @@ - #include - #include - -+#include - #include - - // borrowed from SessionConstants.hpp diff --git a/srcpkgs/rstudio/patches/boost181.patch b/srcpkgs/rstudio/patches/boost181.patch index 2e9bd72848db..d7604fc84d38 100644 --- a/srcpkgs/rstudio/patches/boost181.patch +++ b/srcpkgs/rstudio/patches/boost181.patch @@ -1,7 +1,5 @@ -Index: rstudio-1.4.1717/src/cpp/core/include/core/Thread.hpp -=================================================================== ---- rstudio-1.4.1717.orig/src/cpp/core/include/core/Thread.hpp -+++ rstudio-1.4.1717/src/cpp/core/include/core/Thread.hpp +--- a/src/cpp/core/include/core/Thread.hpp ++++ b/src/cpp/core/include/core/Thread.hpp @@ -17,9 +17,11 @@ #define CORE_THREAD_HPP diff --git a/srcpkgs/rstudio/patches/fix-build.patch b/srcpkgs/rstudio/patches/fix-build.patch deleted file mode 100644 index da91b9baf593..000000000000 --- a/srcpkgs/rstudio/patches/fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -Ref: https://www.mail-archive.com/commit@lists.opensuse.org/msg43991.html - -From 872e2806f74e922a25e0f9586faa6624883728ca Mon Sep 17 00:00:00 2001 -From: Kevin Ushey -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 - -+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() - { diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index d667cb554e79..9b6ff7a2f7b5 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio -version=1.4.1717 -revision=5 +version=2022.12.0+353 +revision=1 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON @@ -25,11 +25,11 @@ license="AGPL-3.0-only" homepage="https://www.rstudio.com" distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip - https://github.com/catchorg/Catch2/releases/download/v2.13.10/catch.hpp" -checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261 + https://github.com/catchorg/Catch2/releases/download/v3.3.2/catch_amalgamated.hpp" +checksum="e4f3503e2ad4229301360f56fd5288e5c8e769c490073dae7fe40366237ecce0 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 - 3725c0f0a75f376a5005dde31ead0feb8f7da7507644c201b814443de8355170" -skip_extraction="core-dictionaries.zip catch.hpp" + 8c975a8795cf4ca50a14cfc889bb6e16312b27bcc774e240d3ecfcf71a7dc064" +skip_extraction="core-dictionaries.zip catch_amalgamated.hpp" LDFLAGS="-Wl,-z,stack-size=2097152" @@ -37,12 +37,12 @@ post_extract() { _srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}" unzip -qd ${wrksrc}/dependencies/dictionaries ${_srcdir}/core-dictionaries.zip - cp ${_srcdir}/catch.hpp src/cpp/tests/cpp/tests/vendor/catch.hpp + cp ${_srcdir}/catch_amalgamated.hpp src/cpp/tests/cpp/tests/vendor/catch_amalgamated.hpp } pre_configure() { - _node_ver="10.19.0" - _pandoc_ver="2.11.4" + _node_ver="16.19.0" + _pandoc_ver="2.17.1.1" ln -s /usr/share/mathjax dependencies/common/mathjax-27 mkdir -p dependencies/common/pandoc/$_pandoc_ver/bin ln -s /usr/bin/pandoc dependencies/common/pandoc/$_pandoc_ver/bin