[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Wed May 21 00:26:49 UTC 2014
Date: Wednesday, May 21, 2014 @ 02:26:49
Author: foutrelis
Revision: 213352
upgpkg: chromium 35.0.1916.114-1
New upstream release.
Added:
chromium/trunk/chromium-nacl-bootstrap-cflags.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/chromium-depot-tools-r0.patch
chromium/trunk/chromium-gn-r1.patch
--------------------------------------+
PKGBUILD | 47 +++++++++++++++------------------
chromium-depot-tools-r0.patch | 11 -------
chromium-gn-r1.patch | 11 -------
chromium-nacl-bootstrap-cflags.patch | 10 +++++++
4 files changed, 32 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-21 00:21:12 UTC (rev 213351)
+++ PKGBUILD 2014-05-21 00:26:49 UTC (rev 213352)
@@ -5,8 +5,8 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=34.0.1847.137
-_toolchains_rev=12773
+pkgver=35.0.1916.114
+_toolchains_rev=12935
pkgrel=1
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('i686' 'x86_64')
@@ -13,11 +13,11 @@
url="http://www.chromium.org/"
license=('BSD')
depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
- 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'opus' 'snappy'
- 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz' 'harfbuzz-icu'
+ 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
+ 'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz'
'desktop-file-utils' 'hicolor-icon-theme')
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
- 'elfutils' 'subversion' 'clang')
+ 'elfutils' 'subversion' 'ninja' 'clang')
[[ $CARCH = x86_64 ]] && makedepends+=('lib32-gcc-libs' 'lib32-zlib')
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'gnome-keyring: for storing passwords in GNOME keyring'
@@ -33,21 +33,19 @@
naclsdk_pnacl_translator-$_toolchains_rev.tgz.sha1hash::https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/$_toolchains_rev/naclsdk_pnacl_translator.tgz.sha1hash
chromium.desktop
chromium.default
- chromium-gn-r1.patch
- chromium-depot-tools-r0.patch
+ chromium-nacl-bootstrap-cflags.patch
chromium.sh)
noextract=(naclsdk_nacl_linux_x86-$_toolchains_rev.tgz
naclsdk_pnacl_linux_x86-$_toolchains_rev.tgz
naclsdk_pnacl_translator-$_toolchains_rev.tgz)
-sha256sums=('938bf0e673101bb1aeec4c3e2e75df372cebe3d2ee93e9f4669d64ce92656027'
- '4c2adc718e53f36e38202aabf6518ceaa0244e281567433489b0a4e6dab1dc2f'
- '13cf0e23176787fcaa039c0bd230745e5cf5699877a51e77694c97392dc0973d'
- '3a087d34cf2890d85d1e2fad0d63e9db82d47c400994dfe6f0e2ee8bcedb4195'
- '581fb67410dad60fbe484294e4da2fed0de2487caabe33d595fa7abdf72e0f59'
+sha256sums=('566fcdc05d53c551d142ac9742ef69ba7c6d5a450d8ec41c0efd4fc8249f77af'
+ '2d72245cf0fc5aec95dcf315d88d787aaeff85e2fae28b8521d60a3dd95e28d4'
+ '6baee05d11e353aac83a94125722d1f85c1aaa5fae0bfea55f996bd1d9c2a6eb'
+ '142108d8ce184c3e2b18126a01bed14e286f953d90897a6d1c97f2bf7802cc0a'
+ '67005b390ba80b736b48fb1511bdf3fccd8fc808f4928e7fcca69f5677148b83'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
- 'b1ca3f17959be4fb6c031563b1ee587b7e990166c41b9d5b9dce2f91bf01fe1c'
- '14d86770eaaead42e244007ebe5a94d188f8668c2598fa6042ada87a90cae671'
+ 'd82bafd8d4d6517c2d420b2987fdbe1dfcc32d5fed74a6c0011bcb2f868225c3'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -61,9 +59,9 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Build fixes (patches from Gentoo)
- patch -Np0 -i "$srcdir/chromium-gn-r1.patch"
- patch -Np0 -i "$srcdir/chromium-depot-tools-r0.patch"
+ # Filter out -fstack-protector-strong for nacl_helper_bootstrap
+ # https://code.google.com/p/chromium/issues/detail?id=104569
+ patch -Np0 -i ../chromium-nacl-bootstrap-cflags.patch
# Use Python 2
find . -type f -exec sed -i -r \
@@ -90,6 +88,8 @@
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() {
@@ -100,9 +100,6 @@
# CFLAGS are passed through release_extra_cflags below
export -n CFLAGS CXXFLAGS
- # Silence "typedef 'x' locally defined but not used" warnings
- #CFLAGS+=' -Wno-unused-local-typedefs'
-
local _chromium_conf=(
-Dgoogle_api_key=$_google_api_key
-Dgoogle_default_client_id=$_google_default_client_id
@@ -131,20 +128,20 @@
-Duse_system_libjpeg=1
-Duse_system_libpng=1
-Duse_system_libxml=0
- -Duse_system_opus=1
-Duse_system_snappy=1
-Duse_system_ssl=0
-Duse_system_xdg_utils=1
-Duse_system_yasm=1
-Duse_system_zlib=0
+ -Duse_mojo=0
-Duse_gconf=0
- -Ddisable_glibc=1
- -Ddisable_sse2=1)
+ -Ddisable_fatal_linker_warnings=1
+ -Ddisable_glibc=1)
build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
- build/gyp_chromium -f make --depth=. "${_chromium_conf[@]}"
+ build/gyp_chromium --depth=. "${_chromium_conf[@]}"
- make BUILDTYPE=Release chrome chrome_sandbox chromedriver
+ ninja -C out/Release chrome chrome_sandbox chromedriver
}
package() {
Deleted: chromium-depot-tools-r0.patch
===================================================================
--- chromium-depot-tools-r0.patch 2014-05-21 00:21:12 UTC (rev 213351)
+++ chromium-depot-tools-r0.patch 2014-05-21 00:26:49 UTC (rev 213352)
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig 2014-01-29 01:22:52.527247671 +0000
-+++ build/gyp_chromium 2014-01-29 01:23:49.857623290 +0000
-@@ -38,8 +38,6 @@
- sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
- 'Source', 'build', 'scripts'))
-
--import find_depot_tools
--
- # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
- # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
- # seconds. Conversely, memory usage of build/gyp_chromium with Psyco
Deleted: chromium-gn-r1.patch
===================================================================
--- chromium-gn-r1.patch 2014-05-21 00:21:12 UTC (rev 213351)
+++ chromium-gn-r1.patch 2014-05-21 00:26:49 UTC (rev 213352)
@@ -1,11 +0,0 @@
---- build/gyp_chromium.orig 2014-01-16 22:55:50.292718339 +0000
-+++ build/gyp_chromium 2014-01-16 23:15:17.890248708 +0000
-@@ -370,8 +370,6 @@
- args.append('--check')
-
- supplemental_includes = GetSupplementalFiles()
-- if not RunGN(supplemental_includes):
-- sys.exit(1)
- args.extend(
- ['-I' + i for i in additional_include_files(supplemental_includes, args)])
-
Added: chromium-nacl-bootstrap-cflags.patch
===================================================================
--- chromium-nacl-bootstrap-cflags.patch (rev 0)
+++ chromium-nacl-bootstrap-cflags.patch 2014-05-21 00:26:49 UTC (rev 213352)
@@ -0,0 +1,10 @@
+--- native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp.orig 2014-05-20 23:59:56.000000000 +0300
++++ native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp 2014-05-21 00:00:28.000000000 +0300
+@@ -96,6 +96,7 @@
+ # coming after the -fno-stack-protector we added above.
+ '-fstack-protector',
+ '-fstack-protector-all',
++ '-fstack-protector-strong',
+ '-fprofile-generate',
+ '-finstrument-functions',
+ '-funwind-tables',
More information about the arch-commits
mailing list