forked from ports/contrib
rstudio: 1.3.1093 -> 1.4.1103
This commit is contained in:
parent
90bd1f58b8
commit
0154c5253a
1394
rstudio/.footprint
1394
rstudio/.footprint
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,8 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF38nokYpMTyBXrJ+kFZqNelEJEYX9kvD0scsembLx59kt23cbtY+WWCn6+ouH1CwxblE4GRm8XcIiqXzcBBaqQgc=
|
||||
SHA256 (Pkgfile) = e526498c7bcadbdef5d7c3c43ebb7f9f3e1377355ef585ed67cb566e40ab343b
|
||||
SHA256 (.footprint) = eeda69eeafe78523234a582d79d8157e75cd64a66ea3040797a1520015c04845
|
||||
SHA256 (rstudio-1.3.1093.tar.gz) = af8dc5e71ee934043856938af2e2065d1f1efef08aba37962ed03f6ccb8201bb
|
||||
RWSagIOpLGJF35yD6NqAnWE23Dj7tSQje95ONglA3E/dM8rI85/SB9IQSOyHecnOGTpm20fXy+4riEsBNcMn5Pmiz8OBDV2fPwI=
|
||||
SHA256 (Pkgfile) = 53d42e720b28767e4c55344cc48878dc6da432ba7a424d96a612b391a98706af
|
||||
SHA256 (.footprint) = ec1ade874875c3d22b9a27ee234801f60b053783592cfa2e52a01894e1b5b343
|
||||
SHA256 (rstudio-1.4.1103.tar.gz) = e448aaaf7ac7f4fd97197250762bfd28195c71abfd67db6f952463dea552be4c
|
||||
SHA256 (rstudio-1.2.5042-boost-1.73.0.patch) = 5d282059731b64579c0f8c8eeb280b4c4efe810ce829ad7332385b0a92e1215e
|
||||
SHA256 (rstudio-1.3.1056-boost-1.74.0.patch) = e952b6f55b0ffa7eab7ba6fca8126dd8202f37b84687d97bbd1d9d324a099065
|
||||
SHA256 (pandoc-version.patch) = 0e52dc1cafeec3e19a34a8f3bbd80dd9d2d99541360a4274ee1ac57163730c52
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
# Description: RStudio - an Interface for GNU R
|
||||
# URL: https://www.rstudio.com/
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: ant boost hyphen libevent mathjax openjdk8 pandoc-bin qtwebengine r
|
||||
# Depends on: ant boost hyphen libevent libsoci mathjax nodejs openjdk8 pandoc-bin qtwebengine r
|
||||
|
||||
name=rstudio
|
||||
version=1.3.1093
|
||||
version=1.4.1103
|
||||
release=1
|
||||
|
||||
source=(https://github.com/rstudio/rstudio/archive/v$version/$name-$version.tar.gz
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-mathematics/rstudio/files
|
||||
rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch)
|
||||
rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch
|
||||
pandoc-version.patch)
|
||||
git=(https://github.com/rstudio/rstudio.git)
|
||||
|
||||
build() {
|
||||
@ -19,26 +20,32 @@ build() {
|
||||
|
||||
patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.5042-boost-1.73.0.patch
|
||||
patch -Np1 -d $name-$version -i $SRC/rstudio-1.3.1056-boost-1.74.0.patch
|
||||
pushd $name-$version/dependencies/common
|
||||
install -d pandoc
|
||||
# it's probing for an old pandoc-version, fixing that
|
||||
patch -Np1 -d $name-$version -i $SRC/pandoc-version.patch
|
||||
|
||||
export R_LIBS_USER="$PKG/usr/lib/R/library/"
|
||||
|
||||
(pushd $name-$version/dependencies/common
|
||||
local pandoc_version=$(prt-get current pandoc-bin)
|
||||
install -d pandoc node/10.19.0/bin
|
||||
ln -sfT /usr/share/myspell/dicts dictionaries
|
||||
ln -sfT /usr/share/mathjax mathjax-27
|
||||
ln -sfT /usr/bin/pandoc pandoc/pandoc
|
||||
ln -sfT /usr/bin/pandoc-citeproc pandoc/pandoc-citeproc
|
||||
export R_LIBS_USER="$PKG/usr/lib/R/library/"
|
||||
ln -sfT /usr/bin/ "pandoc/${pandoc_version/\-1/}"
|
||||
ln -sfT /usr/bin/node node/10.19.0/bin/node
|
||||
bash install-packages
|
||||
popd
|
||||
unset pandoc_version)
|
||||
|
||||
export PATH="/usr/lib/java/openjdk8/jre/bin/:${PATH}"
|
||||
cmake -S $name-$version -B build -G Ninja\
|
||||
cmake -S $name-$version -B build -G Ninja \
|
||||
-D CMAKE_INSTALL_PREFIX=/usr/lib/rstudio \
|
||||
-D CMAKE_BUILD_TYPE=Release \
|
||||
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
|
||||
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
|
||||
-D RSTUDIO_TARGET=Desktop \
|
||||
-D RSTUDIO_USE_SYSTEM_BOOST=ON \
|
||||
-D QT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake \
|
||||
-D RSTUDIO_USE_SYSTEM_SOCI=ON \
|
||||
-D Boost_NO_BOOST_CMAKE=ON \
|
||||
-D QT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake \
|
||||
-D RSTUDIO_BUNDLE_QT=FALSE \
|
||||
-Wno-dev
|
||||
|
||||
@ -48,6 +55,7 @@ build() {
|
||||
install -dm755 $PKG/usr/bin/
|
||||
ln -s /usr/lib/$name/bin/$name $PKG/usr/bin/$name
|
||||
sed -i 's|/usr/lib/rstudio/bin/rstudio|/usr/bin/rstudio|g' $PKG/usr/share/applications/rstudio.desktop
|
||||
|
||||
find $PKG \(\
|
||||
-iname '*README*' -o \
|
||||
-iname '*COPYING*' -o \
|
||||
|
||||
52
rstudio/pandoc-version.patch
Normal file
52
rstudio/pandoc-version.patch
Normal file
@ -0,0 +1,52 @@
|
||||
diff --git a/dependencies/common/install-pandoc b/dependencies/common/install-pandoc
|
||||
index e10e4dd44d..a0342d1d4f 100755
|
||||
--- a/dependencies/common/install-pandoc
|
||||
+++ b/dependencies/common/install-pandoc
|
||||
@@ -20,7 +20,7 @@ set -e
|
||||
source rstudio-tools
|
||||
|
||||
# variables that control download + installation process
|
||||
-PANDOC_VERSION="2.11.2"
|
||||
+PANDOC_VERSION="2.11.3.2"
|
||||
PANDOC_SUBDIR="pandoc/${PANDOC_VERSION}"
|
||||
PANDOC_URL_BASE="https://s3.amazonaws.com/rstudio-buildtools/pandoc/${PANDOC_VERSION}"
|
||||
|
||||
diff --git a/dependencies/tools/upload-pandoc.sh b/dependencies/tools/upload-pandoc.sh
|
||||
index 48e9deb412..6848f7b401 100755
|
||||
--- a/dependencies/tools/upload-pandoc.sh
|
||||
+++ b/dependencies/tools/upload-pandoc.sh
|
||||
@@ -8,7 +8,7 @@
|
||||
# filenames, so tweaking for new releases is expected.
|
||||
|
||||
# Modify to set the Pandoc version to upload
|
||||
-PANDOC_VERSION=2.11.2
|
||||
+PANDOC_VERSION=2.11.3.2
|
||||
|
||||
for PLATFORM in linux-amd64.tar.gz macOS.zip windows-x86_64.zip; do
|
||||
|
||||
diff --git a/dependencies/windows/install-dependencies.cmd b/dependencies/windows/install-dependencies.cmd
|
||||
index 197ef55932..43c429c65b 100644
|
||||
--- a/dependencies/windows/install-dependencies.cmd
|
||||
+++ b/dependencies/windows/install-dependencies.cmd
|
||||
@@ -19,7 +19,7 @@ set WINPTY_FILES=winpty-0.4.3-msys2-2.7.0.zip
|
||||
set OPENSSL_FILES=openssl-1.1.1d.zip
|
||||
set BOOST_FILES=boost-1.69.0-win-msvc141.zip
|
||||
|
||||
-set PANDOC_VERSION=2.11.2
|
||||
+set PANDOC_VERSION=2.11.3.2
|
||||
set PANDOC_NAME=pandoc-%PANDOC_VERSION%
|
||||
set PANDOC_FILE=%PANDOC_NAME%-windows-x86_64.zip
|
||||
|
||||
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
|
||||
index 6efb62559f..0a1a052111 100644
|
||||
--- a/src/cpp/session/CMakeLists.txt
|
||||
+++ b/src/cpp/session/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@ endif()
|
||||
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
|
||||
message(FATAL_ERROR "Mathjax 2.7 not found (re-run install-dependencies script to install)")
|
||||
endif()
|
||||
-set(PANDOC_VERSION "2.11.2" CACHE INTERNAL "Pandoc version")
|
||||
+set(PANDOC_VERSION "2.11.3.2" CACHE INTERNAL "Pandoc version")
|
||||
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
|
||||
message(FATAL_ERROR "pandoc ${PANDOC_VERSION} not found (re-run install-dependencies script to install)")
|
||||
endif()
|
||||
Loading…
x
Reference in New Issue
Block a user