commit bbc550e34f6a38d9bae6d9f2fe66e37fdf85db37 Author: Tim Biermann <tbier@posteo.de> Date: Sat Aug 21 19:50:14 2021 +0200 rstudio: new dependency npm diff --git a/rstudio/.footprint b/rstudio/.footprint index ecb33ba0f..6b2ef79c3 100644 --- a/rstudio/.footprint +++ b/rstudio/.footprint @@ -521,6 +521,9 @@ drwxr-xr-x root/root usr/lib/rstudio/www/js/ -rw-r--r-- root/root usr/lib/rstudio/www/js/focus-visible.min.js.map -rw-r--r-- root/root usr/lib/rstudio/www/js/inert-polyfill.min.js drwxr-xr-x root/root usr/lib/rstudio/www/js/panmirror/ +-rw-r--r-- root/root usr/lib/rstudio/www/js/panmirror/panmirror.js +-rw-r--r-- root/root usr/lib/rstudio/www/js/panmirror/panmirror_quantum.js.map +-rw-r--r-- root/root usr/lib/rstudio/www/js/panmirror/prosemirror-dev-tools.min.js -rw-r--r-- root/root usr/lib/rstudio/www/js/signin.js -rw-r--r-- root/root usr/lib/rstudio/www/js/text.min.js drwxr-xr-x root/root usr/lib/rstudio/www/js/workers/ diff --git a/rstudio/.signature b/rstudio/.signature index 4ccf3dce2..f227470a2 100644 --- a/rstudio/.signature +++ b/rstudio/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yMRSt7Sa7E+EyrD8PkCdIzWUNX6vy3uQpfddCBV2Xup5B4JHa9ONF3ukqYFTtcY2baS+oXYWdDoefzMfKmTDwc= -SHA256 (Pkgfile) = 5ec02426131c98977df53ccc1277e02a42c6d81c34525bc72c027c0eb499ab2f -SHA256 (.footprint) = 355a0c2338378f8387e7276cbfff18a998eb77b46c7e95e00a15e20ee5f274d2 +RWSagIOpLGJF3x1at6zeusAIGWcQf8mLtjBe+GQdeD7/7M3zuKf0JbimlGnihousmSLki8vr2+MRUBdXjgCCtXpskuP21KLixQQ= +SHA256 (Pkgfile) = 81eb981ba95e5b571297790df079c7771a5ad545aead0175f729b2741e57dde5 +SHA256 (.footprint) = 2341bdaa6dcce3c93fdcd63211c80dafd573872a687415455996c2a28c89ffde SHA256 (rstudio-1.4.1717.tar.gz) = 3af234180fd7cef451aef40faac2c7b52860f14a322244c1c7aede029814d261 SHA256 (0000-unbundle-dependencies-common.patch) = 70a084336e299b3a1e322c97b4456e05f9324db12e25dceec83c2b2ecf47299f SHA256 (0003-fix-resources-path.patch) = 4a5b9a51a3539c2e6c379d5e74730518ba5ee9a410e6eaabadc819fd03377c52 +SHA256 (0002-fix-rstudio-exec-path.patch) = c7dff376f097eeb324d091b49f03391b83d35ef0804300f4bf47642a1d4dc5bb SHA256 (0004-use-system-node.patch) = 4a6aff2b586ddfceb7c59215e5f4a03f25b08fcc55687acaa6ae23c11d75d0e8 diff --git a/rstudio/0002-fix-rstudio-exec-path.patch b/rstudio/0002-fix-rstudio-exec-path.patch new file mode 100644 index 000000000..35498a30b --- /dev/null +++ b/rstudio/0002-fix-rstudio-exec-path.patch @@ -0,0 +1,23 @@ +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 10/10] Fix rstudio exec path + +Fix the path to the rstudio executable in the rstudio.desktop file. +--- + src/cpp/desktop/resources/freedesktop/rstudio.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in +index 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=env QT_QPA_PLATFORM=xcb rstudio %F + Icon=rstudio + Type=Application + Terminal=false +-- +2.25.0 diff --git a/rstudio/Pkgfile b/rstudio/Pkgfile index d0a88fdae..579fc1228 100644 --- a/rstudio/Pkgfile +++ b/rstudio/Pkgfile @@ -1,38 +1,52 @@ # 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 libsoci mathjax nodejs openjdk8 pandoc-bin qtwebengine r yaml-cpp yarn +# Depends on: ant hyphen libevent libsoci mathjax npm openjdk8 pandoc-bin qtwebengine r yaml-cpp yarn name=rstudio version=1.4.1717 -release=2 +release=3 source=(https://github.com/rstudio/rstudio/archive/v$version/$name-$version.tar.gz # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide 0000-unbundle-dependencies-common.patch 0003-fix-resources-path.patch - 0004-use-system-node.patch) -git=(https://github.com/rstudio/rstudio.git) + 0002-fix-rstudio-exec-path.patch 0004-use-system-node.patch) build() { - ## if you want your git snapshot to be a particular version - ## uncomment below and change every occurance of $name-$version to $name - #git checkout v$version $name + patch -Np1 -d $name-$version -i $SRC/0000-unbundle-dependencies-common.patch + patch -Np1 -d $name-$version -i $SRC/0002-fix-rstudio-exec-path.patch + patch -Np1 -d $name-$version -i $SRC/0003-fix-resources-path.patch + patch -Np1 -d $name-$version -i $SRC/0004-use-system-node.patch export R_LIBS_USER="$PKG/usr/lib/R/library/" + export JAVA_ANT_REWRITE_CLASSPATH="yes" + export JAVA_TOOL_OPTIONS="-Djava.util.prefs.userRoot=$SRC" + + export JAVA_HOME=/usr/lib/java/openjdk8 + export PATH="${JAVA_HOME}/bin/:${PATH}" (pushd $name-$version/dependencies/common - install -d pandoc node/10.19.0/bin + install -d node/10.19.0/bin ln -sfT /usr/share/myspell/dicts dictionaries ln -sfT /usr/share/mathjax mathjax-27 - ln -sfT /usr/bin/ "pandoc/2.11.4" + ln -sfT /usr/bin/pandoc pandoc ln -sfT /usr/bin/node node/10.19.0/bin/node - bash install-packages) + bash install-packages + yarn config set ignore-engines true + yarn install) - patch -Np1 -d $name-$version -i $SRC/0000-unbundle-dependencies-common.patch - patch -Np1 -d $name-$version -i $SRC/0003-fix-resources-path.patch - patch -Np1 -d $name-$version -i $SRC/0004-use-system-node.patch + pushd $name-$version/src/gwt + + pushd panmirror/src/editor + npm install --no-optional --legacy-peer-deps + popd + + ant clean + ant build + popd + + sed -i 's@gwt_build ALL@gwt_build@g' $name-$version/src/gwt/CMakeLists.txt - export PATH="/usr/lib/java/openjdk8/jre/bin/:${PATH}" cmake -S $name-$version -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr/lib/rstudio \ -D CMAKE_BUILD_TYPE=Release \ @@ -45,6 +59,7 @@ build() { -D RSTUDIO_USE_SYSTEM_YAML_CPP=ON \ -D Boost_NO_BOOST_CMAKE=ON \ -D RSTUDIO_BUNDLE_QT=FALSE \ + -D RSTUDIO_CRASHPAD_ENABLED=FALSE \ -Wno-dev cmake --build build diff --git a/rstudio/pandoc-version.patch b/rstudio/pandoc-version.patch deleted file mode 100644 index 6316dbde3..000000000 --- a/rstudio/pandoc-version.patch +++ /dev/null @@ -1,52 +0,0 @@ -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()