jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'dave/master'

Browse source
This commit is contained in:
Juan RP 2012-06-28 09:49:52 +02:00
commit f044162361
6 changed files with 64 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
srcpkgs/chromium/template
View file

@ -23,9 +23,10 @@ short_desc="Google's attempt at creating a safer, faster, and more stable browse
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.chromium.org/"
license="BSD"
_url_base="http://commondatastorage.googleapis.com"
distfiles="
http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2
http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2
${_url_base}/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
checksum="
c21bdee0ec136102e10c527a0d98e3a29e40406d8f7eb63e8e0ac23801722824
aa836ba493e659f028e8624764ba7662ef4eccd609be4c6812a7901eaf63f6e4"
@ -43,14 +44,21 @@ pre_configure() {
# http://code.google.com/p/chromium/issues/detail?id=109527
sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
# Unpack nacl, file is a real POSIX tar archive compressed with bzip2.
tar xf $wrksrc/naclsdk_linux -C $wrksrc
#XXX: nacl enabled only for x86_64 (can't build it on i686)
if [ "$XBPS_MACHINE" = "x86_64" ]; then
# Unpack nacl, its a POSIX tar archive compressed with bzip2.
tar xf $wrksrc/naclsdk_linux -C $wrksrc
ln -s $wrksrc/pepper_${version%%.*}/toolchain/linux_x86_newlib \
native_client/toolchain/linux_x86_newlib
ln -s $wrksrc/pepper_${version%%.*}/toolchain/linux_x86_newlib \
native_client/toolchain/linux_x86_newlib
fi
}
do_configure() {
local _nonacl
if [ "$XBPS_MACHINE" = "i686" ]; then
_nonacl="-Ddisable_nacl=1"
fi
build/gyp_chromium -f make build/all.gyp --depth=. \
-Dwerror= -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-Drelease_extra_cflags="$CFLAGS" -Dlinux_use_gold_binary=0 \
@ -62,7 +70,7 @@ do_configure() {
-Duse_system_libevent=1 -Duse_system_ssl=0 \
-Duse_system_xdg_utils=1 -Duse_system_vpx=1 \
-Duse_system_speex=1 -Duse_system_libwebp=1 \
-Duse_hunspell=1 -Duse_system_flac=1 -Duse_gconf=0
-Duse_hunspell=1 -Duse_system_flac=1 -Duse_gconf=0 ${_nonacl}
}
do_build() {
@ -75,10 +83,13 @@ do_install() {
vinstall out/Release/chrome.pak 644 usr/lib/${pkgname}
vinstall out/Release/resources.pak 644 usr/lib/${pkgname}
vinstall out/Release/libffmpegsumo.so 755 usr/lib/${pkgname}
vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname}
vinstall out/Release/nacl_helper 755 usr/lib/$pkgname
vinstall out/Release/nacl_helper_bootstrap 755 usr/lib/$pkgname
vcopy "out/Release/nacl_irt_*.nexe" usr/lib/${pkgname}
if [ "$XBPS_MACHINE" = "x86_64" ]; then
vinstall out/Release/libppGoogleNaClPluginChrome.so 755 \
usr/lib/${pkgname}
vinstall out/Release/nacl_helper 755 usr/lib/$pkgname
vinstall out/Release/nacl_helper_bootstrap 755 usr/lib/$pkgname
vcopy "out/Release/nacl_irt_*.nexe" usr/lib/${pkgname}
fi
for f in locales resources; do
vcopy out/Release/${f} usr/lib/chromium

2
srcpkgs/nodejs/nodejs-docs.template
View file

@ -9,5 +9,5 @@ do_install()
{
vmove usr/share/man usr/share
vmkdir usr/share/doc/nodejs
vcopy "doc/api/api/*" usr/share/doc/nodejs
cp -r ${wrksrc}/doc/api ${DESTDIR}/usr/share/doc/nodejs
}

6
srcpkgs/nodejs/nodejs.rshlibs
View file

@ -1,10 +1,10 @@
librt.so.1
libssl.so.1
libcrypto.so.1
libdl.so.2
libz.so.1
libv8.so
libstdc++.so.6
libgcc_s.so.1
libpthread.so.0
libc.so.6
libz.so.1
libssl.so.1
libcrypto.so.1

31
srcpkgs/nodejs/patches/fix_v8_includes__git.patch Normal file
View file

@ -0,0 +1,31 @@
diff --git a/configure b/configure
index 338ec3c..8dd6884 100755
--- configure
+++ configure
@@ -330,7 +330,6 @@ def configure_v8(o):
o['libraries'] += ['-lv8']
if options.shared_v8_includes:
o['include_dirs'] += [options.shared_v8_includes]
- o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
def configure_openssl(o):
diff --git a/node.gyp b/node.gyp
index 0816442..933812e 100644
--- node.gyp
+++ node.gyp
@@ -177,12 +177,7 @@
'<(SHARED_INTERMEDIATE_DIR)/node_etw_provider.rc',
]
} ],
- [ 'node_shared_v8=="true"', {
- 'sources': [
- '<(node_shared_v8_includes)/v8.h',
- '<(node_shared_v8_includes)/v8-debug.h',
- ],
- }, {
+ [ 'node_shared_v8=="false"', {
'sources': [
'deps/v8/include/v8.h',
'deps/v8/include/v8-debug.h',

9
srcpkgs/nodejs/template
View file

@ -1,15 +1,16 @@
# Template file for 'nodejs'
pkgname=nodejs
version=0.6.11
version=0.8.0
homepage="http://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
makedepends="pkg-config openssl-devel v8-devel zlib-devel"
fulldepends="python"
nostrip=yes
revision=2
short_desc="Evented I/O for V8 javascript"
maintainer="davehome <davehome@redthumb.info.tm>"
license="MIT"
checksum=94bbdb2d62645fd2ad5b96e41cfec68abf004fd03fabaaf7d71c48b39013cbd1
checksum=ecafca018b5109a28537633d0433d513f68b1bae7191a1821e8eaa84ccf128ee
long_desc="
Node.js is a software system designed for writing highly-scalable internet
applications, notably web servers. Programs are written in JavaScript, using
@ -33,11 +34,9 @@ subpackages="${pkgname}-devel ${pkgname}-docs"
wrksrc=node-v${version}
do_configure()
{
./configure --prefix=/usr --shared-v8 --shared-zlib
./configure --prefix=/usr --openssl-use-sys --shared-v8 --shared-zlib
}
do_build()

6
srcpkgs/v8/template
View file

@ -1,14 +1,14 @@
# Template file for 'v8'
pkgname=v8
version=3.9.8
version=3.11.10.12
distfiles="http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-$version.tar.bz2"
makedepends="python readline-devel"
makedepends="python readline-devel which"
revision=1
short_desc="V8 JavaScript Engine"
maintainer="davehome <davehome@redthumb.info.tm>"
homepage="http://code.google.com/p/v8/"
license="BSD"
checksum=cb52a10450d99e2005b9193bd2d6b4bb716ba1d1645cfc64fd98dc4bdac01787
checksum=fc7b0e54ba1d5f07ce0bb9cf0f09aab66c9aa14861e5e8a28ef0bb2a3f729430
long_desc="
V8 is Google's open source JavaScript engine. V8 is written in C++ and is
used in Google Chrome, the open source browser from Google.