Use system wide nodejs (ported from fedora)

3 files changed, 52 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81701277c03f..ec19e749a76e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 1.4.1717.r1480
+	pkgver = 1.4.1103.r736
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	arch = i686
@@ -19,6 +19,7 @@ pkgbase = rstudio-desktop-git
 	makedepends = patchelf
 	makedepends = wget
 	makedepends = yarn
+	makedepends = nodejs
 	depends = r>=3.0.1
 	depends = boost-libs
 	depends = qt5-sensors
@@ -46,14 +47,14 @@ pkgbase = rstudio-desktop-git
 	source = git+https://github.com/rstudio/rstudio.git
 	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-2.1.2.zip
 	source = https://storage.googleapis.com/gwt-releases/gwt-2.8.2.zip
-	source = https://nodejs.org/dist/v14.17.5/node-v14.17.5-linux-x64.tar.gz
 	source = qt.conf
 	source = cran_multithread.patch
+	source = nodejs-external.patch
 	sha256sums = SKIP
 	sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
 	sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
-	sha256sums = dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e
 	sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921
 	sha256sums = c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980
+	sha256sums = 4a6aff2b586ddfceb7c59215e5f4a03f25b08fcc55687acaa6ae23c11d75d0e8
 
 pkgname = rstudio-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index ec6ccf9093c8..3b9062834aa6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,16 @@
 
 _gwtver=2.8.2
 _ginver=2.1.2
-_nodever=14.17.5
 _gitname=rstudio
 pkgname=rstudio-desktop-git
-pkgver=1.4.1717.r1480
+pkgver=1.4.1103.r736
 pkgrel=1
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
 depends=('r>=3.0.1' boost-libs qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci clang hunspell-en_US mathjax2 pandoc yaml-cpp quarto-cli-bin libldap24)
-makedepends=(git 'cmake>=3.1.0' boost desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn)
+makedepends=(git 'cmake>=3.1.0' boost desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn nodejs)
 optdepends=('git: for git support'
             'subversion: for subversion support'
             'openssh-askpass: for a git ssh access')
@@ -23,15 +22,15 @@ conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
 source=("git+https://github.com/rstudio/rstudio.git"
         "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-${_ginver}.zip"
         "https://storage.googleapis.com/gwt-releases/gwt-${_gwtver}.zip"
-        "https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
         "qt.conf"
-        "cran_multithread.patch")
+        "cran_multithread.patch"
+        "nodejs-external.patch")
 sha256sums=('SKIP'
             'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
             '970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
-            'dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e'
             '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921'
-            'c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980')
+            'c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980'
+            '4a6aff2b586ddfceb7c59215e5f4a03f25b08fcc55687acaa6ae23c11d75d0e8')
 noextract=("gin-${_ginver}.zip")
 
 pkgver() {
@@ -40,6 +39,8 @@ pkgver() {
 }
 
 prepare() {
+    git -C "${srcdir}/${_gitname}" apply -v "${srcdir}"/nodejs-external.patch
+
     cd ${srcdir}/${_gitname}
     local JOBS; JOBS="$(grep -oP -- "-j\s*\K[0-9]+" <<< "${MAKEFLAGS}")" || JOBS="1"
     sed "s/@@proc_num@@/${JOBS}/" -i ${srcdir}/cran_multithread.patch
@@ -61,13 +62,6 @@ prepare() {
     ln -sfT /usr/bin/pandoc pandoc/${_pandocver}/pandoc
     ln -sfT /usr/bin/pandoc-citeproc pandoc/${_pandocver}/pandoc-citeproc
 
-    # Nodejs
-    install -d node/${_nodever}
-    cp -r "${srcdir}/node-v${_nodever}-linux-x64/"* node/${_nodever}
-    cd "${srcdir}/${_gitname}/src/gwt/panmirror/src/editor"
-    yarn config set ignore-engines true
-    yarn install
-
     # Fix links for src/cpp/session/CMakeLists.txt
     cd "${srcdir}/${_gitname}/dependencies"
     ln -sfT common/dictionaries dictionaries
diff --git a/nodejs-external.patch b/nodejs-external.patch
new file mode 100644
index 000000000000..6fdb569599a6
--- /dev/null
+++ b/nodejs-external.patch
@@ -0,0 +1,40 @@
+From d947a9e537fd5c0b2c1e9dd28867747b9bffa8fa 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
+Subject: [PATCH] use system node
+
+---
+ src/gwt/build.xml | 17 +----------------
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/src/gwt/build.xml b/src/gwt/build.xml
+index 8092344..d7889d1 100644
+--- a/src/gwt/build.xml
++++ b/src/gwt/build.xml
+@@ -82,22 +82,7 @@
+    </target>
+ 
+    <!-- panmirror typescript library -->
+-   <property name="node.version" value="10.19.0"/>
+-   <property name="node.dir" value="../../dependencies/common/node/${node.version}"/>
+-   <condition property="node.bin" value="../../../${node.dir}/bin/node">
+-     <not>
+-        <os family="windows" />
+-     </not>
+-   </condition>
+-   <condition property="node.bin" value="${node.dir}/node.exe">
+-     <os family="windows" />
+-   </condition>
+-
+-   <!-- use node from /opt/rstudio-tools if installed (typical for Docker) -->
+-   <available
+-      property="node.bin"
+-      value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"
+-      file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/node"/>
++   <property name="node.bin" value="/usr/bin/node"/>
+ 
+    <property name="panmirror.dir" value="./panmirror/src/editor"/>
+    <property name="panmirror.build.dir" value="./www/js/panmirror"/>
+-- 
+2.31.1
+