diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
| commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
| tree | c1d4adcda7f0b767537620aea02633158e17218a /community/nodejs | |
| parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
| parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/nodejs')
| -rw-r--r-- | community/nodejs/PKGBUILD | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 19522811b..73c2a678c 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73801 2012-07-15 18:02:53Z bpiotrowski $ +# $Id: PKGBUILD 74092 2012-07-20 09:07:43Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,8 +8,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.2 -pkgrel=3 +pkgver=0.8.3 +pkgrel=2 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') url='http://nodejs.org/' @@ -19,18 +19,18 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('2d1a74aa9e5ecfdb4c64d200b642eb1e') +md5sums=('53604d2e3773d62e90fa5a340a362e08') build() { cd node-v${pkgver} - msg 'fixing for python2 name' + # fs#30766 + sed -i "s|var npmDir = path.resolve(node_prefix, 'lib/node_modules/npm');|var npmDir = path.join(dest_dir, node_prefix, 'lib/node_modules/npm');|" tools/installer.js + + msg 'Fixing for python2 name' find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -e "s_'python'_'python2'_" -i {} \; find test -type f -exec sed -e "s|python |python2 |" -i {} \; - #sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript sed -i "s|python |python2 |" Makefile - #find test -type f -exec sed -e 's/python/&2/' -i {} \; - #sed -i "s/python/python2/" configure export PYTHON=python2 @@ -43,9 +43,6 @@ build() { check() { cd node-v${pkgver} - - # test failures in 0.6 are known - # specifically https://github.com/joyent/node/pull/1699 make test || true } |