Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78a941e1604ef410f2b3e33296624f224e35c026
commit 78a941e1604ef410f2b3e33296624f224e35c026
Author: DeX77 <de...@frugalware.org>
Date: Thu Oct 13 15:20:22 2016 +0200
nodejs-6.8.0-1-x86_64
* version bump
diff --git a/source/devel-extra/nodejs/FrugalBuild
b/source/devel-extra/nodejs/FrugalBuild
index 89f464d..2a7594f 100644
--- a/source/devel-extra/nodejs/FrugalBuild
+++ b/source/devel-extra/nodejs/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: DeX77 <de...@frugalware.org>
pkgname=nodejs
-pkgver=6.7.0
+pkgver=6.8.0
pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
archs=('i686' 'x86_64')
@@ -11,9 +11,12 @@ license=('MIT')
groups=('devel-extra')
depends=('python' 'openssl' 'zlib' 'icu4c')
makedepends=('ca-certificates')
-source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz
sysconfig-dir.patch)
-sha1sums=('456e1583f4643a9521e5fa866f7ac17453521a5b' \
- '47d7fcf38611bb439545bfe9ab78604219d13687')
+source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz \
+ sysconfig-dir.patch \
+ fix_build_with_shared_zlib.patch)
+sha1sums=('aedccc259f9b641e9820e694721a916e73f4ba8f' \
+ '47d7fcf38611bb439545bfe9ab78604219d13687' \
+ '130112d5141eb18a3c9c479aa6f0d1e6c8506c16')
_F_archive_name="node"
Fpkgversep="-v"
up2date="Flasttar $url/dist/latest/"
diff --git a/source/devel-extra/nodejs/fix_build_with_shared_zlib.patch
b/source/devel-extra/nodejs/fix_build_with_shared_zlib.patch
new file mode 100644
index 0000000..e57f5ca
--- /dev/null
+++ b/source/devel-extra/nodejs/fix_build_with_shared_zlib.patch
@@ -0,0 +1,30 @@
+From fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4 Mon Sep 17 00:00:00 2001
+From: "Bradley T. Hughes" <bradleythug...@fastmail.fm>
+Date: Thu, 13 Oct 2016 07:38:38 +0000
+Subject: [PATCH] build: add -DZLIB_CONST when building with --shared-zlib
+
+Commit 782620f added the define only when building with the bundled
+zlib. Using a shared zlib results in build breakage:
+
+../src/inspector_agent.cc:179:16: error: assigning to 'Bytef *' (aka 'unsigned
char *') from incompatible type
+ 'const uint8_t *' (aka 'const unsigned char *')
+ strm.next_in = PROTOCOL_JSON + 3;
+ ^ ~~~~~~~~~~~~~~~~~
+1 error generated.
+---
+ node.gyp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/node.gyp b/node.gyp
+index fa98547..d799ba1 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -480,6 +480,8 @@
+ }],
+ [ 'node_shared_zlib=="false"', {
+ 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
++ }, {
++ 'defines': [ 'ZLIB_CONST' ],
+ }],
+
+ [ 'node_shared_http_parser=="false"', {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
