aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/rstudio-desktop/rstudio-desktop.SlackBuild3
-rw-r--r--development/rstudio-desktop/rstudio-desktop.info6
-rw-r--r--development/rstudio-desktop/sigstksz_gcc11.patch14
3 files changed, 4 insertions, 19 deletions
diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild
index 5dc21486bb2a3..abc4e6a1beefc 100644
--- a/development/rstudio-desktop/rstudio-desktop.SlackBuild
+++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rstudio-desktop
SRCNAM=rstudio
-VERSION=${VERSION:-2022.02.2+485}
+VERSION=${VERSION:-2022.02.3+492}
SRCVER=${SRCVER:-$(echo $VERSION | sed 's/+/-/g')}
GITCOMMIT_VER=8acbd38
GWT_SDK_VER=${GWT_SDK_VER:-2.8.2}
@@ -100,7 +100,6 @@ unzip -qo $GWT_SDK_ZIP -d $LIB_DIR/gwt
mv $LIB_DIR/gwt/gwt-$GWT_SDK_VER $LIB_DIR/gwt/$GWT_SDK_VER
# patches
-patch -p1 < $CWD/sigstksz_gcc11.patch
patch -p1 < $CWD/pandoc_version.patch # Do not use outdated pandoc version number
cd dependencies/common
diff --git a/development/rstudio-desktop/rstudio-desktop.info b/development/rstudio-desktop/rstudio-desktop.info
index b11b3ee8fe394..f425acbf45aff 100644
--- a/development/rstudio-desktop/rstudio-desktop.info
+++ b/development/rstudio-desktop/rstudio-desktop.info
@@ -1,12 +1,12 @@
PRGNAM="rstudio-desktop"
-VERSION="2022.02.2+485"
+VERSION="2022.02.3+492"
HOMEPAGE="http://rstudio.com"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/rstudio/rstudio/archive/refs/tags/v2022.02.2+485/rstudio-2022.02.2-485.tar.gz \
+DOWNLOAD_x86_64="https://github.com/rstudio/rstudio/archive/refs/tags/v2022.02.3+492/rstudio-2022.02.3-492.tar.gz \
https://storage.googleapis.com/gwt-releases/gwt-2.8.2.zip \
https://nodejs.org/dist/v14.17.5/node-v14.17.5-linux-x64.tar.gz"
-MD5SUM_x86_64="251b74238d69d3e08fb09af8287a74c7 \
+MD5SUM_x86_64="4a546d0ed141ab1304be1b4967ca5aac \
c295406d68c5ef364e445068599aa6d4 \
3cd3b18e1412067aabd2e1b23b93106e"
REQUIRES="R pandoc-bin yaml-cpp hunspell-en yarn apache-ant zulu-openjdk8 mathjax2 soci"
diff --git a/development/rstudio-desktop/sigstksz_gcc11.patch b/development/rstudio-desktop/sigstksz_gcc11.patch
deleted file mode 100644
index 7b1b70f147ac3..0000000000000
--- a/development/rstudio-desktop/sigstksz_gcc11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch was taken from the Arch Linux AUR:
-https://aur.archlinux.org/cgit/aur.git/tree/sigstksz_gcc11.patch?h=rstudio-desktop
-diff -ru rstudio-2022.02.0-443.original/src/cpp/tests/cpp/tests/vendor/catch.hpp rstudio-2022.02.0-443/src/cpp/tests/cpp/tests/vendor/catch.hpp
---- a/src/cpp/tests/cpp/tests/vendor/catch.hpp 2022-02-17 08:26:03.000000000 +1300
-+++ b/src/cpp/tests/cpp/tests/vendor/catch.hpp 2022-02-18 19:04:27.382806708 +1300
-@@ -10824,7 +10824,7 @@
-
- // 32kb for the alternate stack seems to be sufficient. However, this value
- // is experimentally determined, so that's not guaranteed.
-- static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
-+ static constexpr std::size_t sigStackSize = 32768;
-
- static SignalDefs signalDefs[] = {
- { SIGINT, "SIGINT - Terminal interrupt signal" },