[arch-commits] Commit in chromium/trunk (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Oct 18 07:07:29 UTC 2017
Date: Wednesday, October 18, 2017 @ 07:07:28
Author: foutrelis
Revision: 308170
upgpkg: chromium 62.0.3202.62-1
New upstream release.
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/PKGBUILD.62
chromium/trunk/chromium-atk-r1.patch
chromium/trunk/chromium-blink-gcc7.patch
chromium/trunk/chromium-gcc-r1.patch
chromium/trunk/chromium-gn-bootstrap-r14.patch
---------------------------------+
PKGBUILD | 37 +++---
PKGBUILD.62 | 208 --------------------------------------
chromium-atk-r1.patch | 11 --
chromium-blink-gcc7.patch | 76 -------------
chromium-gcc-r1.patch | 14 --
chromium-gn-bootstrap-r14.patch | 27 ----
6 files changed, 20 insertions(+), 353 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-17 21:39:33 UTC (rev 308169)
+++ PKGBUILD 2017-10-18 07:07:28 UTC (rev 308170)
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=61.0.3163.100
+pkgver=62.0.3202.62
pkgrel=1
_launcher_ver=5
pkgdesc="A web browser built for speed, simplicity, and security"
@@ -25,19 +25,15 @@
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
chromium.desktop
breakpad-use-ucontext_t.patch
- chromium-gcc-r1.patch
- chromium-gn-bootstrap-r14.patch
- chromium-atk-r1.patch
- chromium-blink-gcc7.patch
+ crc32c-string-view-check.patch
+ chromium-gn-bootstrap-r17.patch
chromium-widevine.patch)
-sha256sums=('4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b'
+sha256sums=('e8df3150386729ddcb4971636627e54815ad447be5f122201e310f5bb0bcc362'
'4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
'028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
'6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8'
- '11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58'
- '98784c4a0a793ecf34987bc8f91ae360d78596a4a59dd47651411381f752a080'
- 'fc0e9abb77b6f8e21a7601ff53f267a854736d711b530be5bbd80d976678e98d'
- 'f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323'
+ '35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d'
+ 'd81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b'
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -47,7 +43,7 @@
[flac]=flac
#[freetype]=freetype2 # https://crbug.com/pdfium/733
[harfbuzz-ng]=harfbuzz-icu
- #[icu]=icu # Enable again when upstream supports ICU 59
+ [icu]=icu
[libdrm]=
[libjpeg]=libjpeg
#[libpng]=libpng # https://crbug.com/752403#c10
@@ -73,6 +69,15 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
+ # https://crbug.com/710701
+ local _chrome_build_hash=$(curl -s https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT |
+ base64 -d | grep -Po '^parent \K[0-9a-f]{40}$')
+ if [[ -z $_chrome_build_hash ]]; then
+ error "Unable to fetch Chrome build hash."
+ return 1
+ fi
+ echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE
+
# Enable support for the Widevine CDM plugin
# libwidevinecdm.so is not included, but can be copied over from Chrome
# (Version string doesn't seem to matter so let's go with "Pinkie Pie")
@@ -79,16 +84,14 @@
sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
patch -Np1
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347
- patch -Np1 -i ../chromium-blink-gcc7.patch
-
# Fix build with glibc 2.26
patch -Np1 -i ../breakpad-use-ucontext_t.patch
+ # Fix incorrect inclusion of <string_view> in modes other than >= C++17
+ patch -Np1 -d third_party/crc32c/src <../crc32c-string-view-check.patch
+
# Fixes from Gentoo
- patch -Np1 -i ../chromium-gcc-r1.patch
- patch -Np1 -i ../chromium-gn-bootstrap-r14.patch
- patch -Np1 -i ../chromium-atk-r1.patch
+ patch -Np1 -i ../chromium-gn-bootstrap-r17.patch
# Use Python 2
find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
Deleted: PKGBUILD.62
===================================================================
--- PKGBUILD.62 2017-10-17 21:39:33 UTC (rev 308169)
+++ PKGBUILD.62 2017-10-18 07:07:28 UTC (rev 308170)
@@ -1,208 +0,0 @@
-# $Id: PKGBUILD 277477 2016-10-01 03:36:40Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=chromium
-pkgver=62.0.3202.52
-pkgrel=1
-_launcher_ver=5
-pkgdesc="A web browser built for speed, simplicity, and security"
-arch=('i686' 'x86_64')
-url="https://www.chromium.org/Home"
-license=('BSD')
-depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
- 'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib'
- 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git')
-optdepends=('pepper-flash: support for Flash content'
- 'kdialog: needed for file dialogs in KDE'
- 'gnome-keyring: for storing passwords in GNOME keyring'
- 'kwallet: for storing passwords in KWallet')
-install=chromium.install
-source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
- chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
- chromium.desktop
- breakpad-use-ucontext_t.patch
- crc32c-string-view-check.patch
- chromium-gn-bootstrap-r17.patch
- chromium-widevine.patch)
-sha256sums=('f9d7b6c2222d8b335bdebe616650ea76a0db9993879698d8d336f24df9f0eda1'
- '4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
- '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
- '6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8'
- '35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d'
- 'd81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b'
- 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
-
-# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
-# Keys are the names in the above script; values are the dependencies in Arch
-declare -rgA _system_libs=(
- #[ffmpeg]=ffmpeg # https://crbug.com/731766
- [flac]=flac
- #[freetype]=freetype2 # https://crbug.com/pdfium/733
- [harfbuzz-ng]=harfbuzz-icu
- [icu]=icu
- [libdrm]=
- [libjpeg]=libjpeg
- #[libpng]=libpng # https://crbug.com/752403#c10
- #[libvpx]=libvpx # https://bugs.gentoo.org/611394
- [libwebp]=libwebp
- [libxml]=libxml2
- [libxslt]=libxslt
- [opus]=opus
- [re2]=re2
- [snappy]=snappy
- [yasm]=
- [zlib]=minizip
-)
-depends+=(${_system_libs[@]})
-
-# Google API keys (see https://www.chromium.org/developers/how-tos/api-keys)
-# Note: These are for Arch Linux use ONLY. For your own distribution, please
-# get your own set of keys.
-_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
-_google_default_client_id=413772536636.apps.googleusercontent.com
-_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # https://crbug.com/710701
- local _chrome_build_hash=$(curl -s https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT |
- base64 -d | grep -Po '^parent \K[0-9a-f]{40}$')
- if [[ -z $_chrome_build_hash ]]; then
- error "Unable to fetch Chrome build hash."
- return 1
- fi
- echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE
-
- # Enable support for the Widevine CDM plugin
- # libwidevinecdm.so is not included, but can be copied over from Chrome
- # (Version string doesn't seem to matter so let's go with "Pinkie Pie")
- sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
- patch -Np1
-
- # Fix build with glibc 2.26
- patch -Np1 -i ../breakpad-use-ucontext_t.patch
-
- # Fix incorrect inclusion of <string_view> in modes other than >= C++17
- patch -Np1 -d third_party/crc32c/src <../crc32c-string-view-check.patch
-
- # Fixes from Gentoo
- patch -Np1 -i ../chromium-gn-bootstrap-r17.patch
-
- # Use Python 2
- find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
-
- # There are still a lot of relative calls which need a workaround
- mkdir "$srcdir/python2-path"
- ln -s /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
- local _lib
- for _lib in ${!_system_libs[@]} ${_system_libs[libjpeg]+libjpeg_turbo}; do
- find -type f -path "*third_party/$_lib/*" \
- \! -path "*third_party/$_lib/chromium/*" \
- \! -path "*third_party/$_lib/google/*" \
- \! -path "*base/third_party/icu/*" \
- \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
- -delete
- done
-
- python2 build/linux/unbundle/replace_gn_files.py \
- --system-libraries "${!_system_libs[@]}"
-}
-
-build() {
- make -C chromium-launcher-$_launcher_ver
-
- cd "$srcdir/$pkgname-$pkgver"
-
- export PATH="$srcdir/python2-path:$PATH"
- export TMPDIR="$srcdir/temp"
- mkdir -p "$TMPDIR"
-
- local _flags=(
- 'is_clang=false'
- 'clang_use_chrome_plugins=false'
- 'is_debug=false'
- 'exclude_unwind_tables=true'
- 'fatal_linker_warnings=false'
- 'treat_warnings_as_errors=false'
- 'fieldtrial_testing_like_official_build=true'
- 'remove_webcore_debug_symbols=true'
- 'ffmpeg_branding="Chrome"'
- 'proprietary_codecs=true'
- 'link_pulseaudio=true'
- 'use_gtk3=true'
- 'use_gconf=false'
- 'use_gnome_keyring=false'
- 'use_gold=false'
- 'use_sysroot=false'
- 'linux_use_bundled_binutils=false'
- 'use_custom_libcxx=false'
- 'enable_hangout_services_extension=true'
- 'enable_widevine=true'
- 'enable_nacl=false'
- 'enable_swiftshader=false'
- "google_api_key=\"${_google_api_key}\""
- "google_default_client_id=\"${_google_default_client_id}\""
- "google_default_client_secret=\"${_google_default_client_secret}\""
- )
-
- python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}"
- out/Release/gn gen out/Release --args="${_flags[*]}" \
- --script-executable=/usr/bin/python2
-
- ninja -C out/Release chrome chrome_sandbox chromedriver widevinecdmadapter
-}
-
-package() {
- cd chromium-launcher-$_launcher_ver
- make PREFIX=/usr DESTDIR="$pkgdir" install
- install -Dm644 LICENSE \
- "$pkgdir/usr/share/licenses/chromium/LICENSE.launcher"
-
- cd "$srcdir/$pkgname-$pkgver"
-
- install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
- install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
- install -Dm644 "$srcdir/chromium.desktop" \
- "$pkgdir/usr/share/applications/chromium.desktop"
-
- install -Dm4755 out/Release/chrome_sandbox \
- "$pkgdir/usr/lib/chromium/chrome-sandbox"
-
- cp -a \
- out/Release/{chrome_{100,200}_percent,resources}.pak \
- out/Release/{*.bin,chromedriver,libwidevinecdmadapter.so} \
- out/Release/locales \
- "$pkgdir/usr/lib/chromium/"
-
- if [[ -z ${_system_libs[icu]+set} ]]; then
- cp out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
- fi
-
- ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
-
- for size in 22 24 48 64 128 256; do
- install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
- "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
- done
-
- for size in 16 32; do
- install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
- "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
- done
-
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Deleted: chromium-atk-r1.patch
===================================================================
--- chromium-atk-r1.patch 2017-10-17 21:39:33 UTC (rev 308169)
+++ chromium-atk-r1.patch 2017-10-18 07:07:28 UTC (rev 308170)
@@ -1,11 +0,0 @@
---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
-+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
-@@ -571,7 +571,7 @@
- // it's best to leave this out rather than break people's builds:
- #if defined(ATK_CHECK_VERSION)
- #if ATK_CHECK_VERSION(2, 16, 0)
-- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
-+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
- #endif
- #endif
- break;
Deleted: chromium-blink-gcc7.patch
===================================================================
--- chromium-blink-gcc7.patch 2017-10-17 21:39:33 UTC (rev 308169)
+++ chromium-blink-gcc7.patch 2017-10-18 07:07:28 UTC (rev 308170)
@@ -1,76 +0,0 @@
---- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300
-+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300
-@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked
- return *this;
- }
-
-+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
-+ DCHECK(a.prev_);
-+ DCHECK(a.next_);
-+ DCHECK(b.prev_);
-+ DCHECK(b.next_);
-+ swap(a.prev_, b.prev_);
-+ swap(a.next_, b.next_);
-+ if (b.next_ == &a) {
-+ DCHECK_EQ(b.prev_, &a);
-+ b.next_ = &b;
-+ b.prev_ = &b;
-+ } else {
-+ b.next_->prev_ = &b;
-+ b.prev_->next_ = &b;
-+ }
-+ if (a.next_ == &b) {
-+ DCHECK_EQ(a.prev_, &b);
-+ a.next_ = &a;
-+ a.prev_ = &a;
-+ } else {
-+ a.next_->prev_ = &a;
-+ a.prev_->next_ = &a;
-+ }
-+}
-+
- template <typename T, typename U, typename V, typename W>
- inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
- impl_.Swap(other.impl_);
-@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e
- erase(Find(value));
- }
-
--inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
-- DCHECK(a.prev_);
-- DCHECK(a.next_);
-- DCHECK(b.prev_);
-- DCHECK(b.next_);
-- swap(a.prev_, b.prev_);
-- swap(a.next_, b.next_);
-- if (b.next_ == &a) {
-- DCHECK_EQ(b.prev_, &a);
-- b.next_ = &b;
-- b.prev_ = &b;
-- } else {
-- b.next_->prev_ = &b;
-- b.prev_->next_ = &b;
-- }
-- if (a.next_ == &b) {
-- DCHECK_EQ(a.prev_, &b);
-- a.next_ = &a;
-- a.prev_ = &a;
-- } else {
-- a.next_->prev_ = &a;
-- a.prev_->next_ = &a;
-- }
--}
--
- inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
- DCHECK_NE(a.next_, &a);
- DCHECK_NE(b.next_, &b);
---- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300
-+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300
-@@ -5,6 +5,7 @@
- #include "platform/PlatformExport.h"
- #include "platform/wtf/ThreadSpecific.h"
-
-+#include <functional>
- #include <memory>
-
- namespace gpu {
Deleted: chromium-gcc-r1.patch
===================================================================
--- chromium-gcc-r1.patch 2017-10-17 21:39:33 UTC (rev 308169)
+++ chromium-gcc-r1.patch 2017-10-18 07:07:28 UTC (rev 308170)
@@ -1,14 +0,0 @@
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
-index 99f230ce7e9a..de2415d402f5 100644
---- a/base/numerics/safe_math_shared_impl.h
-+++ b/base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) && \
- ((defined(__clang__) && \
- ((__clang_major__ > 3) || \
-- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-- (defined(__GNUC__) && __GNUC__ >= 5))
-+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else
Deleted: chromium-gn-bootstrap-r14.patch
===================================================================
--- chromium-gn-bootstrap-r14.patch 2017-10-17 21:39:33 UTC (rev 308169)
+++ chromium-gn-bootstrap-r14.patch 2017-10-18 07:07:28 UTC (rev 308170)
@@ -1,27 +0,0 @@
-commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
-Author: Pawel Hajdan, Jr <phajdan.jr at chromium.org>
-Date: Wed Jul 26 21:51:54 2017 +0000
-
- wip
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 1390560f8e37..ff2ae57c46b0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
- 'base/metrics/histogram_samples.cc',
-+ 'base/metrics/histogram_snapshot_manager.cc',
- 'base/metrics/metrics_hashes.cc',
- 'base/metrics/persistent_histogram_allocator.cc',
- 'base/metrics/persistent_memory_allocator.cc',
-@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
- 'base/trace_event/heap_profiler_allocation_register.cc',
- 'base/trace_event/heap_profiler_event_filter.cc',
-- 'base/trace_event/heap_profiler_event_writer.cc',
-+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
- 'base/trace_event/heap_profiler_serialization_state.cc',
- 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
- 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
More information about the arch-commits
mailing list