* [PR PATCH] rstudio: update to 2022.07.1+554.
@ 2022-09-09 19:26 dexgs
2022-09-09 19:30 ` dexgs
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: dexgs @ 2022-09-09 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
There is a new pull request by dexgs against master on the void-packages repository
https://github.com/dexgs/void-packages rstudio
https://github.com/void-linux/void-packages/pull/39193
rstudio: update to 2022.07.1+554.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/39193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-39193.patch --]
[-- Type: text/x-diff, Size: 22897 bytes --]
From 0c4ae91c8337b756583c5b10cd7955b3f9ba70e1 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Fri, 9 Sep 2022 15:22:26 -0400
Subject: [PATCH] rstudio: update to 2022.07.1+554.
---
.../0000-unbundle-dependencies-common.patch | 88 +++++++++++++++++++
.../0001-unbundle-qtsingleapplication.patch | 63 +++++++++++++
...patch => 0002-fix-rstudio-exec-path.patch} | 10 +--
.../patches/0003-fix-resources-path.patch | 32 +++++++
...-node.patch => 0004-use-system-node.patch} | 17 ++--
.../rstudio/patches/0005-disable-quarto.patch | 52 +++++++++++
.../0005-don-t-install-mathjax-pandoc.patch | 48 ----------
...o-not-disable-seccomp-filter-sandbox.patch | 37 ++++++++
...007-depend-on-Java-source-files-only.patch | 25 ++++++
srcpkgs/rstudio/template | 33 ++++---
10 files changed, 334 insertions(+), 71 deletions(-)
create mode 100644 srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
create mode 100644 srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
rename srcpkgs/rstudio/patches/{0006-Fix-rstudio-exec-path.patch => 0002-fix-rstudio-exec-path.patch} (77%)
create mode 100644 srcpkgs/rstudio/patches/0003-fix-resources-path.patch
rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (75%)
create mode 100644 srcpkgs/rstudio/patches/0005-disable-quarto.patch
delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
create mode 100644 srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
create mode 100644 srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
diff --git a/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
new file mode 100644
index 000000000000..0cfe58530e36
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,88 @@
+From 2008b179c5b5cd0442c9954531d1c4dd952ad1ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:27:43 +0200
+Subject: [PATCH] unbundle dependencies common
+
+---
+ src/cpp/session/CMakeLists.txt | 58 ----------------------------------
+ 1 file changed, 58 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 2e58351..aa9625b 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -64,28 +64,6 @@ else()
+ endif()
+
+
+-# 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")
+@@ -667,42 +645,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 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")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..90b3a5ed3373
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:37:13 +0200
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index 651bbda..7769577 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
+ DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${CRASHPAD_LIBRARIES}
+@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 4d85eec..cf0285e 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
similarity index 77%
rename from srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
rename to srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
index d1ce2c20f973..35498a30ba2c 100644
--- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
+++ b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
@@ -1,7 +1,7 @@
-From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 3/8] Fix rstudio exec path
+Subject: [PATCH 10/10] Fix rstudio exec path
Fix the path to the rstudio executable in the rstudio.desktop file.
---
@@ -9,15 +9,15 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
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
+index 0a1a387fd2..e8f68277e2 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
++Exec=env QT_QPA_PLATFORM=xcb rstudio %F
Icon=rstudio
Type=Application
Terminal=false
--
-2.30.2
+2.25.0
diff --git a/srcpkgs/rstudio/patches/0003-fix-resources-path.patch b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
new file mode 100644
index 000000000000..20abfc0a3e67
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
@@ -0,0 +1,32 @@
+From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Wed, 11 Nov 2020 12:43:46 +0100
+Subject: [PATCH] fix resources path
+
+---
+ src/cpp/desktop/DesktopOptions.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
+index 673870d..d49c141 100644
+--- a/src/cpp/desktop/DesktopOptions.cpp
++++ b/src/cpp/desktop/DesktopOptions.cpp
+@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+ {
+ if (resourcesPath_.isEmpty())
+ {
+-#ifdef RSTUDIO_PACKAGE_BUILD
+ // release configuration: the 'resources' folder is
+ // part of the supporting files folder
+ resourcesPath_ = supportingFilePath().completePath("resources");
+-#else
+- // developer configuration: the 'resources' folder is
+- // a sibling of the RStudio executable
+- resourcesPath_ = scriptsPath().completePath("resources");
+-#endif
+ }
+
+ return resourcesPath_;
+--
+2.28.0
+
diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch
similarity index 75%
rename from srcpkgs/rstudio/patches/0006-use-system-node.patch
rename to srcpkgs/rstudio/patches/0004-use-system-node.patch
index 6fdb569599a6..2af6b61378a0 100644
--- a/srcpkgs/rstudio/patches/0006-use-system-node.patch
+++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch
@@ -1,21 +1,22 @@
-From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
+From c47c0446362d156d160d912dbb3bd3614fd88868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
+Date: Fri, 8 Jul 2022 15:40:11 +0200
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 8092344..d7889d1 100644
+index 4e1ac4e..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="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@@ -36,5 +37,5 @@ index 8092344..d7889d1 100644
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
-2.31.1
+2.34.1
diff --git a/srcpkgs/rstudio/patches/0005-disable-quarto.patch b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
new file mode 100644
index 000000000000..8ac7db693f77
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
@@ -0,0 +1,52 @@
+From c512c11acc07c2d3749235cd7eeb7edaa5ef90a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:42:42 +0200
+Subject: [PATCH] disable quarto
+
+---
+ CMakeGlobals.txt | 15 ++-------------
+ src/cpp/session/session-options.json | 2 +-
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index 6dfe101..37a1ad1 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -244,19 +244,8 @@ if(LINUX AND EXISTS "/etc/centos-release")
+ endif()
+
+ # quarto support
+-if(LINUX AND UNAME_M STREQUAL aarch64)
+- # disabled on linux aarch64
+- message(STATUS "quarto does not yet support aarch64 builds of Linux; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-elseif(IS_CENTOS7)
+- # disable quarto on Centos 7
+- message(STATUS "quarto is not supported on Centos7; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-else()
+- # enable by default
+- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
+- add_definitions(-DQUARTO_ENABLED)
+-endif()
++message(STATUS "disabling quarto")
++set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+
+ # install freedesktop integration files if we are installing into /usr
+ if(NOT DEFINED RSTUDIO_INSTALL_FREEDESKTOP)
+diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
+index c7ace4c..b2c592c 100644
+--- a/src/cpp/session/session-options.json
++++ b/src/cpp/session/session-options.json
+@@ -702,7 +702,7 @@
+ "name": "external-pandoc-path",
+ "type": "core::FilePath",
+ "memberName": "pandocPath_",
+- "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
++ "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/pandoc"},
+ "description": "Specifies the path to pandoc binaries."
+ },
+ {
+--
+2.34.1
+
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?= <iucar@fedoraproject.org>
-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-do-not-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 000000000000..85b2bf3793ed
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+ arguments.push_back(noSandbox);
+ }
+
+- 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);
+-
+ #endif
+
+ #ifdef Q_OS_WIN32
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
new file mode 100644
index 000000000000..e4967f28aae3
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
@@ -0,0 +1,25 @@
+From b9fe819ef89989c06e69c49437f1c1d59cb942b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 18:19:55 +0200
+Subject: [PATCH] depend on Java source files only
+
+---
+ src/gwt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gwt/CMakeLists.txt b/src/gwt/CMakeLists.txt
+index d9ac4cd..f84619f 100644
+--- a/src/gwt/CMakeLists.txt
++++ b/src/gwt/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(GWT_BUILD)
+ endif()
+
+ # depend on Java source files
+- file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++ file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.java")
+
+ # generated during GWT build command
+ set(GWT_BUILD_TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/timestamp")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c0354b8130cc..fb0fdc75f4a8 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,17 +1,18 @@
# Template file for 'rstudio'
pkgname=rstudio
-version=1.4.1717
-revision=4
+version=2022.07.1+554
+wrksrc="${pkgname}-${version%+*}-${version#*+}"
+revision=1
build_style=cmake
-configure_args="-DRSTUDIO_TARGET=Desktop
+configure_args="-DRSTUDIO_TARGET=Electron
+ -DRSTUDIO_PACKAGE_BUILD=1
-DRSTUDIO_USE_SYSTEM_BOOST=ON
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
-DRSTUDIO_BOOST_SIGNALS_VERSION=2
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+hostmakedepends="unzip pandoc openjdk apache-ant R
+ qt5-host-tools which nodejs-lts yarn git"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
@@ -25,7 +26,7 @@ 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"
-checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
+checksum="1c3fd3fc64e3553ec1ec35758d177a3d4713ae5203493291d7b3b622478f4185
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494"
skip_extraction="core-dictionaries.zip"
@@ -38,21 +39,33 @@ post_extract() {
}
pre_configure() {
- _node_ver="10.19.0"
- _pandoc_ver="2.11.4"
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
+
+ _node_ver="16.14.0"
+ _pandoc_ver="2.18"
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
mkdir -p dependencies/common/node/$_node_ver/bin
ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
+ ln -s /usr/bin/npm dependencies/common/node/$_node_ver/bin/npm
+ ln -s /usr/bin/npx dependencies/common/node/$_node_ver/bin/npx
cd src/gwt
ant draft
+}
+
+pre_install() {
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
_maj_min=${version%*.*}
+ _patch_suffix=${version#*.*.}
export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
- export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+ export RSTUDIO_VERSION_PATCH=${_patch_suffix%+*}
+ export RSTUDIO_VERSION_SUFFIX=${_patch_suffix#*[0-9]}
export PACKAGE_OS=VoidLinux
+
+ export GIT_COMMIT=7872775ebddc40635780ca1ed238934c3345c5de
}
post_install() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
@ 2022-09-09 19:30 ` dexgs
2022-09-16 14:10 ` [PR PATCH] [Updated] " dexgs
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-09 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/39193#issuecomment-1242382188
Comment:
This switches from building the QT gui which is being deprecated to the new electron GUI.
I updated the patches from fedora to ones which are compatible with the current version.
There is a weird problem where cmake detects some change with globbed directories and re-runs during the install step. To work around this, I moved some configuration into the pre_install step, but this is not ideal and should be resolved.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
2022-09-09 19:30 ` dexgs
@ 2022-09-16 14:10 ` dexgs
2022-09-16 14:20 ` dexgs
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-16 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
There is an updated pull request by dexgs against master on the void-packages repository
https://github.com/dexgs/void-packages rstudio
https://github.com/void-linux/void-packages/pull/39193
rstudio: update to 2022.07.1+554.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/39193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-39193.patch --]
[-- Type: text/x-diff, Size: 22897 bytes --]
From 390f29d3a39b3ab44851049c78c90c222d14a7ef Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Fri, 9 Sep 2022 15:22:26 -0400
Subject: [PATCH] rstudio: update to 2022.07.1+554.
---
.../0000-unbundle-dependencies-common.patch | 88 +++++++++++++++++++
.../0001-unbundle-qtsingleapplication.patch | 63 +++++++++++++
...patch => 0002-fix-rstudio-exec-path.patch} | 10 +--
.../patches/0003-fix-resources-path.patch | 32 +++++++
...-node.patch => 0004-use-system-node.patch} | 17 ++--
.../rstudio/patches/0005-disable-quarto.patch | 52 +++++++++++
.../0005-don-t-install-mathjax-pandoc.patch | 48 ----------
...o-not-disable-seccomp-filter-sandbox.patch | 37 ++++++++
...007-depend-on-Java-source-files-only.patch | 25 ++++++
srcpkgs/rstudio/template | 33 ++++---
10 files changed, 334 insertions(+), 71 deletions(-)
create mode 100644 srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
create mode 100644 srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
rename srcpkgs/rstudio/patches/{0006-Fix-rstudio-exec-path.patch => 0002-fix-rstudio-exec-path.patch} (77%)
create mode 100644 srcpkgs/rstudio/patches/0003-fix-resources-path.patch
rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (75%)
create mode 100644 srcpkgs/rstudio/patches/0005-disable-quarto.patch
delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
create mode 100644 srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
create mode 100644 srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
diff --git a/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
new file mode 100644
index 000000000000..0cfe58530e36
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,88 @@
+From 2008b179c5b5cd0442c9954531d1c4dd952ad1ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:27:43 +0200
+Subject: [PATCH] unbundle dependencies common
+
+---
+ src/cpp/session/CMakeLists.txt | 58 ----------------------------------
+ 1 file changed, 58 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 2e58351..aa9625b 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -64,28 +64,6 @@ else()
+ endif()
+
+
+-# 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")
+@@ -667,42 +645,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 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")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..90b3a5ed3373
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:37:13 +0200
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index 651bbda..7769577 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
+ DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${CRASHPAD_LIBRARIES}
+@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 4d85eec..cf0285e 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
similarity index 77%
rename from srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
rename to srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
index d1ce2c20f973..35498a30ba2c 100644
--- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
+++ b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
@@ -1,7 +1,7 @@
-From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 3/8] Fix rstudio exec path
+Subject: [PATCH 10/10] Fix rstudio exec path
Fix the path to the rstudio executable in the rstudio.desktop file.
---
@@ -9,15 +9,15 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
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
+index 0a1a387fd2..e8f68277e2 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
++Exec=env QT_QPA_PLATFORM=xcb rstudio %F
Icon=rstudio
Type=Application
Terminal=false
--
-2.30.2
+2.25.0
diff --git a/srcpkgs/rstudio/patches/0003-fix-resources-path.patch b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
new file mode 100644
index 000000000000..20abfc0a3e67
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
@@ -0,0 +1,32 @@
+From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Wed, 11 Nov 2020 12:43:46 +0100
+Subject: [PATCH] fix resources path
+
+---
+ src/cpp/desktop/DesktopOptions.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
+index 673870d..d49c141 100644
+--- a/src/cpp/desktop/DesktopOptions.cpp
++++ b/src/cpp/desktop/DesktopOptions.cpp
+@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+ {
+ if (resourcesPath_.isEmpty())
+ {
+-#ifdef RSTUDIO_PACKAGE_BUILD
+ // release configuration: the 'resources' folder is
+ // part of the supporting files folder
+ resourcesPath_ = supportingFilePath().completePath("resources");
+-#else
+- // developer configuration: the 'resources' folder is
+- // a sibling of the RStudio executable
+- resourcesPath_ = scriptsPath().completePath("resources");
+-#endif
+ }
+
+ return resourcesPath_;
+--
+2.28.0
+
diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch
similarity index 75%
rename from srcpkgs/rstudio/patches/0006-use-system-node.patch
rename to srcpkgs/rstudio/patches/0004-use-system-node.patch
index 6fdb569599a6..2af6b61378a0 100644
--- a/srcpkgs/rstudio/patches/0006-use-system-node.patch
+++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch
@@ -1,21 +1,22 @@
-From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
+From c47c0446362d156d160d912dbb3bd3614fd88868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
+Date: Fri, 8 Jul 2022 15:40:11 +0200
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 8092344..d7889d1 100644
+index 4e1ac4e..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="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@@ -36,5 +37,5 @@ index 8092344..d7889d1 100644
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
-2.31.1
+2.34.1
diff --git a/srcpkgs/rstudio/patches/0005-disable-quarto.patch b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
new file mode 100644
index 000000000000..8ac7db693f77
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
@@ -0,0 +1,52 @@
+From c512c11acc07c2d3749235cd7eeb7edaa5ef90a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:42:42 +0200
+Subject: [PATCH] disable quarto
+
+---
+ CMakeGlobals.txt | 15 ++-------------
+ src/cpp/session/session-options.json | 2 +-
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index 6dfe101..37a1ad1 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -244,19 +244,8 @@ if(LINUX AND EXISTS "/etc/centos-release")
+ endif()
+
+ # quarto support
+-if(LINUX AND UNAME_M STREQUAL aarch64)
+- # disabled on linux aarch64
+- message(STATUS "quarto does not yet support aarch64 builds of Linux; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-elseif(IS_CENTOS7)
+- # disable quarto on Centos 7
+- message(STATUS "quarto is not supported on Centos7; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-else()
+- # enable by default
+- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
+- add_definitions(-DQUARTO_ENABLED)
+-endif()
++message(STATUS "disabling quarto")
++set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+
+ # install freedesktop integration files if we are installing into /usr
+ if(NOT DEFINED RSTUDIO_INSTALL_FREEDESKTOP)
+diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
+index c7ace4c..b2c592c 100644
+--- a/src/cpp/session/session-options.json
++++ b/src/cpp/session/session-options.json
+@@ -702,7 +702,7 @@
+ "name": "external-pandoc-path",
+ "type": "core::FilePath",
+ "memberName": "pandocPath_",
+- "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
++ "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/pandoc"},
+ "description": "Specifies the path to pandoc binaries."
+ },
+ {
+--
+2.34.1
+
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?= <iucar@fedoraproject.org>
-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-do-not-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 000000000000..85b2bf3793ed
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+ arguments.push_back(noSandbox);
+ }
+
+- 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);
+-
+ #endif
+
+ #ifdef Q_OS_WIN32
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
new file mode 100644
index 000000000000..e4967f28aae3
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
@@ -0,0 +1,25 @@
+From b9fe819ef89989c06e69c49437f1c1d59cb942b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 18:19:55 +0200
+Subject: [PATCH] depend on Java source files only
+
+---
+ src/gwt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gwt/CMakeLists.txt b/src/gwt/CMakeLists.txt
+index d9ac4cd..f84619f 100644
+--- a/src/gwt/CMakeLists.txt
++++ b/src/gwt/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(GWT_BUILD)
+ endif()
+
+ # depend on Java source files
+- file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++ file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.java")
+
+ # generated during GWT build command
+ set(GWT_BUILD_TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/timestamp")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c0354b8130cc..9b0376afd96d 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,17 +1,18 @@
# Template file for 'rstudio'
pkgname=rstudio
-version=1.4.1717
-revision=4
+version=2022.07.1+554
+revision=1
+wrksrc="${pkgname}-${version%+*}-${version#*+}"
build_style=cmake
-configure_args="-DRSTUDIO_TARGET=Desktop
+configure_args="-DRSTUDIO_TARGET=Electron
+ -DRSTUDIO_PACKAGE_BUILD=1
-DRSTUDIO_USE_SYSTEM_BOOST=ON
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
-DRSTUDIO_BOOST_SIGNALS_VERSION=2
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+hostmakedepends="unzip pandoc openjdk apache-ant R
+ qt5-host-tools which nodejs-lts yarn git"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
@@ -25,7 +26,7 @@ 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"
-checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
+checksum="1c3fd3fc64e3553ec1ec35758d177a3d4713ae5203493291d7b3b622478f4185
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494"
skip_extraction="core-dictionaries.zip"
@@ -38,21 +39,33 @@ post_extract() {
}
pre_configure() {
- _node_ver="10.19.0"
- _pandoc_ver="2.11.4"
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
+
+ _node_ver="16.14.0"
+ _pandoc_ver="2.18"
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
mkdir -p dependencies/common/node/$_node_ver/bin
ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
+ ln -s /usr/bin/npm dependencies/common/node/$_node_ver/bin/npm
+ ln -s /usr/bin/npx dependencies/common/node/$_node_ver/bin/npx
cd src/gwt
ant draft
+}
+
+pre_install() {
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
_maj_min=${version%*.*}
+ _patch_suffix=${version#*.*.}
export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
- export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+ export RSTUDIO_VERSION_PATCH=${_patch_suffix%+*}
+ export RSTUDIO_VERSION_SUFFIX=${_patch_suffix#*[0-9]}
export PACKAGE_OS=VoidLinux
+
+ export GIT_COMMIT=7872775ebddc40635780ca1ed238934c3345c5de
}
post_install() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
2022-09-09 19:30 ` dexgs
2022-09-16 14:10 ` [PR PATCH] [Updated] " dexgs
@ 2022-09-16 14:20 ` dexgs
2022-09-19 17:50 ` dexgs
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-16 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
There is an updated pull request by dexgs against master on the void-packages repository
https://github.com/dexgs/void-packages rstudio
https://github.com/void-linux/void-packages/pull/39193
rstudio: update to 2022.07.1+554.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/39193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-39193.patch --]
[-- Type: text/x-diff, Size: 24151 bytes --]
From 5c428016bc0e2dfb37be67acbf0acd9fe3c5c72a Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Fri, 9 Sep 2022 15:22:26 -0400
Subject: [PATCH] rstudio: update to 2022.07.1+554.
---
.../0000-unbundle-dependencies-common.patch | 88 +++++++++++++++++++
.../0001-unbundle-qtsingleapplication.patch | 63 +++++++++++++
...patch => 0002-fix-rstudio-exec-path.patch} | 10 +--
.../patches/0003-fix-resources-path.patch | 32 +++++++
...-node.patch => 0004-use-system-node.patch} | 17 ++--
.../rstudio/patches/0005-disable-quarto.patch | 52 +++++++++++
.../0005-don-t-install-mathjax-pandoc.patch | 48 ----------
...o-not-disable-seccomp-filter-sandbox.patch | 37 ++++++++
...007-depend-on-Java-source-files-only.patch | 25 ++++++
srcpkgs/rstudio/patches/fix-build.patch | 34 -------
srcpkgs/rstudio/template | 33 ++++---
11 files changed, 334 insertions(+), 105 deletions(-)
create mode 100644 srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
create mode 100644 srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
rename srcpkgs/rstudio/patches/{0006-Fix-rstudio-exec-path.patch => 0002-fix-rstudio-exec-path.patch} (77%)
create mode 100644 srcpkgs/rstudio/patches/0003-fix-resources-path.patch
rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (75%)
create mode 100644 srcpkgs/rstudio/patches/0005-disable-quarto.patch
delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
create mode 100644 srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
create mode 100644 srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
delete mode 100644 srcpkgs/rstudio/patches/fix-build.patch
diff --git a/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
new file mode 100644
index 000000000000..0cfe58530e36
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,88 @@
+From 2008b179c5b5cd0442c9954531d1c4dd952ad1ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:27:43 +0200
+Subject: [PATCH] unbundle dependencies common
+
+---
+ src/cpp/session/CMakeLists.txt | 58 ----------------------------------
+ 1 file changed, 58 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 2e58351..aa9625b 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -64,28 +64,6 @@ else()
+ endif()
+
+
+-# 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")
+@@ -667,42 +645,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 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")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..90b3a5ed3373
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:37:13 +0200
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index 651bbda..7769577 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
+ DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${CRASHPAD_LIBRARIES}
+@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 4d85eec..cf0285e 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
similarity index 77%
rename from srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
rename to srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
index d1ce2c20f973..35498a30ba2c 100644
--- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
+++ b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
@@ -1,7 +1,7 @@
-From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 3/8] Fix rstudio exec path
+Subject: [PATCH 10/10] Fix rstudio exec path
Fix the path to the rstudio executable in the rstudio.desktop file.
---
@@ -9,15 +9,15 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
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
+index 0a1a387fd2..e8f68277e2 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
++Exec=env QT_QPA_PLATFORM=xcb rstudio %F
Icon=rstudio
Type=Application
Terminal=false
--
-2.30.2
+2.25.0
diff --git a/srcpkgs/rstudio/patches/0003-fix-resources-path.patch b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
new file mode 100644
index 000000000000..20abfc0a3e67
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
@@ -0,0 +1,32 @@
+From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Wed, 11 Nov 2020 12:43:46 +0100
+Subject: [PATCH] fix resources path
+
+---
+ src/cpp/desktop/DesktopOptions.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
+index 673870d..d49c141 100644
+--- a/src/cpp/desktop/DesktopOptions.cpp
++++ b/src/cpp/desktop/DesktopOptions.cpp
+@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+ {
+ if (resourcesPath_.isEmpty())
+ {
+-#ifdef RSTUDIO_PACKAGE_BUILD
+ // release configuration: the 'resources' folder is
+ // part of the supporting files folder
+ resourcesPath_ = supportingFilePath().completePath("resources");
+-#else
+- // developer configuration: the 'resources' folder is
+- // a sibling of the RStudio executable
+- resourcesPath_ = scriptsPath().completePath("resources");
+-#endif
+ }
+
+ return resourcesPath_;
+--
+2.28.0
+
diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch
similarity index 75%
rename from srcpkgs/rstudio/patches/0006-use-system-node.patch
rename to srcpkgs/rstudio/patches/0004-use-system-node.patch
index 6fdb569599a6..2af6b61378a0 100644
--- a/srcpkgs/rstudio/patches/0006-use-system-node.patch
+++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch
@@ -1,21 +1,22 @@
-From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
+From c47c0446362d156d160d912dbb3bd3614fd88868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
+Date: Fri, 8 Jul 2022 15:40:11 +0200
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 8092344..d7889d1 100644
+index 4e1ac4e..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="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@@ -36,5 +37,5 @@ index 8092344..d7889d1 100644
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
-2.31.1
+2.34.1
diff --git a/srcpkgs/rstudio/patches/0005-disable-quarto.patch b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
new file mode 100644
index 000000000000..8ac7db693f77
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
@@ -0,0 +1,52 @@
+From c512c11acc07c2d3749235cd7eeb7edaa5ef90a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:42:42 +0200
+Subject: [PATCH] disable quarto
+
+---
+ CMakeGlobals.txt | 15 ++-------------
+ src/cpp/session/session-options.json | 2 +-
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index 6dfe101..37a1ad1 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -244,19 +244,8 @@ if(LINUX AND EXISTS "/etc/centos-release")
+ endif()
+
+ # quarto support
+-if(LINUX AND UNAME_M STREQUAL aarch64)
+- # disabled on linux aarch64
+- message(STATUS "quarto does not yet support aarch64 builds of Linux; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-elseif(IS_CENTOS7)
+- # disable quarto on Centos 7
+- message(STATUS "quarto is not supported on Centos7; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-else()
+- # enable by default
+- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
+- add_definitions(-DQUARTO_ENABLED)
+-endif()
++message(STATUS "disabling quarto")
++set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+
+ # install freedesktop integration files if we are installing into /usr
+ if(NOT DEFINED RSTUDIO_INSTALL_FREEDESKTOP)
+diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
+index c7ace4c..b2c592c 100644
+--- a/src/cpp/session/session-options.json
++++ b/src/cpp/session/session-options.json
+@@ -702,7 +702,7 @@
+ "name": "external-pandoc-path",
+ "type": "core::FilePath",
+ "memberName": "pandocPath_",
+- "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
++ "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/pandoc"},
+ "description": "Specifies the path to pandoc binaries."
+ },
+ {
+--
+2.34.1
+
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?= <iucar@fedoraproject.org>
-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-do-not-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 000000000000..85b2bf3793ed
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+ arguments.push_back(noSandbox);
+ }
+
+- 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);
+-
+ #endif
+
+ #ifdef Q_OS_WIN32
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
new file mode 100644
index 000000000000..e4967f28aae3
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
@@ -0,0 +1,25 @@
+From b9fe819ef89989c06e69c49437f1c1d59cb942b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 18:19:55 +0200
+Subject: [PATCH] depend on Java source files only
+
+---
+ src/gwt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gwt/CMakeLists.txt b/src/gwt/CMakeLists.txt
+index d9ac4cd..f84619f 100644
+--- a/src/gwt/CMakeLists.txt
++++ b/src/gwt/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(GWT_BUILD)
+ endif()
+
+ # depend on Java source files
+- file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++ file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.java")
+
+ # generated during GWT build command
+ set(GWT_BUILD_TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/timestamp")
+--
+2.34.1
+
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 <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()
- {
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c0354b8130cc..9b0376afd96d 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,17 +1,18 @@
# Template file for 'rstudio'
pkgname=rstudio
-version=1.4.1717
-revision=4
+version=2022.07.1+554
+revision=1
+wrksrc="${pkgname}-${version%+*}-${version#*+}"
build_style=cmake
-configure_args="-DRSTUDIO_TARGET=Desktop
+configure_args="-DRSTUDIO_TARGET=Electron
+ -DRSTUDIO_PACKAGE_BUILD=1
-DRSTUDIO_USE_SYSTEM_BOOST=ON
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
-DRSTUDIO_BOOST_SIGNALS_VERSION=2
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+hostmakedepends="unzip pandoc openjdk apache-ant R
+ qt5-host-tools which nodejs-lts yarn git"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
@@ -25,7 +26,7 @@ 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"
-checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
+checksum="1c3fd3fc64e3553ec1ec35758d177a3d4713ae5203493291d7b3b622478f4185
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494"
skip_extraction="core-dictionaries.zip"
@@ -38,21 +39,33 @@ post_extract() {
}
pre_configure() {
- _node_ver="10.19.0"
- _pandoc_ver="2.11.4"
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
+
+ _node_ver="16.14.0"
+ _pandoc_ver="2.18"
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
mkdir -p dependencies/common/node/$_node_ver/bin
ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
+ ln -s /usr/bin/npm dependencies/common/node/$_node_ver/bin/npm
+ ln -s /usr/bin/npx dependencies/common/node/$_node_ver/bin/npx
cd src/gwt
ant draft
+}
+
+pre_install() {
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
_maj_min=${version%*.*}
+ _patch_suffix=${version#*.*.}
export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
- export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+ export RSTUDIO_VERSION_PATCH=${_patch_suffix%+*}
+ export RSTUDIO_VERSION_SUFFIX=${_patch_suffix#*[0-9]}
export PACKAGE_OS=VoidLinux
+
+ export GIT_COMMIT=7872775ebddc40635780ca1ed238934c3345c5de
}
post_install() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
` (2 preceding siblings ...)
2022-09-16 14:20 ` dexgs
@ 2022-09-19 17:50 ` dexgs
2022-09-30 17:02 ` dexgs
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-19 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
There is an updated pull request by dexgs against master on the void-packages repository
https://github.com/dexgs/void-packages rstudio
https://github.com/void-linux/void-packages/pull/39193
rstudio: update to 2022.07.1+554.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/39193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-39193.patch --]
[-- Type: text/x-diff, Size: 24667 bytes --]
From 2e7566a44c57946b7542b19ec61283e65b9a1b16 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Fri, 9 Sep 2022 15:22:26 -0400
Subject: [PATCH] rstudio: update to 2022.07.1+554.
---
.../0000-unbundle-dependencies-common.patch | 88 +++++++++++++++++++
.../0001-unbundle-qtsingleapplication.patch | 63 +++++++++++++
...patch => 0002-fix-rstudio-exec-path.patch} | 10 +--
.../patches/0003-fix-resources-path.patch | 32 +++++++
...-node.patch => 0004-use-system-node.patch} | 17 ++--
.../rstudio/patches/0005-disable-quarto.patch | 52 +++++++++++
.../0005-don-t-install-mathjax-pandoc.patch | 48 ----------
...o-not-disable-seccomp-filter-sandbox.patch | 37 ++++++++
...007-depend-on-Java-source-files-only.patch | 25 ++++++
srcpkgs/rstudio/patches/fix-build.patch | 34 -------
srcpkgs/rstudio/template | 47 +++++++---
11 files changed, 344 insertions(+), 109 deletions(-)
create mode 100644 srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
create mode 100644 srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
rename srcpkgs/rstudio/patches/{0006-Fix-rstudio-exec-path.patch => 0002-fix-rstudio-exec-path.patch} (77%)
create mode 100644 srcpkgs/rstudio/patches/0003-fix-resources-path.patch
rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (75%)
create mode 100644 srcpkgs/rstudio/patches/0005-disable-quarto.patch
delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
create mode 100644 srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
create mode 100644 srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
delete mode 100644 srcpkgs/rstudio/patches/fix-build.patch
diff --git a/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
new file mode 100644
index 000000000000..0cfe58530e36
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,88 @@
+From 2008b179c5b5cd0442c9954531d1c4dd952ad1ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:27:43 +0200
+Subject: [PATCH] unbundle dependencies common
+
+---
+ src/cpp/session/CMakeLists.txt | 58 ----------------------------------
+ 1 file changed, 58 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 2e58351..aa9625b 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -64,28 +64,6 @@ else()
+ endif()
+
+
+-# 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")
+@@ -667,42 +645,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 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")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..90b3a5ed3373
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:37:13 +0200
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index 651bbda..7769577 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
+ DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${CRASHPAD_LIBRARIES}
+@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 4d85eec..cf0285e 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
similarity index 77%
rename from srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
rename to srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
index d1ce2c20f973..35498a30ba2c 100644
--- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
+++ b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
@@ -1,7 +1,7 @@
-From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 3/8] Fix rstudio exec path
+Subject: [PATCH 10/10] Fix rstudio exec path
Fix the path to the rstudio executable in the rstudio.desktop file.
---
@@ -9,15 +9,15 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
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
+index 0a1a387fd2..e8f68277e2 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
++Exec=env QT_QPA_PLATFORM=xcb rstudio %F
Icon=rstudio
Type=Application
Terminal=false
--
-2.30.2
+2.25.0
diff --git a/srcpkgs/rstudio/patches/0003-fix-resources-path.patch b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
new file mode 100644
index 000000000000..20abfc0a3e67
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
@@ -0,0 +1,32 @@
+From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Wed, 11 Nov 2020 12:43:46 +0100
+Subject: [PATCH] fix resources path
+
+---
+ src/cpp/desktop/DesktopOptions.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
+index 673870d..d49c141 100644
+--- a/src/cpp/desktop/DesktopOptions.cpp
++++ b/src/cpp/desktop/DesktopOptions.cpp
+@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+ {
+ if (resourcesPath_.isEmpty())
+ {
+-#ifdef RSTUDIO_PACKAGE_BUILD
+ // release configuration: the 'resources' folder is
+ // part of the supporting files folder
+ resourcesPath_ = supportingFilePath().completePath("resources");
+-#else
+- // developer configuration: the 'resources' folder is
+- // a sibling of the RStudio executable
+- resourcesPath_ = scriptsPath().completePath("resources");
+-#endif
+ }
+
+ return resourcesPath_;
+--
+2.28.0
+
diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch
similarity index 75%
rename from srcpkgs/rstudio/patches/0006-use-system-node.patch
rename to srcpkgs/rstudio/patches/0004-use-system-node.patch
index 6fdb569599a6..2af6b61378a0 100644
--- a/srcpkgs/rstudio/patches/0006-use-system-node.patch
+++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch
@@ -1,21 +1,22 @@
-From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
+From c47c0446362d156d160d912dbb3bd3614fd88868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
+Date: Fri, 8 Jul 2022 15:40:11 +0200
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 8092344..d7889d1 100644
+index 4e1ac4e..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="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@@ -36,5 +37,5 @@ index 8092344..d7889d1 100644
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
-2.31.1
+2.34.1
diff --git a/srcpkgs/rstudio/patches/0005-disable-quarto.patch b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
new file mode 100644
index 000000000000..8ac7db693f77
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
@@ -0,0 +1,52 @@
+From c512c11acc07c2d3749235cd7eeb7edaa5ef90a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:42:42 +0200
+Subject: [PATCH] disable quarto
+
+---
+ CMakeGlobals.txt | 15 ++-------------
+ src/cpp/session/session-options.json | 2 +-
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index 6dfe101..37a1ad1 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -244,19 +244,8 @@ if(LINUX AND EXISTS "/etc/centos-release")
+ endif()
+
+ # quarto support
+-if(LINUX AND UNAME_M STREQUAL aarch64)
+- # disabled on linux aarch64
+- message(STATUS "quarto does not yet support aarch64 builds of Linux; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-elseif(IS_CENTOS7)
+- # disable quarto on Centos 7
+- message(STATUS "quarto is not supported on Centos7; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-else()
+- # enable by default
+- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
+- add_definitions(-DQUARTO_ENABLED)
+-endif()
++message(STATUS "disabling quarto")
++set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+
+ # install freedesktop integration files if we are installing into /usr
+ if(NOT DEFINED RSTUDIO_INSTALL_FREEDESKTOP)
+diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
+index c7ace4c..b2c592c 100644
+--- a/src/cpp/session/session-options.json
++++ b/src/cpp/session/session-options.json
+@@ -702,7 +702,7 @@
+ "name": "external-pandoc-path",
+ "type": "core::FilePath",
+ "memberName": "pandocPath_",
+- "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
++ "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/pandoc"},
+ "description": "Specifies the path to pandoc binaries."
+ },
+ {
+--
+2.34.1
+
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?= <iucar@fedoraproject.org>
-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-do-not-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 000000000000..85b2bf3793ed
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+ arguments.push_back(noSandbox);
+ }
+
+- 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);
+-
+ #endif
+
+ #ifdef Q_OS_WIN32
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
new file mode 100644
index 000000000000..e4967f28aae3
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
@@ -0,0 +1,25 @@
+From b9fe819ef89989c06e69c49437f1c1d59cb942b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 18:19:55 +0200
+Subject: [PATCH] depend on Java source files only
+
+---
+ src/gwt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gwt/CMakeLists.txt b/src/gwt/CMakeLists.txt
+index d9ac4cd..f84619f 100644
+--- a/src/gwt/CMakeLists.txt
++++ b/src/gwt/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(GWT_BUILD)
+ endif()
+
+ # depend on Java source files
+- file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++ file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.java")
+
+ # generated during GWT build command
+ set(GWT_BUILD_TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/timestamp")
+--
+2.34.1
+
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 <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()
- {
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c0354b8130cc..cb33fe71517d 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,17 +1,20 @@
# Template file for 'rstudio'
pkgname=rstudio
-version=1.4.1717
-revision=4
+version=2022.07.1+554
+revision=1
+wrksrc="${pkgname}-${version%+*}-${version#*+}"
build_style=cmake
-configure_args="-DRSTUDIO_TARGET=Desktop
+configure_args="-DRSTUDIO_TARGET=Electron
+ -DRSTUDIO_PACKAGE_BUILD=1
-DRSTUDIO_USE_SYSTEM_BOOST=ON
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
-DRSTUDIO_BOOST_SIGNALS_VERSION=2
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+make_cmd=make
+make_install_target=install/fast
+hostmakedepends="unzip pandoc openjdk apache-ant R
+ qt5-host-tools which nodejs-lts yarn git"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
@@ -25,12 +28,15 @@ 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"
-checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
+checksum="1c3fd3fc64e3553ec1ec35758d177a3d4713ae5203493291d7b3b622478f4185
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494"
skip_extraction="core-dictionaries.zip"
LDFLAGS="-Wl,-z,stack-size=2097152"
+
+export CMAKE_GENERATOR="Unix Makefiles"
+
post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
@@ -38,28 +44,41 @@ post_extract() {
}
pre_configure() {
- _node_ver="10.19.0"
- _pandoc_ver="2.11.4"
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
+
ln -s /usr/share/mathjax dependencies/common/mathjax-27
+
+ _pandoc_ver="2.18"
mkdir -p dependencies/common/pandoc/$_pandoc_ver/bin
ln -s /usr/bin/pandoc dependencies/common/pandoc/$_pandoc_ver/bin
+
+ _node_ver="16.14.0"
mkdir -p dependencies/common/node/$_node_ver/bin
ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
- cd src/gwt
- ant draft
+ ln -s /usr/bin/npm dependencies/common/node/$_node_ver/bin/npm
+ ln -s /usr/bin/npx dependencies/common/node/$_node_ver/bin/npx
+
_maj_min=${version%*.*}
+ _patch_suffix=${version#*.*.}
export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
- export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+ export RSTUDIO_VERSION_PATCH=${_patch_suffix%+*}
+ export RSTUDIO_VERSION_SUFFIX=${_patch_suffix#*[0-9]}
export PACKAGE_OS=VoidLinux
+ export GIT_COMMIT=7872775ebddc40635780ca1ed238934c3345c5de
+
+
+ cd src/gwt
+ ant draft
}
post_install() {
mkdir -p ${DESTDIR}/usr/bin
- for f in {diagnostics,rpostback,rsession,rstudio}; do
- ln -sf /usr/lib/rstudio/bin/${f} ${DESTDIR}/usr/bin/
+ ln -sf /usr/lib/rstudio/rstudio ${DESTDIR}/usr/bin/
+ for f in {diagnostics,rpostback,rsession}; do
+ ln -sf /usr/lib/rstudio/resources/app/bin/${f} ${DESTDIR}/usr/bin/
done
vlicense COPYING
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
` (3 preceding siblings ...)
2022-09-19 17:50 ` dexgs
@ 2022-09-30 17:02 ` dexgs
2022-09-30 17:03 ` dexgs
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-30 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
There is an updated pull request by dexgs against master on the void-packages repository
https://github.com/dexgs/void-packages rstudio
https://github.com/void-linux/void-packages/pull/39193
rstudio: update to 2022.07.1+554.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/39193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-39193.patch --]
[-- Type: text/x-diff, Size: 24667 bytes --]
From 060795832965d442116920dbbf5e0b0630140aaa Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Fri, 9 Sep 2022 15:22:26 -0400
Subject: [PATCH] rstudio: update to 2022.07.1+554.
---
.../0000-unbundle-dependencies-common.patch | 88 +++++++++++++++++++
.../0001-unbundle-qtsingleapplication.patch | 63 +++++++++++++
...patch => 0002-fix-rstudio-exec-path.patch} | 10 +--
.../patches/0003-fix-resources-path.patch | 32 +++++++
...-node.patch => 0004-use-system-node.patch} | 17 ++--
.../rstudio/patches/0005-disable-quarto.patch | 52 +++++++++++
.../0005-don-t-install-mathjax-pandoc.patch | 48 ----------
...o-not-disable-seccomp-filter-sandbox.patch | 37 ++++++++
...007-depend-on-Java-source-files-only.patch | 25 ++++++
srcpkgs/rstudio/patches/fix-build.patch | 34 -------
srcpkgs/rstudio/template | 47 +++++++---
11 files changed, 344 insertions(+), 109 deletions(-)
create mode 100644 srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
create mode 100644 srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
rename srcpkgs/rstudio/patches/{0006-Fix-rstudio-exec-path.patch => 0002-fix-rstudio-exec-path.patch} (77%)
create mode 100644 srcpkgs/rstudio/patches/0003-fix-resources-path.patch
rename srcpkgs/rstudio/patches/{0006-use-system-node.patch => 0004-use-system-node.patch} (75%)
create mode 100644 srcpkgs/rstudio/patches/0005-disable-quarto.patch
delete mode 100644 srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
create mode 100644 srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
create mode 100644 srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
delete mode 100644 srcpkgs/rstudio/patches/fix-build.patch
diff --git a/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
new file mode 100644
index 000000000000..0cfe58530e36
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,88 @@
+From 2008b179c5b5cd0442c9954531d1c4dd952ad1ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:27:43 +0200
+Subject: [PATCH] unbundle dependencies common
+
+---
+ src/cpp/session/CMakeLists.txt | 58 ----------------------------------
+ 1 file changed, 58 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 2e58351..aa9625b 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -64,28 +64,6 @@ else()
+ endif()
+
+
+-# 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")
+@@ -667,42 +645,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 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")
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..90b3a5ed3373
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:37:13 +0200
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index 651bbda..7769577 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
+ DesktopSynctex.cpp
+ DesktopJobLauncherOverlay.cpp
+ RemoteDesktopSessionLauncherOverlay.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${CRASHPAD_LIBRARIES}
+@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 4d85eec..cf0285e 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
similarity index 77%
rename from srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
rename to srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
index d1ce2c20f973..35498a30ba2c 100644
--- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
+++ b/srcpkgs/rstudio/patches/0002-fix-rstudio-exec-path.patch
@@ -1,7 +1,7 @@
-From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
From: Marco Varlese <marco.varlese@suse.com>
Date: Mon, 27 Jan 2020 14:29:40 +0100
-Subject: [PATCH 3/8] Fix rstudio exec path
+Subject: [PATCH 10/10] Fix rstudio exec path
Fix the path to the rstudio executable in the rstudio.desktop file.
---
@@ -9,15 +9,15 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
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
+index 0a1a387fd2..e8f68277e2 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
++Exec=env QT_QPA_PLATFORM=xcb rstudio %F
Icon=rstudio
Type=Application
Terminal=false
--
-2.30.2
+2.25.0
diff --git a/srcpkgs/rstudio/patches/0003-fix-resources-path.patch b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
new file mode 100644
index 000000000000..20abfc0a3e67
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0003-fix-resources-path.patch
@@ -0,0 +1,32 @@
+From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Wed, 11 Nov 2020 12:43:46 +0100
+Subject: [PATCH] fix resources path
+
+---
+ src/cpp/desktop/DesktopOptions.cpp | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
+index 673870d..d49c141 100644
+--- a/src/cpp/desktop/DesktopOptions.cpp
++++ b/src/cpp/desktop/DesktopOptions.cpp
+@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+ {
+ if (resourcesPath_.isEmpty())
+ {
+-#ifdef RSTUDIO_PACKAGE_BUILD
+ // release configuration: the 'resources' folder is
+ // part of the supporting files folder
+ resourcesPath_ = supportingFilePath().completePath("resources");
+-#else
+- // developer configuration: the 'resources' folder is
+- // a sibling of the RStudio executable
+- resourcesPath_ = scriptsPath().completePath("resources");
+-#endif
+ }
+
+ return resourcesPath_;
+--
+2.28.0
+
diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0004-use-system-node.patch
similarity index 75%
rename from srcpkgs/rstudio/patches/0006-use-system-node.patch
rename to srcpkgs/rstudio/patches/0004-use-system-node.patch
index 6fdb569599a6..2af6b61378a0 100644
--- a/srcpkgs/rstudio/patches/0006-use-system-node.patch
+++ b/srcpkgs/rstudio/patches/0004-use-system-node.patch
@@ -1,21 +1,22 @@
-From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa Mon Sep 17 00:00:00 2001
+From c47c0446362d156d160d912dbb3bd3614fd88868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
-Date: Sat, 5 Jun 2021 18:32:16 +0200
+Date: Fri, 8 Jul 2022 15:40:11 +0200
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 8092344..d7889d1 100644
+index 4e1ac4e..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="16.14.0"/>
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
- <condition property="node.bin" value="../../../${node.dir}/bin/node">
- <not>
@@ -36,5 +37,5 @@ index 8092344..d7889d1 100644
<property name="panmirror.dir" value="./panmirror/src/editor"/>
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
--
-2.31.1
+2.34.1
diff --git a/srcpkgs/rstudio/patches/0005-disable-quarto.patch b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
new file mode 100644
index 000000000000..8ac7db693f77
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0005-disable-quarto.patch
@@ -0,0 +1,52 @@
+From c512c11acc07c2d3749235cd7eeb7edaa5ef90a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 15:42:42 +0200
+Subject: [PATCH] disable quarto
+
+---
+ CMakeGlobals.txt | 15 ++-------------
+ src/cpp/session/session-options.json | 2 +-
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index 6dfe101..37a1ad1 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -244,19 +244,8 @@ if(LINUX AND EXISTS "/etc/centos-release")
+ endif()
+
+ # quarto support
+-if(LINUX AND UNAME_M STREQUAL aarch64)
+- # disabled on linux aarch64
+- message(STATUS "quarto does not yet support aarch64 builds of Linux; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-elseif(IS_CENTOS7)
+- # disable quarto on Centos 7
+- message(STATUS "quarto is not supported on Centos7; disabling quarto")
+- set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+-else()
+- # enable by default
+- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
+- add_definitions(-DQUARTO_ENABLED)
+-endif()
++message(STATUS "disabling quarto")
++set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
+
+ # install freedesktop integration files if we are installing into /usr
+ if(NOT DEFINED RSTUDIO_INSTALL_FREEDESKTOP)
+diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
+index c7ace4c..b2c592c 100644
+--- a/src/cpp/session/session-options.json
++++ b/src/cpp/session/session-options.json
+@@ -702,7 +702,7 @@
+ "name": "external-pandoc-path",
+ "type": "core::FilePath",
+ "memberName": "pandocPath_",
+- "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
++ "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/pandoc"},
+ "description": "Specifies the path to pandoc binaries."
+ },
+ {
+--
+2.34.1
+
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?= <iucar@fedoraproject.org>
-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-do-not-disable-seccomp-filter-sandbox.patch b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
new file mode 100644
index 000000000000..85b2bf3793ed
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0006-do-not-disable-seccomp-filter-sandbox.patch
@@ -0,0 +1,37 @@
+From c109ef6f7b7f879b24db8574ada3a731a3c3b4a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 3 Jun 2022 16:10:44 +0200
+Subject: [PATCH] do not disable seccomp filter sandbox
+
+---
+ src/cpp/desktop/DesktopMain.cpp | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/src/cpp/desktop/DesktopMain.cpp b/src/cpp/desktop/DesktopMain.cpp
+index 7ab82e1..5cf6127 100644
+--- a/src/cpp/desktop/DesktopMain.cpp
++++ b/src/cpp/desktop/DesktopMain.cpp
+@@ -643,20 +643,6 @@ int main(int argc, char* argv[])
+ arguments.push_back(noSandbox);
+ }
+
+- 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);
+-
+ #endif
+
+ #ifdef Q_OS_WIN32
+--
+2.34.1
+
diff --git a/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
new file mode 100644
index 000000000000..e4967f28aae3
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-depend-on-Java-source-files-only.patch
@@ -0,0 +1,25 @@
+From b9fe819ef89989c06e69c49437f1c1d59cb942b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Fri, 8 Jul 2022 18:19:55 +0200
+Subject: [PATCH] depend on Java source files only
+
+---
+ src/gwt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gwt/CMakeLists.txt b/src/gwt/CMakeLists.txt
+index d9ac4cd..f84619f 100644
+--- a/src/gwt/CMakeLists.txt
++++ b/src/gwt/CMakeLists.txt
+@@ -71,7 +71,7 @@ if(GWT_BUILD)
+ endif()
+
+ # depend on Java source files
+- file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
++ file(GLOB_RECURSE GWT_SOURCE_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.java")
+
+ # generated during GWT build command
+ set(GWT_BUILD_TIMESTAMP "${CMAKE_CURRENT_BINARY_DIR}/timestamp")
+--
+2.34.1
+
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 <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()
- {
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index c0354b8130cc..cb33fe71517d 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,17 +1,20 @@
# Template file for 'rstudio'
pkgname=rstudio
-version=1.4.1717
-revision=4
+version=2022.07.1+554
+revision=1
+wrksrc="${pkgname}-${version%+*}-${version#*+}"
build_style=cmake
-configure_args="-DRSTUDIO_TARGET=Desktop
+configure_args="-DRSTUDIO_TARGET=Electron
+ -DRSTUDIO_PACKAGE_BUILD=1
-DRSTUDIO_USE_SYSTEM_BOOST=ON
-DRSTUDIO_USE_SYSTEM_SOCI=TRUE
-DRSTUDIO_USE_SYSTEM_YAML_CPP=TRUE
-DRSTUDIO_BOOST_SIGNALS_VERSION=2
- -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts"
+make_cmd=make
+make_install_target=install/fast
+hostmakedepends="unzip pandoc openjdk apache-ant R
+ qt5-host-tools which nodejs-lts yarn git"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
@@ -25,12 +28,15 @@ 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"
-checksum="3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261
+checksum="1c3fd3fc64e3553ec1ec35758d177a3d4713ae5203493291d7b3b622478f4185
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494"
skip_extraction="core-dictionaries.zip"
LDFLAGS="-Wl,-z,stack-size=2097152"
+
+export CMAKE_GENERATOR="Unix Makefiles"
+
post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
@@ -38,28 +44,41 @@ post_extract() {
}
pre_configure() {
- _node_ver="10.19.0"
- _pandoc_ver="2.11.4"
+ export RSTUDIO_TOOLS_ROOT=${wrksrc}/dependencies
+
ln -s /usr/share/mathjax dependencies/common/mathjax-27
+
+ _pandoc_ver="2.18"
mkdir -p dependencies/common/pandoc/$_pandoc_ver/bin
ln -s /usr/bin/pandoc dependencies/common/pandoc/$_pandoc_ver/bin
+
+ _node_ver="16.14.0"
mkdir -p dependencies/common/node/$_node_ver/bin
ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
- cd src/gwt
- ant draft
+ ln -s /usr/bin/npm dependencies/common/node/$_node_ver/bin/npm
+ ln -s /usr/bin/npx dependencies/common/node/$_node_ver/bin/npx
+
_maj_min=${version%*.*}
+ _patch_suffix=${version#*.*.}
export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
- export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+ export RSTUDIO_VERSION_PATCH=${_patch_suffix%+*}
+ export RSTUDIO_VERSION_SUFFIX=${_patch_suffix#*[0-9]}
export PACKAGE_OS=VoidLinux
+ export GIT_COMMIT=7872775ebddc40635780ca1ed238934c3345c5de
+
+
+ cd src/gwt
+ ant draft
}
post_install() {
mkdir -p ${DESTDIR}/usr/bin
- for f in {diagnostics,rpostback,rsession,rstudio}; do
- ln -sf /usr/lib/rstudio/bin/${f} ${DESTDIR}/usr/bin/
+ ln -sf /usr/lib/rstudio/rstudio ${DESTDIR}/usr/bin/
+ for f in {diagnostics,rpostback,rsession}; do
+ ln -sf /usr/lib/rstudio/resources/app/bin/${f} ${DESTDIR}/usr/bin/
done
vlicense COPYING
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
` (4 preceding siblings ...)
2022-09-30 17:02 ` dexgs
@ 2022-09-30 17:03 ` dexgs
2022-12-30 1:58 ` github-actions
2023-01-13 2:34 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: dexgs @ 2022-09-30 17:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
New comment by dexgs on void-packages repository
https://github.com/void-linux/void-packages/pull/39193#issuecomment-1242382188
Comment:
This switches from building the QT gui which is being deprecated to the new electron GUI.
I updated the patches from fedora to ones which are compatible with the current version.
~~There is a weird problem where cmake detects some change with globbed directories and re-runs during the install step. To work around this, I moved some configuration into the pre_install step, but this is not ideal and should be resolved.~~ (I resolved this)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
` (5 preceding siblings ...)
2022-09-30 17:03 ` dexgs
@ 2022-12-30 1:58 ` github-actions
2023-01-13 2:34 ` [PR PATCH] [Closed]: " github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2022-12-30 1:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39193#issuecomment-1367681340
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: rstudio: update to 2022.07.1+554.
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
` (6 preceding siblings ...)
2022-12-30 1:58 ` github-actions
@ 2023-01-13 2:34 ` github-actions
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2023-01-13 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 952 bytes --]
There's a closed pull request on the void-packages repository
rstudio: update to 2022.07.1+554.
https://github.com/void-linux/void-packages/pull/39193
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-01-13 2:34 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 19:26 [PR PATCH] rstudio: update to 2022.07.1+554 dexgs
2022-09-09 19:30 ` dexgs
2022-09-16 14:10 ` [PR PATCH] [Updated] " dexgs
2022-09-16 14:20 ` dexgs
2022-09-19 17:50 ` dexgs
2022-09-30 17:02 ` dexgs
2022-09-30 17:03 ` dexgs
2022-12-30 1:58 ` github-actions
2023-01-13 2:34 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).