2021-05-30 14:50:36 +02:00
|
|
|
From 05f77b171f06b8a66619f4c00b12f521e87e5d1c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
|
|
|
|
|
Date: Sat, 16 Jan 2021 19:11:23 +0100
|
|
|
|
|
Subject: [PATCH 7/8] use system node
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
src/gwt/build.xml | 14 +-------------
|
|
|
|
|
1 file changed, 1 insertion(+), 13 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/gwt/build.xml b/src/gwt/build.xml
|
|
|
|
|
index 899ae7fecd..ac90566667 100644
|
srcpkgs/r*: convert patches to -Np1
* runit is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/src/gwt/build.xml
|
|
|
|
|
+++ b/src/gwt/build.xml
|
2021-05-30 14:50:36 +02:00
|
|
|
@@ -82,19 +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.30.2
|
