[arch-commits] Commit in chromium/trunk (PKGBUILD chromium-gn-bootstrap-r2.patch)
Evangelos Foutras
foutrelis at archlinux.org
Thu Apr 20 06:22:07 UTC 2017
Date: Thursday, April 20, 2017 @ 06:22:05
Author: foutrelis
Revision: 293293
upgpkg: chromium 58.0.3029.81-1
New upstream release.
Added:
chromium/trunk/chromium-gn-bootstrap-r2.patch
Modified:
chromium/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 35 +++++++++++++++--------------------
chromium-gn-bootstrap-r2.patch | 13 +++++++++++++
2 files changed, 28 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-19 19:58:12 UTC (rev 293292)
+++ PKGBUILD 2017-04-20 06:22:05 UTC (rev 293293)
@@ -13,7 +13,7 @@
[icu]=icu
[libjpeg]=libjpeg
[libpng]=libpng
- [libvpx]=libvpx
+ #[libvpx]=libvpx # https://bugs.gentoo.org/show_bug.cgi?id=611394
[libwebp]=libwebp
#[libxml]=libxml2 # https://bugs.archlinux.org/task/29939
[libxslt]=libxslt
@@ -24,10 +24,10 @@
)
pkgname=chromium
-pkgver=57.0.2987.133
+pkgver=58.0.3029.81
pkgrel=1
_launcher_ver=3
-pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
+pkgdesc="A web browser built for speed, simplicity, and security"
arch=('i686' 'x86_64')
url="https://www.chromium.org/Home"
license=('BSD')
@@ -35,7 +35,7 @@
'ttf-font' 'systemd' 'dbus' 'libpulse' 'perl' 'perl-file-basedir'
'pciutils' 'desktop-file-utils' 'hicolor-icon-theme')
depends+=(${_system_libs[@]})
-makedepends=('gtk3' 'python2' 'gperf' 'yasm' 'mesa' 'ninja' 'git')
+makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git')
optdepends=('kdialog: needed for file dialogs in KDE'
'gnome-keyring: for storing passwords in GNOME keyring'
'kwallet: for storing passwords in KWallet')
@@ -44,11 +44,13 @@
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
chromium.desktop
chromium-system-ffmpeg-r4.patch
+ chromium-gn-bootstrap-r2.patch
chromium-widevine.patch)
-sha256sums=('70011770a7e522c92826a3af48d3fd28a46bf8042897d072d20c748cbf828cf7'
+sha256sums=('5ab61b7025a5143fa1b21713479b316ec7a98e262e79e84f9c9a9656179217cb'
'8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28'
'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
'e3c474dbf3822a0be50695683bd8a2c9dfc82d41c1524a20b4581883c0c88986'
+ '64d743c78183c302c42d1f289863e34c74832fca57443833e46a0a3157e2b5de'
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -70,13 +72,8 @@
# Fixes from Gentoo
patch -Np1 -i ../chromium-system-ffmpeg-r4.patch
+ patch -Np1 -i ../chromium-gn-bootstrap-r2.patch
- # Work around bug in blink in which GCC 6 optimizes away null pointer checks
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833524
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68853#c2
- sed -i '/config("compiler")/ a cflags_cc = [ "-fno-delete-null-pointer-checks" ]' \
- build/config/linux/BUILD.gn
-
# Use Python 2
find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
@@ -84,6 +81,9 @@
mkdir -p "$srcdir/python2-path"
ln -sf /usr/bin/python2 "$srcdir/python2-path/python"
+ mkdir -p third_party/node/linux/node-linux-x64/bin
+ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
# Remove bundled libraries for which we will use the system copies; this
# *should* do what the remove_bundled_libraries.py script does, with the
# added benefit of not having to list all the remaining libraries
@@ -115,7 +115,6 @@
local _flags=(
'is_clang=false'
'clang_use_chrome_plugins=false'
- 'symbol_level=0'
'is_debug=false'
'fatal_linker_warnings=false'
'treat_warnings_as_errors=false'
@@ -125,18 +124,13 @@
'proprietary_codecs=true'
'link_pulseaudio=true'
'linux_use_bundled_binutils=false'
- 'use_cups=true'
'use_gconf=false'
'use_gnome_keyring=false'
'use_gold=false'
- 'use_gtk3=false'
- 'use_kerberos=true'
- 'use_pulseaudio=true'
'use_sysroot=false'
'enable_hangout_services_extension=true'
'enable_widevine=true'
'enable_nacl=false'
- 'enable_nacl_nonsfi=false'
"google_api_key=\"${_google_api_key}\""
"google_default_client_id=\"${_google_default_client_id}\""
"google_default_client_secret=\"${_google_default_client_secret}\""
@@ -152,7 +146,7 @@
package() {
cd "$srcdir/chromium-launcher-$_launcher_ver"
- make PREFIX=/usr DESTDIR="$pkgdir" install-strip
+ make PREFIX=/usr DESTDIR="$pkgdir" install
install -Dm644 LICENSE \
"$pkgdir/usr/share/licenses/chromium/LICENSE.launcher"
@@ -166,9 +160,10 @@
install -Dm4755 out/Release/chrome_sandbox \
"$pkgdir/usr/lib/chromium/chrome-sandbox"
- cp -a out/Release/{*.pak,*.bin,chromedriver,libwidevinecdmadapter.so} \
+ cp -a \
+ out/Release/{chrome_{100,200}_percent,resources}.pak \
+ out/Release/{*.bin,chromedriver,libwidevinecdmadapter.so} \
out/Release/locales \
- out/Release/gen/content/content_resources.pak \
"$pkgdir/usr/lib/chromium/"
ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
Added: chromium-gn-bootstrap-r2.patch
===================================================================
--- chromium-gn-bootstrap-r2.patch (rev 0)
+++ chromium-gn-bootstrap-r2.patch 2017-04-20 06:22:05 UTC (rev 293293)
@@ -0,0 +1,13 @@
+Index: tools/gn/bootstrap/bootstrap.py
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/base_switches.cc',
+ 'base/build_time.cc',
+ 'base/callback_internal.cc',
++ 'base/callback_helpers.cc',
+ 'base/command_line.cc',
+ 'base/debug/activity_tracker.cc',
+ 'base/debug/alias.cc',
More information about the arch-commits
mailing list