From 6adb22880434decff5f1e03fc61af49fe7423509 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 30 May 2019 01:48:37 +0200
Subject: [PATCH] nodejs: Update from 12.2.0 to 12.3.1

---
 packages/nodejs/build.sh                      |  4 ++--
 .../deps-uv-src-unix-linux-syscalls.c.patch   | 20 -------------------
 .../nodejs/fix_multiple_definitions.patch     | 16 +++++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 packages/nodejs/deps-uv-src-unix-linux-syscalls.c.patch
 create mode 100644 packages/nodejs/fix_multiple_definitions.patch

diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index ead261f13..cab263c59 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=12.2.0
-TERMUX_PKG_SHA256=c5d19744fa506ae1e4bc963dcf760267c6ff2193ecd0f3be56acb69db1477983
+TERMUX_PKG_VERSION=12.3.1
+TERMUX_PKG_SHA256=ba2b50acffe67068f44e06e5c6938f9a391086d7f8386aea829a199db02d0bfe
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
 # Note that we do not use a shared libuv to avoid an issue with the Android
 # linker, which does not use symbols of linked shared libraries when resolving
diff --git a/packages/nodejs/deps-uv-src-unix-linux-syscalls.c.patch b/packages/nodejs/deps-uv-src-unix-linux-syscalls.c.patch
deleted file mode 100644
index 636fe2c84..000000000
--- a/packages/nodejs/deps-uv-src-unix-linux-syscalls.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../linux-syscalls.c.orig	2019-04-01 12:59:57.770124746 +0000
-+++ ./deps/uv/src/unix/linux-syscalls.c	2019-04-01 13:00:38.703457159 +0000
-@@ -187,7 +187,7 @@
- # endif
- #endif /* __NR_pwritev */
- 
--#ifndef __NR_statx
-+#if !defined(__NR_statx) && !defined(__ANDROID__)
- # if defined(__x86_64__)
- #  define __NR_statx 332
- # elif defined(__i386__)
-@@ -358,7 +358,7 @@
-               int flags,
-               unsigned int mask,
-               struct uv__statx* statxbuf) {
--#if defined(__NR_statx)
-+#if defined(__NR_statx) && !defined(__ANDROID__)
-   return syscall(__NR_statx, dirfd, path, flags, mask, statxbuf);
- #else
-   return errno = ENOSYS, -1;
diff --git a/packages/nodejs/fix_multiple_definitions.patch b/packages/nodejs/fix_multiple_definitions.patch
new file mode 100644
index 000000000..d21cba739
--- /dev/null
+++ b/packages/nodejs/fix_multiple_definitions.patch
@@ -0,0 +1,16 @@
+diff -uNr node-v12.3.1/deps/uv/src/unix/sysinfo-memory.c node-v12.3.1.mod/deps/uv/src/unix/sysinfo-memory.c
+--- node-v12.3.1/deps/uv/src/unix/sysinfo-memory.c	2019-05-22 15:21:52.000000000 +0300
++++ node-v12.3.1.mod/deps/uv/src/unix/sysinfo-memory.c	2019-05-28 15:37:28.698418026 +0300
+@@ -25,6 +25,7 @@
+ #include <stdint.h>
+ #include <sys/sysinfo.h>
+ 
++#ifndef __ANDROID__
+ uint64_t uv_get_free_memory(void) {
+   struct sysinfo info;
+ 
+@@ -40,3 +41,4 @@
+     return (uint64_t) info.totalram * info.mem_unit;
+   return 0;
+ }
++#endif