user/rstudio-desktop: upgrade to 2023.9.1
This commit is contained in:
parent
021b81131e
commit
dd27305cc3
GPG key ID:
D62A472A4AA7D541
4 changed files with 25 additions and 61 deletions
|
|
@ -1,33 +0,0 @@
|
|||
From 17a9562b352f9a726188f570dec55e683a663c91 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Ushey <kevinushey@gmail.com>
|
||||
Date: Tue, 18 Apr 2023 21:53:42 -0700
|
||||
Subject: [PATCH] support system yaml-cpp (closes #12317)
|
||||
|
||||
---
|
||||
src/cpp/CMakeLists.txt | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
|
||||
index 68e333af935..1518ca2a0e5 100644
|
||||
--- a/src/cpp/CMakeLists.txt
|
||||
+++ b/src/cpp/CMakeLists.txt
|
||||
@@ -225,11 +225,17 @@ else()
|
||||
find_package(yaml-cpp REQUIRED)
|
||||
endif()
|
||||
|
||||
-if(NOT EXISTS "${YAML_CPP_INCLUDE_DIR}")
|
||||
+if(yaml-cpp_FOUND AND NOT YAML_CPP_LIBRARIES)
|
||||
+ set(YAML_CPP_LIBRARIES yaml-cpp)
|
||||
+endif()
|
||||
+
|
||||
+if(NOT RSTUDIO_USE_SYSTEM_YAML_CPP AND NOT EXISTS "${YAML_CPP_INCLUDE_DIR}")
|
||||
message(FATAL_ERROR "yaml-cpp not found (re-run dependencies script to install)")
|
||||
endif()
|
||||
|
||||
-include_directories(SYSTEM "${YAML_CPP_INCLUDE_DIR}")
|
||||
+if(YAML_CPP_INCLUDE_DIR)
|
||||
+ include_directories(SYSTEM "${YAML_CPP_INCLUDE_DIR}")
|
||||
+endif()
|
||||
|
||||
# determine whether we should statically link boost. we always do this
|
||||
# unless we are building a non-packaged build on linux (in which case
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=rstudio-desktop
|
||||
pkgver=2023.3
|
||||
_gittag=v2023.03.0+386
|
||||
_panmirrortag=aea3027882718af657d60221818c3ff35f413219
|
||||
pkgver=2023.9.1
|
||||
_gittag=v2023.09.1+494
|
||||
_panmirrortag=71cb9fbf4f223b429dc5d58ce01aae3dafd43a6b
|
||||
pkgrel=0
|
||||
pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
|
||||
arch="x86_64"
|
||||
|
|
@ -52,8 +52,6 @@ makedepends="
|
|||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/$_gittag.tar.gz
|
||||
$pkgname-$pkgver-panmirror.tar.gz::https://github.com/quarto-dev/quarto/archive/$_panmirrortag.tar.gz
|
||||
12317_support-system-yaml-cpp.patch
|
||||
cran_multithread.patch
|
||||
desktop-main-skip-nosandbox-on-musl.patch
|
||||
filepath-use-unistd.patch
|
||||
nodejs-external.patch
|
||||
|
|
@ -128,13 +126,11 @@ package() {
|
|||
install -Dm 644 "$srcdir/qt.conf" "$pkgdir/usr/lib/qt/libexec/qt.conf"
|
||||
}
|
||||
sha512sums="
|
||||
64794b753bb366993d981a4df0a342a1d643a3c0105b80cca22a39a4665a47a0bb0573fbef2d1339a3a23652af67810b1afd842b8d407a4e3d622d5a5e4007c3 rstudio-desktop-2023.3.tar.gz
|
||||
fc51164e454480e3bc4a1a4ebdc09bb71fca3a41d7eac1f3b1ac6e773d40a147f95a835f3733a19c8f5b30cb9e1be083c5b1671b1a5a01fc63439b5f282a7873 rstudio-desktop-2023.3-panmirror.tar.gz
|
||||
bc02f3541e7c8b8bff296e9d9f627d6908d2464bdf6a2cb091795083721c89232fe45ade7b54af8b6532fed183b83838307396283ac9ae230a49014842e7b6da 12317_support-system-yaml-cpp.patch
|
||||
eb0c023916babdbb3871bd7212c065ad16363e1b0c94db29eb283c4051681aa443bbe2fefd3bce286bf8b149aba1405bc09521b53fd16c31a566d463273ec969 cran_multithread.patch
|
||||
b705108ca78edf84edc96d2d9ad1f34b380e9098409ba8ae17badb5a28beb3a70218776112f2a78025e8144ad45ff085d781e2a24aeb1753f1f9c7a2b19aee26 rstudio-desktop-2023.9.1.tar.gz
|
||||
b6dfb7c7b01f30864f0d663c2e36aeb74c1e0a31bbf1f9d5a930f141d198cf0b3c36282d467c15f2e3811112483dbfb50c73b770dd9b6193ad9d2df4a776b84a rstudio-desktop-2023.9.1-panmirror.tar.gz
|
||||
54625810117dea0287a8184babde409e579ffc3cc0a138136a23ca088d5c4cb5ad1885d4d1cb123683a7bece43f9cf0c64ef43f79885a336b44000eca1e67647 desktop-main-skip-nosandbox-on-musl.patch
|
||||
1a3da5f17dfed7463d7a7abadb167eacc784d0c2861fdfa9392a088e658778b45216de3e52940b0b150bed3b9236e4207b77ec82458d947642949315f466fe2f filepath-use-unistd.patch
|
||||
2a400a12886028f60ebeb56c0fc20799ab3ed641824497c93f2e935076172aefc199b7df9a5d8fdf0deb23089a183b8408d6ee6ced78bafb7a129ede75652c00 nodejs-external.patch
|
||||
3f9955c70ae7d8cb83c5385dd85e37dcad4a1d67450a18465f439ca0657135891144dbb9b05a9e231bb02508bb565549171dff5318e469db32fab99a658b78d4 nodejs-external.patch
|
||||
16a4445be211316ed890709cc068519d217210ee8e492509a0d1ae9883e61779c717ba04902d14c0f0a4ad19f46b527658f0eadd73876ba74e2e769d9103bbca sessionhistoryarchive-use-ctime.patch
|
||||
bd348f2ac6f1620ca0d8192e0deb2c2334c7f185da4cab72725119c5a0734b920230868aac2aaf0b211f842f114066cded54f616c1df83b47f0bd3d44df61b89 qt.conf
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/dependencies/common/install-packages.orig b/dependencies/common/install-packages
|
||||
index 4acca62..85eb31b 100755
|
||||
--- a/dependencies/common/install-packages.orig
|
||||
+++ b/dependencies/common/install-packages
|
||||
@@ -107,7 +107,7 @@ fi
|
||||
|
||||
# install packages needed to run tests
|
||||
for RPKG in purrr rmarkdown renv testthat xml2 yaml; do
|
||||
- RINSTALLCMD="if("'!'"require($RPKG, quietly = TRUE)) { install.packages('$RPKG', lib='$RPKGLIB', repos='https://cran.rstudio.com/') }"
|
||||
+ RINSTALLCMD="if("'!'"require($RPKG, quietly = TRUE)) { options(Ncpus = @@proc_num@@ ); install.packages('$RPKG', lib='$RPKGLIB', repos='https://cran.rstudio.com/') }"
|
||||
echo "> $RINSTALLCMD"
|
||||
Rscript -e "$RINSTALLCMD"
|
||||
done
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
diff --git a/src/gwt/build.xml.orig b/src/gwt/build.xml
|
||||
index 83e9433..cbe46cf 100644
|
||||
index 1178a04..a8d5db4 100644
|
||||
--- a/src/gwt/build.xml.orig
|
||||
+++ b/src/gwt/build.xml
|
||||
@@ -85,31 +85,7 @@
|
||||
@@ -85,45 +85,7 @@
|
||||
|
||||
<!-- panmirror typescript library -->
|
||||
<!-- ensure version matches RSTUDIO_NODE_VERSION -->
|
||||
- <property name="node.version" value="16.14.0"/>
|
||||
- <property name="node.version" value="16.20.2"/>
|
||||
- <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
|
||||
- <!-- use yarn from system but will prefer yarn from dependencies if available -->
|
||||
- <condition property="yarn.bin" value="yarn">
|
||||
|
|
@ -31,7 +31,21 @@ index 83e9433..cbe46cf 100644
|
|||
- property="yarn.bin"
|
||||
- value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"
|
||||
- file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/>
|
||||
-
|
||||
- <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
|
||||
- <property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
||||
-
|
||||
- <!-- use panmirror from /opt/rstudio-tools if available (typical for Docker) -->
|
||||
- <available
|
||||
- property="panmirror.dir"
|
||||
- value="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"
|
||||
- file="/opt/rstudio-tools/src/gwt/lib/quarto/apps/panmirror"/>
|
||||
- <!-- use yarn from c:/rstudio-tools if installed (typical for Docker on Windows) -->
|
||||
- <available
|
||||
- property="panmirror.dir"
|
||||
- value="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"
|
||||
- file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/>
|
||||
+ <property name="yarn.bin" value="/usr/bin/yarn"/>
|
||||
|
||||
<property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/>
|
||||
<property name="panmirror.build.dir" value="./www/js/panmirror"/>
|
||||
<target name="panmirror" description="Compile panmirror library">
|
||||
<echo message="yarn location: ${yarn.bin}"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue