chromium: temporarily disable nacl for i686.
This commit is contained in:
parent
a4838f298e
commit
80f8ff0841
1 changed files with 12 additions and 9 deletions
|
@ -1,15 +1,15 @@
|
|||
# Template file for 'chromium'
|
||||
pkgname=chromium
|
||||
version=19.0.1084.46
|
||||
revision=2
|
||||
revision=3
|
||||
wrksrc=$pkgname
|
||||
create_wrksrc=yes
|
||||
create_srcdir=yes
|
||||
build_requires=27
|
||||
build_wrksrc=${pkgname}-${version}
|
||||
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"
|
||||
http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$version.tar.bz2"
|
||||
#http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
|
||||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
makedepends="pkg-config which unzip yasm flex gperf perl python libudev-devel>=138 libpng-devel>=1.5.10 libgcrypt-devel libelf-devel mit-krb5-devel libXrender-devel libXScrnSaver-devel libXcomposite-devel libX11-devel libXi-devel gtk+-devel libevent-devel nss-devel alsa-lib-devel dbus-glib-devel libXdamage-devel libXtst-devel pam-devel libgnome-keyring-devel libvpx-devel speex-devel libwebp-devel pulseaudio-devel cups-devel hunspell-devel libflac-devel"
|
||||
if [ "$XBPS_MACHINE" = "x86_64" ]; then
|
||||
|
@ -21,8 +21,8 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
|||
homepage="http://www.chromium.org/"
|
||||
license="BSD"
|
||||
checksum="
|
||||
2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f
|
||||
2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42"
|
||||
2fb77e5d155343a828bd04b6b9d4469fce3033dc6b9f8b53e34a9d02c464639f"
|
||||
#2256327dc58792309911fe88996527925b79ddc7729ec78548b4adf5e4983d42"
|
||||
long_desc="
|
||||
Chromium is an open-source browser project that aims to build a safer,
|
||||
faster, and more stable way for all Internet users to experience the web.
|
||||
|
@ -33,12 +33,14 @@ long_desc="
|
|||
|
||||
This package contains the Chromium browser."
|
||||
|
||||
#XXX: nacl disabled for i686 (temporary)
|
||||
|
||||
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
|
||||
# tar xf $wrksrc/naclsdk_linux -C $wrksrc
|
||||
|
||||
ln -s $wrksrc/pepper_${version%%.*}/toolchain/linux_x86_newlib \
|
||||
native_client/toolchain/linux_x86_newlib
|
||||
|
@ -59,7 +61,8 @@ 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 \
|
||||
-Ddisable_nacl=1
|
||||
}
|
||||
|
||||
do_build() {
|
||||
|
@ -72,8 +75,8 @@ 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}
|
||||
vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname}
|
||||
# vinstall out/Release/libppGoogleNaClPluginChrome.so 755 usr/lib/${pkgname}
|
||||
# vcopy "out/Release/nacl_irt_x86_*.nexe" usr/lib/${pkgname}
|
||||
|
||||
for f in locales resources; do
|
||||
vcopy out/Release/${f} usr/lib/chromium
|
||||
|
|
Loading…
Reference in a new issue