chromium: use bundled protobuf to fix crash; install missing nacl files on x86.
This commit is contained in:
parent
0d48d5d87d
commit
5791a82cd0
1 changed files with 9 additions and 6 deletions
|
@ -2,7 +2,7 @@
|
|||
pkgname=chromium
|
||||
#See http://www.chromium.org/developers/calendar for the latest version
|
||||
version=38.0.2125.111
|
||||
revision=2
|
||||
revision=3
|
||||
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://www.chromium.org/"
|
||||
|
@ -21,7 +21,7 @@ makedepends="libpng-devel>=1.6 gtk+-devel nss-devel pciutils-devel
|
|||
libxml2-devel libxslt-devel opus-devel pulseaudio-devel nss-devel libexif-devel
|
||||
libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel>=0.4.0
|
||||
libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel
|
||||
minizip-devel jsoncpp-devel zlib-devel libcap-devel v8-devel>=3.24"
|
||||
minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel"
|
||||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe"
|
||||
|
||||
|
@ -84,8 +84,9 @@ do_configure() {
|
|||
#
|
||||
# XXX xtraeme: broken currently
|
||||
# -Duse_system_icu=1 (needs icu-52)
|
||||
# -Duse_system_v8=1
|
||||
# -Duse_system_opus=1 (needs opus_custom.h)
|
||||
# -Duse_system_protobuf
|
||||
# -Duse_system_v8=1
|
||||
# -Duse_system_zlib=1
|
||||
conf+="
|
||||
-Dclang_use_chrome_plugins=0
|
||||
|
@ -101,7 +102,6 @@ do_configure() {
|
|||
-Duse_system_libxslt=1
|
||||
-Duse_system_minizip=1
|
||||
-Duse_system_nspr=1
|
||||
-Duse_system_protobuf=1
|
||||
-Duse_system_re2=1
|
||||
-Duse_system_snappy=1
|
||||
-Duse_system_speex=1
|
||||
|
@ -184,13 +184,11 @@ do_configure() {
|
|||
build/linux/unbundle/replace_gyp_files.py ${conf}
|
||||
build/gyp_chromium --depth=. ${conf} -Drelease_extra_cflags="${CFLAGS/-fstack-protector-strong/}"
|
||||
}
|
||||
|
||||
do_build() {
|
||||
unset CC CXX
|
||||
export -n CFLAGS CXXFLAGS LDFLAGS
|
||||
ninja -C out/Release ${makejobs} chrome chrome_sandbox chromedriver
|
||||
}
|
||||
|
||||
do_install() {
|
||||
vinstall out/Release/chrome 755 usr/lib/${pkgname} ${pkgname}
|
||||
vinstall out/Release/chromedriver 755 usr/lib/${pkgname} chromedriver
|
||||
|
@ -200,6 +198,11 @@ do_install() {
|
|||
cp out/Release/nacl_helper{,_bootstrap} \
|
||||
${DESTDIR}/usr/lib/chromium
|
||||
fi
|
||||
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
|
||||
cp out/Release/nacl_irt_x86_64.nexe ${DESTDIR}/usr/lib/chromium
|
||||
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
|
||||
cp out/Release/nacl_irt_x86_32.nexe ${DESTDIR}/usr/lib/chromium
|
||||
fi
|
||||
cp out/Release/{*.pak,libffmpegsumo.so} \
|
||||
out/Release/libpdf.so \
|
||||
${DESTDIR}/usr/lib/chromium
|
||||
|
|
Loading…
Reference in a new issue