[arch-commits] Commit in nodejs/trunk (PKGBUILD system-c-ares.patch)

[Felix Yan]

    Date: Saturday, December 4, 2021 @ 00:36:36
  Author: felixonmars
Revision: 1064971

upgpkg: nodejs 17.1.0-3: use shared brotli and remove outdated patch

Modified:
  nodejs/trunk/PKGBUILD
Deleted:
  nodejs/trunk/system-c-ares.patch

---------------------+
 PKGBUILD            |   18 ++++--------
 system-c-ares.patch |   71 --------------------------------------------------
 2 files changed, 6 insertions(+), 83 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-04 00:35:54 UTC (rev 1064970)
+++ PKGBUILD	2021-12-04 00:36:36 UTC (rev 1064971)
@@ -9,24 +9,17 @@
 
 pkgname=nodejs
 pkgver=17.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Evented I/O for V8 javascript'
 arch=('x86_64')
 url='https://nodejs.org/'
 license=('MIT')
-depends=('openssl' 'zlib' 'icu' 'libuv' 'libnghttp2' 'c-ares') # 'http-parser' 'v8')
+depends=('brotli' 'openssl' 'zlib' 'icu' 'libuv' 'libnghttp2' 'c-ares') # 'http-parser' 'v8')
 makedepends=('python' 'procps-ng')
 optdepends=('npm: nodejs package manager')
-source=("https://github.com/nodejs/node/archive/v$pkgver/nodejs-$pkgver.tar.gz"
-        system-c-ares.patch)
-sha512sums=('a61e64e7a99df79ece7591a48b631024e2668de25dfc8f5abc0cf36f85994b599e091e7f3be8ce57d3d732ad9be531ec7b7153a64b3b9df8a49e77846700b895'
-            'bca85b5a4622b38f20f3787bdb2784db76cd4b213fadf8a5813a375080e7481c4aff7556712d59df3e19849a7eb6b2f048a69b4e2162cb717ab1b3a791d2558e')
+source=("https://github.com/nodejs/node/archive/v$pkgver/nodejs-$pkgver.tar.gz")
+sha512sums=('a61e64e7a99df79ece7591a48b631024e2668de25dfc8f5abc0cf36f85994b599e091e7f3be8ce57d3d732ad9be531ec7b7153a64b3b9df8a49e77846700b895')
 
-prepare() {
-  cd node-$pkgver
-  patch -Rp1 -i ../system-c-ares.patch
-}
-
 build() {
   cd node-$pkgver
 
@@ -39,7 +32,8 @@
     --shared-libuv \
     --experimental-http-parser \
     --shared-nghttp2 \
-    --shared-cares
+    --shared-cares \
+    --shared-brotli
     # --shared-v8
     # --shared-http-parser
 

Deleted: system-c-ares.patch
===================================================================
--- system-c-ares.patch	2021-12-04 00:35:54 UTC (rev 1064970)
+++ system-c-ares.patch	2021-12-04 00:36:36 UTC (rev 1064971)
@@ -1,71 +0,0 @@
-From 0bfb8ec19adf2106c505f3e0a97c99b81694524b Mon Sep 17 00:00:00 2001
-From: Beth Griggs <bgriggs at redhat.com>
-Date: Tue, 10 Aug 2021 10:10:09 +0100
-Subject: [PATCH] deps: update c-ares to 1.17.2
-
-Refs: https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2
----
- deps/cares/RELEASE-NOTES                      | 121 +++--
- deps/cares/cares.gyp                          |   2 +-
- deps/cares/include/ares.h                     |   2 +-
- deps/cares/include/ares_version.h             |   4 +-
- .../cares/src/lib/ares__parse_into_addrinfo.c |  16 +-
- deps/cares/src/lib/ares__sortaddrinfo.c       |   4 +
- deps/cares/src/lib/ares_create_query.c        |  17 +-
- deps/cares/src/lib/ares_expand_name.c         | 137 ++++-
- deps/cares/src/lib/ares_expand_string.c       |   7 +-
- deps/cares/src/lib/ares_free_hostent.c        |  10 +-
- deps/cares/src/lib/ares_freeaddrinfo.c        |   2 +
- deps/cares/src/lib/ares_getaddrinfo.c         |  24 +-
- deps/cares/src/lib/ares_gethostbyaddr.c       |  10 +-
- deps/cares/src/lib/ares_gethostbyname.c       |  10 +-
- deps/cares/src/lib/ares_getnameinfo.c         |  10 +-
- deps/cares/src/lib/ares_init.c                |  88 +++-
- deps/cares/src/lib/ares_library_init.c        |   9 +-
- deps/cares/src/lib/ares_library_init.h        |   2 +-
- deps/cares/src/lib/ares_nameser.h             | 482 ++++++++++++++++++
- deps/cares/src/lib/ares_parse_a_reply.c       |  14 +-
- deps/cares/src/lib/ares_parse_aaaa_reply.c    |  14 +-
- deps/cares/src/lib/ares_parse_caa_reply.c     |  14 +-
- deps/cares/src/lib/ares_parse_mx_reply.c      |  10 +-
- deps/cares/src/lib/ares_parse_naptr_reply.c   |  15 +-
- deps/cares/src/lib/ares_parse_ns_reply.c      |  16 +-
- deps/cares/src/lib/ares_parse_ptr_reply.c     |  99 ++--
- deps/cares/src/lib/ares_parse_soa_reply.c     |  24 +-
- deps/cares/src/lib/ares_parse_srv_reply.c     |  15 +-
- deps/cares/src/lib/ares_parse_txt_reply.c     |  10 +-
- deps/cares/src/lib/ares_private.h             |   6 +-
- deps/cares/src/lib/ares_process.c             |  11 +-
- deps/cares/src/lib/ares_query.c               |  10 +-
- deps/cares/src/lib/ares_send.c                |  10 +-
- deps/cares/src/lib/ares_setup.h               |   5 +-
- deps/cares/src/lib/ares_strsplit.c            |   4 +
- deps/cares/src/lib/inet_net_pton.c            |  10 +-
- deps/cares/src/lib/inet_ntop.c                |  10 +-
- deps/cares/src/lib/nameser.h                  | 218 --------
- src/cares_wrap.h                              |  10 +-
- 39 files changed, 889 insertions(+), 593 deletions(-)
- create mode 100644 deps/cares/src/lib/ares_nameser.h
- delete mode 100644 deps/cares/src/lib/nameser.h
-
-diff --git a/src/cares_wrap.h b/src/cares_wrap.h
-index aee46a935b3a..60f99e65edf3 100644
---- a/src/cares_wrap.h
-+++ b/src/cares_wrap.h
-@@ -22,15 +22,7 @@
- # include <netdb.h>
- #endif  // __POSIX__
- 
--#if defined(__ANDROID__) || \
--    defined(__MINGW32__) || \
--    defined(__OpenBSD__) || \
--    defined(_MSC_VER)
--
--# include <nameser.h>
--#else
--# include <arpa/nameser.h>
--#endif
-+# include <ares_nameser.h>
- 
- namespace node {
- namespace cares_wrap {