Merge branch 'testing' of git@gitorious.org:chakra-packages/extra.git

Conflicts:
	chromium/PKGBUILD
This commit is contained in:
AlmAck 2014-07-11 21:51:05 +02:00
commit 3194c65a23

View File

@ -4,7 +4,7 @@
pkgname=chromium pkgname=chromium
pkgver=35.0.1916.153 pkgver=35.0.1916.153
pkgrel=2 pkgrel=3
_verbld=${pkgver}-1 # used for libpdf and pepper-flash _verbld=${pkgver}-1 # used for libpdf and pepper-flash
_pepperflashver=14.0.0.125 _pepperflashver=14.0.0.125
@ -18,7 +18,7 @@ arch=('x86_64')
url="http://www.chromium.org/" url="http://www.chromium.org/"
license=('BSD') license=('BSD')
depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'zlib' 'harfbuzz' 'glib2') depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'libgcrypt' 'ttf-dejavu' 'dbus' 'desktop-file-utils' 'hicolor-icon-theme' 'systemd' 'speech-dispatcher' 'flac' 'opus' 'libxml2' 'libpulse' 'icu' 'zlib' 'harfbuzz' 'glib2')
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'lib32-gcc-libs' 'subversion' 'ninja') makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' 'elfutils' 'lib32-gcc-libs' 'subversion' 'ninja' 'clang')
install=chromium.install install=chromium.install
source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${pkgver}.tar.xz source=(http://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${pkgver}.tar.xz
#http://dl.google.com/linux/chrome/rpm/stable/${CARCH}/google-chrome-stable-${_verbld}.x86_64.rpm #http://dl.google.com/linux/chrome/rpm/stable/${CARCH}/google-chrome-stable-${_verbld}.x86_64.rpm
@ -90,6 +90,13 @@ prepare() {
ln -s "$srcdir/toolchain_linux_x86-$_glibc_version/.tar.bz2" \ ln -s "$srcdir/toolchain_linux_x86-$_glibc_version/.tar.bz2" \
native_client/toolchain/.tars/toolchain_linux_x86.tar.bz2 native_client/toolchain/.tars/toolchain_linux_x86.tar.bz2
# Build with clang as a temporary solution to startup crash with GCC 4.9
mkdir -p third_party/llvm-build/Release+Asserts/bin
ln -s /usr/bin/clang third_party/llvm-build/Release+Asserts/bin/
ln -s /usr/bin/clang++ third_party/llvm-build/Release+Asserts/bin/
ln -s /usr/bin/llvm-symbolizer third_party/llvm-build/Release+Asserts/bin/
# clang 3.4 doesn't support this option
sed -i '/-Wno-absolute-value/d' build/common.gypi
} }
build() { build() {
@ -109,6 +116,8 @@ build() {
-Dgoogle_default_client_id=$_google_default_client_id -Dgoogle_default_client_id=$_google_default_client_id
-Dgoogle_default_client_secret=$_google_default_client_secret -Dgoogle_default_client_secret=$_google_default_client_secret
-Dwerror= -Dwerror=
-Dclang=1
-Dclang_use_chrome_plugins=0
-Dpython_ver=2.7 -Dpython_ver=2.7
-Dlinux_link_libpci=1 -Dlinux_link_libpci=1
-Dlinux_link_libspeechd=1 -Dlinux_link_libspeechd=1
@ -138,6 +147,7 @@ build() {
-Duse_system_yasm=1 -Duse_system_yasm=1
-Duse_system_zlib=0 -Duse_system_zlib=0
-Duse_system_v8=0 -Duse_system_v8=0
-Duse_mojo=0
-Duse_gconf=0 -Duse_gconf=0
-Dtarget_arch=x64 -Dtarget_arch=x64
-Dffmpeg_target_arch=x64 -Dffmpeg_target_arch=x64
@ -145,6 +155,7 @@ build() {
-Ddisable_glibc=1 -Ddisable_glibc=1
-Ddisable_pnacl=0 -Ddisable_pnacl=0
-Ddisable_newlib_untar=0 -Ddisable_newlib_untar=0
-Ddisable_fatal_linker_warnings=1
-Ddisable_sse2=1) -Ddisable_sse2=1)
build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"