summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2011-10-30 09:20:59 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2011-10-30 09:20:59 +0000
commite41774ef5240f260c325818b59634f8a8c08c75d (patch)
treec95e74a3be52137c11819b1e56d53f32536b40e5 /net-libs/nodejs
parent[bump] dev-perl/Sys-Virt-0.9.5 (diff)
downloadgentoo-2-e41774ef5240f260c325818b59634f8a8c08c75d.tar.gz
gentoo-2-e41774ef5240f260c325818b59634f8a8c08c75d.tar.bz2
gentoo-2-e41774ef5240f260c325818b59634f8a8c08c75d.zip
Fix bug #386683 by Julien Sanchez, patch by Julien Sanchez. Upstream API change in 3.5: http://code.google.com/p/v8/source/detail?spec=svn9837&r=9008
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'net-libs/nodejs')
-rw-r--r--net-libs/nodejs/ChangeLog7
-rw-r--r--net-libs/nodejs/files/nodejs-v8-3.5.patch11
-rw-r--r--net-libs/nodejs/nodejs-0.4.12.ebuild8
3 files changed, 23 insertions, 3 deletions
diff --git a/net-libs/nodejs/ChangeLog b/net-libs/nodejs/ChangeLog
index fe47fedd91bb..38de40af1461 100644
--- a/net-libs/nodejs/ChangeLog
+++ b/net-libs/nodejs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-libs/nodejs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.15 2011/10/22 17:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/ChangeLog,v 1.16 2011/10/30 09:20:59 phajdan.jr Exp $
+
+ 30 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nodejs-0.4.12.ebuild,
+ +files/nodejs-v8-3.5.patch:
+ Fix bug #386683 by Julien Sanchez, patch by Julien Sanchez. Upstream API
+ change in 3.5: http://code.google.com/p/v8/source/detail?spec=svn9837&r=9008
*nodejs-0.4.12 (22 Oct 2011)
diff --git a/net-libs/nodejs/files/nodejs-v8-3.5.patch b/net-libs/nodejs/files/nodejs-v8-3.5.patch
new file mode 100644
index 000000000000..87a8eeda0a57
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-v8-3.5.patch
@@ -0,0 +1,11 @@
+--- src/node_buffer.cc 2011-10-25 08:45:00.665600749 +0200
++++ src/node_buffer.cc 2011-10-25 08:45:31.168622565 +0200
+@@ -478,7 +478,7 @@
+
+ if (written > 0 && p[written-1] == '\0' && char_written == length) {
+ uint16_t last_char;
+- s->Write(&last_char, length - 1, 1, String::NO_HINTS);
++ s->Write(&last_char, length - 1, 1, String::NO_OPTIONS);
+ if (last_char != 0 || written > s->Utf8Length()) {
+ written--;
+ }
diff --git a/net-libs/nodejs/nodejs-0.4.12.ebuild b/net-libs/nodejs/nodejs-0.4.12.ebuild
index 215b1acd4712..4056517bf606 100644
--- a/net-libs/nodejs/nodejs-0.4.12.ebuild
+++ b/net-libs/nodejs/nodejs-0.4.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.4.12.ebuild,v 1.1 2011/10/22 17:09:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.4.12.ebuild,v 1.2 2011/10/30 09:20:59 phajdan.jr Exp $
EAPI="2"
@@ -18,12 +18,16 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND=">=dev-lang/v8-2.5.9.6-r1
+DEPEND=">=dev-lang/v8-3.5.10.22
dev-libs/openssl"
RDEPEND="${DEPEND}"
S=${WORKDIR}/node-v${PV}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-v8-3.5.patch" # bug #386683
+}
+
src_configure() {
# this is a waf confuserator
./configure --shared-v8 --prefix=/usr || die