mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
extra/chromium to 64.0.3282.119-1
This commit is contained in:
parent
893b2cf731
commit
d62a3f172c
8 changed files with 226 additions and 109 deletions
|
@ -13,8 +13,8 @@ buildarch=12
|
||||||
highmem=1
|
highmem=1
|
||||||
|
|
||||||
pkgname=chromium
|
pkgname=chromium
|
||||||
pkgver=63.0.3239.132
|
pkgver=64.0.3282.119
|
||||||
pkgrel=3
|
pkgrel=1
|
||||||
_launcher_ver=5
|
_launcher_ver=5
|
||||||
pkgdesc="A web browser built for speed, simplicity, and security"
|
pkgdesc="A web browser built for speed, simplicity, and security"
|
||||||
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
|
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
|
||||||
|
@ -31,24 +31,26 @@ install=chromium.install
|
||||||
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
|
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-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
|
||||||
chromium-$pkgver.txt::https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT
|
chromium-$pkgver.txt::https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT
|
||||||
|
chromium-use-fromUTF8-for-UnicodeString-construction.patch
|
||||||
chromium-omnibox-unescape-fragment.patch
|
chromium-omnibox-unescape-fragment.patch
|
||||||
chromium-disable-SharedArrayBuffer-by-default.patch
|
|
||||||
chromium-skia-harmony.patch
|
chromium-skia-harmony.patch
|
||||||
chromium-clang-r1.patch
|
chromium-memcpy-r0.patch
|
||||||
chromium-webrtc-r0.patch
|
chromium-clang-r2.patch
|
||||||
chromium-exclude_unwind_tables.patch
|
chromium-exclude_unwind_tables.patch
|
||||||
chromium-widevine.patch
|
chromium-widevine.patch
|
||||||
|
chromium-angle-r0.patch
|
||||||
0001-ARM-toolchain-fixes.patch)
|
0001-ARM-toolchain-fixes.patch)
|
||||||
sha256sums=('84c46c2c42faaa102abe0647ee1213615a2522627124924c2741ddc2161b3d8d'
|
sha256sums=('342ea80a925d85f5155b2b423a0d3cbcf2ee5729bf107c601d7d902315d03127'
|
||||||
'4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
|
'4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
|
||||||
'ab330f30c14ea3b5e77976d674304b91cfb02251fe8771cecb0bb4092c7f6b74'
|
'a86a8ec67aed5a94557257b9826c5b8fe37005e8376e75986fee77acd066539a'
|
||||||
|
'c82c830bac7ab328a76d85fb141e150a17d02d97138a6daa4720a8a8c371a402'
|
||||||
'814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae'
|
'814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae'
|
||||||
'1e040caa43ba34c627fe3750fb44c781a74298d010ef40657ab8deb4780db70b'
|
|
||||||
'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
|
'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
|
||||||
'ab5368a3e3a67fa63b33fefc6788ad5b4a79089ef4db1011a14c3bee9fdf70c6'
|
'455f0029987d9f0532bd9a5250669af5146a9c2b65b776d4a6e2499e8aca7bb4'
|
||||||
'bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562'
|
'4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
|
||||||
'e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c'
|
'9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8'
|
||||||
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808'
|
'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808'
|
||||||
|
'ec9dbff87e8a8655090eaa456905b67936c3d0d48d6fd84e088864af39ceed47'
|
||||||
'8489d2a85b32e9b08f5c30d47b40ae41911d1915f48b6de3c41fe350dfecfef6')
|
'8489d2a85b32e9b08f5c30d47b40ae41911d1915f48b6de3c41fe350dfecfef6')
|
||||||
|
|
||||||
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
|
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
|
||||||
|
@ -56,15 +58,16 @@ sha256sums=('84c46c2c42faaa102abe0647ee1213615a2522627124924c2741ddc2161b3d8d'
|
||||||
readonly -A _system_libs=(
|
readonly -A _system_libs=(
|
||||||
[ffmpeg]=ffmpeg
|
[ffmpeg]=ffmpeg
|
||||||
[flac]=flac
|
[flac]=flac
|
||||||
|
#[fontconfig]=fontconfig # Enable for M65
|
||||||
#[freetype]=freetype2 # Using 'use_system_freetype=true' until M65
|
#[freetype]=freetype2 # Using 'use_system_freetype=true' until M65
|
||||||
#[harfbuzz-ng]=harfbuzz # Using 'use_system_harfbuzz=true' until M65
|
#[harfbuzz-ng]=harfbuzz # Using 'use_system_harfbuzz=true' until M65
|
||||||
#[icu]=icu # https://crbug.com/772655 + need M64 for ICU 60
|
[icu]=icu
|
||||||
[libdrm]=
|
[libdrm]=
|
||||||
[libjpeg]=libjpeg
|
[libjpeg]=libjpeg
|
||||||
#[libpng]=libpng # https://crbug.com/752403#c10
|
#[libpng]=libpng # https://crbug.com/752403#c10
|
||||||
#[libvpx]=libvpx # https://bugs.gentoo.org/611394
|
#[libvpx]=libvpx # https://bugs.gentoo.org/611394
|
||||||
[libwebp]=libwebp
|
[libwebp]=libwebp
|
||||||
[libxml]=libxml2
|
#[libxml]=libxml2 # https://crbug.com/736026
|
||||||
[libxslt]=libxslt
|
[libxslt]=libxslt
|
||||||
[opus]=opus
|
[opus]=opus
|
||||||
[re2]=re2
|
[re2]=re2
|
||||||
|
@ -114,18 +117,19 @@ prepare() {
|
||||||
# https://chromium-review.googlesource.com/c/chromium/src/+/712575
|
# https://chromium-review.googlesource.com/c/chromium/src/+/712575
|
||||||
patch -Np1 -i ../chromium-exclude_unwind_tables.patch
|
patch -Np1 -i ../chromium-exclude_unwind_tables.patch
|
||||||
|
|
||||||
|
# https://crbug.com/772655
|
||||||
|
patch -Np1 -i ../chromium-use-fromUTF8-for-UnicodeString-construction.patch
|
||||||
|
|
||||||
# https://crbug.com/789163
|
# https://crbug.com/789163
|
||||||
patch -Np1 -i ../chromium-omnibox-unescape-fragment.patch
|
patch -Np1 -i ../chromium-omnibox-unescape-fragment.patch
|
||||||
|
|
||||||
# https://crbug.com/798864
|
|
||||||
patch -Np1 -i ../chromium-disable-SharedArrayBuffer-by-default.patch
|
|
||||||
|
|
||||||
# https://crbug.com/skia/6663#c10
|
# https://crbug.com/skia/6663#c10
|
||||||
patch -Np4 -i ../chromium-skia-harmony.patch
|
patch -Np4 -i ../chromium-skia-harmony.patch
|
||||||
|
|
||||||
# Fixes from Gentoo
|
# Fixes from Gentoo
|
||||||
patch -Np1 -i ../chromium-clang-r1.patch
|
patch -Np1 -i ../chromium-memcpy-r0.patch
|
||||||
patch -Np1 -i ../chromium-webrtc-r0.patch
|
patch -Np1 -i ../chromium-clang-r2.patch
|
||||||
|
patch -Np1 -i ../chromium-angle-r0.patch
|
||||||
|
|
||||||
# Use Python 2
|
# Use Python 2
|
||||||
find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
|
find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
|
||||||
|
@ -187,6 +191,7 @@ build() {
|
||||||
'use_gconf=false'
|
'use_gconf=false'
|
||||||
'use_gnome_keyring=false'
|
'use_gnome_keyring=false'
|
||||||
'use_gold=false'
|
'use_gold=false'
|
||||||
|
'use_lld=false'
|
||||||
'use_sysroot=false'
|
'use_sysroot=false'
|
||||||
'linux_use_bundled_binutils=false'
|
'linux_use_bundled_binutils=false'
|
||||||
'use_custom_libcxx=false'
|
'use_custom_libcxx=false'
|
||||||
|
|
89
extra/chromium/chromium-angle-r0.patch
Normal file
89
extra/chromium/chromium-angle-r0.patch
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kai Ninomiya <kainino@chromium.org>
|
||||||
|
Date: Wed, 06 Dec 2017 14:06:53 -0800
|
||||||
|
Subject: [PATCH] Mark StaticType related functions as constexpr
|
||||||
|
|
||||||
|
Fixes compilation on some versions of GCC and probably Clang.
|
||||||
|
|
||||||
|
Follow-up to http://crrev.com/c/786317
|
||||||
|
|
||||||
|
Bug: angleproject:1432
|
||||||
|
Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/812220
|
||||||
|
Reviewed-by: Jamie Madill <jmadill@chromium.org>
|
||||||
|
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h
|
||||||
|
index e26e5ff..30b391a 100644
|
||||||
|
--- a/third_party/angle/src/compiler/translator/StaticType.h
|
||||||
|
+++ b/third_party/angle/src/compiler/translator/StaticType.h
|
||||||
|
@@ -160,7 +160,7 @@
|
||||||
|
TPrecision precision,
|
||||||
|
TQualifier qualifier,
|
||||||
|
unsigned char secondarySize>
|
||||||
|
-const TType *GetForVecMatHelper(unsigned char primarySize)
|
||||||
|
+constexpr const TType *GetForVecMatHelper(unsigned char primarySize)
|
||||||
|
{
|
||||||
|
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
|
||||||
|
basicType == EbtBool,
|
||||||
|
@@ -186,7 +186,7 @@
|
||||||
|
template <TBasicType basicType,
|
||||||
|
TPrecision precision = EbpUndefined,
|
||||||
|
TQualifier qualifier = EvqGlobal>
|
||||||
|
-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
|
||||||
|
+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1)
|
||||||
|
{
|
||||||
|
static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt ||
|
||||||
|
basicType == EbtBool,
|
||||||
|
@@ -208,7 +208,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
template <TBasicType basicType, TPrecision precision = EbpUndefined>
|
||||||
|
-const TType *GetForVec(TQualifier qualifier, unsigned char size)
|
||||||
|
+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size)
|
||||||
|
{
|
||||||
|
switch (qualifier)
|
||||||
|
{
|
||||||
|
diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp
|
||||||
|
index adf1e4e..90d4c15 100644
|
||||||
|
--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp
|
||||||
|
+++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp
|
||||||
|
@@ -236,7 +236,7 @@
|
||||||
|
pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
-bool IsGenType(const TType *type)
|
||||||
|
+constexpr bool IsGenType(const TType *type)
|
||||||
|
{
|
||||||
|
if (type)
|
||||||
|
{
|
||||||
|
@@ -248,7 +248,7 @@
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
-bool IsVecType(const TType *type)
|
||||||
|
+constexpr bool IsVecType(const TType *type)
|
||||||
|
{
|
||||||
|
if (type)
|
||||||
|
{
|
||||||
|
diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
|
||||||
|
index 04f46f1..a54d447 100644
|
||||||
|
--- a/third_party/angle/src/compiler/translator/Types.h
|
||||||
|
+++ b/third_party/angle/src/compiler/translator/Types.h
|
||||||
|
@@ -142,13 +142,13 @@
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
- TBasicType getBasicType() const { return type; }
|
||||||
|
+ constexpr TBasicType getBasicType() const { return type; }
|
||||||
|
void setBasicType(TBasicType t);
|
||||||
|
|
||||||
|
TPrecision getPrecision() const { return precision; }
|
||||||
|
void setPrecision(TPrecision p) { precision = p; }
|
||||||
|
|
||||||
|
- TQualifier getQualifier() const { return qualifier; }
|
||||||
|
+ constexpr TQualifier getQualifier() const { return qualifier; }
|
||||||
|
void setQualifier(TQualifier q) { qualifier = q; }
|
||||||
|
|
||||||
|
bool isInvariant() const { return invariant; }
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/build/config/compiler/BUILD.gn.orig 2017-10-04 08:50:15.014675936 +0000
|
--- a/build/config/compiler/BUILD.gn
|
||||||
+++ b/build/config/compiler/BUILD.gn 2017-10-04 08:50:32.831024327 +0000
|
+++ b/build/config/compiler/BUILD.gn
|
||||||
@@ -429,18 +429,6 @@
|
@@ -422,18 +422,6 @@
|
||||||
cflags += [ "-fcolor-diagnostics" ]
|
cflags += [ "-fcolor-diagnostics" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
- "-Xclang",
|
- "-Xclang",
|
||||||
- "-mllvm",
|
- "-mllvm",
|
||||||
- "-Xclang",
|
- "-Xclang",
|
||||||
- "-instcombine-lower-dbg-declare=1",
|
- "-instcombine-lower-dbg-declare=0",
|
||||||
- ]
|
- ]
|
||||||
- }
|
- }
|
||||||
-
|
-
|
|
@ -1,35 +0,0 @@
|
||||||
From a354b4ecf2434f2f6460b33031aeaf646edf5e64 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brad Nelson <bradnelson@chromium.org>
|
|
||||||
Date: Thu, 4 Jan 2018 00:36:18 -0800
|
|
||||||
Subject: [PATCH] Disable SharedArrayBuffer by default.
|
|
||||||
|
|
||||||
BUG=chromium:798864
|
|
||||||
R=jschuh@chromium.org,binji@chromium.org
|
|
||||||
|
|
||||||
Change-Id: I5ebfae41a4b4c7e89faf071e6d009ea3d9ca30d4
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/849429
|
|
||||||
Reviewed-by: Ben Smith <binji@chromium.org>
|
|
||||||
Reviewed-by: Justin Schuh <jschuh@chromium.org>
|
|
||||||
Reviewed-by: Darin Fisher <darin@chromium.org>
|
|
||||||
Commit-Queue: Brad Nelson <bradnelson@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#527460}
|
|
||||||
---
|
|
||||||
content/public/common/content_features.cc | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
|
|
||||||
index 847a1af6db7b..9075bd853d0f 100644
|
|
||||||
--- a/content/public/common/content_features.cc
|
|
||||||
+++ b/content/public/common/content_features.cc
|
|
||||||
@@ -312,7 +312,7 @@ const base::Feature kServiceWorkerScriptFullCodeCache{
|
|
||||||
|
|
||||||
// http://tc39.github.io/ecmascript_sharedmem/shmem.html
|
|
||||||
const base::Feature kSharedArrayBuffer{"SharedArrayBuffer",
|
|
||||||
- base::FEATURE_ENABLED_BY_DEFAULT};
|
|
||||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
|
||||||
|
|
||||||
// An experiment to require process isolation for the sign-in origin,
|
|
||||||
// https://accounts.google.com. Launch bug: https://crbug.com/739418.
|
|
||||||
--
|
|
||||||
2.15.1
|
|
||||||
|
|
|
@ -1,21 +1,8 @@
|
||||||
From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Jensen <pauljensen@chromium.org>
|
|
||||||
Date: Wed, 11 Oct 2017 08:37:34 -0400
|
|
||||||
Subject: [PATCH] Move exclude_unwind_tables back into declare_args
|
|
||||||
|
|
||||||
There is desire to adjust this flag manually.
|
|
||||||
|
|
||||||
BUG=762629
|
|
||||||
R=thakis@chromium.org
|
|
||||||
|
|
||||||
Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
|
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
|
||||||
index ad40fd9..50e19a4 100644
|
index ad40fd9..50e19a4 100644
|
||||||
--- a/build/config/compiler/compiler.gni
|
--- a/build/config/compiler/compiler.gni
|
||||||
+++ b/build/config/compiler/compiler.gni
|
+++ b/build/config/compiler/compiler.gni
|
||||||
@@ -68,18 +68,18 @@
|
@@ -68,19 +68,19 @@
|
||||||
|
|
||||||
# Whether or not we should use position independent code.
|
# Whether or not we should use position independent code.
|
||||||
use_pic = true
|
use_pic = true
|
||||||
|
@ -25,8 +12,9 @@ index ad40fd9..50e19a4 100644
|
||||||
+ # server. For unofficial (e.g. development) builds and non-Chrome branded
|
+ # server. For unofficial (e.g. development) builds and non-Chrome branded
|
||||||
+ # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
|
+ # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
|
||||||
+ # useful to be able to unwind at runtime.
|
+ # useful to be able to unwind at runtime.
|
||||||
+ exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
|
+ exclude_unwind_tables =
|
||||||
+ (is_chromecast && !is_cast_desktop_build && !is_debug)
|
+ (is_chrome_branded && is_official_build) ||
|
||||||
|
+ (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
|
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
|
||||||
|
@ -36,8 +24,9 @@ index ad40fd9..50e19a4 100644
|
||||||
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
|
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
|
||||||
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
|
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
|
||||||
-# to unwind at runtime.
|
-# to unwind at runtime.
|
||||||
-exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
|
-exclude_unwind_tables =
|
||||||
- (is_chromecast && !is_cast_desktop_build && !is_debug)
|
- (is_chrome_branded && is_official_build) ||
|
||||||
|
- (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia)
|
||||||
-
|
-
|
||||||
# If true, optimize for size. Does not affect windows builds.
|
# If true, optimize for size. Does not affect windows builds.
|
||||||
# Linux & Mac favor speed over size.
|
# Linux & Mac favor speed over size.
|
||||||
|
|
35
extra/chromium/chromium-memcpy-r0.patch
Normal file
35
extra/chromium/chromium-memcpy-r0.patch
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomas Popela <tomas.popela@gmail.com>
|
||||||
|
Date: Thu, 7 Dec 2017 22:33:34 +0000
|
||||||
|
Subject: [PATCH] memcpy used without including string.h
|
||||||
|
|
||||||
|
Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using
|
||||||
|
memcpy without including string.h.
|
||||||
|
|
||||||
|
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
|
||||||
|
Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/813737
|
||||||
|
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||||
|
Reviewed-by: vmpstr <vmpstr@chromium.org>
|
||||||
|
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#522579}
|
||||||
|
---
|
||||||
|
cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc
|
||||||
|
index 9e4660c685ee..95ad50b1a338 100644
|
||||||
|
--- a/cc/paint/raw_memory_transfer_cache_entry.cc
|
||||||
|
+++ b/cc/paint/raw_memory_transfer_cache_entry.cc
|
||||||
|
@@ -4,6 +4,8 @@
|
||||||
|
|
||||||
|
#include "cc/paint/raw_memory_transfer_cache_entry.h"
|
||||||
|
|
||||||
|
+#include <string.h>
|
||||||
|
+
|
||||||
|
namespace cc {
|
||||||
|
|
||||||
|
ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry(
|
||||||
|
--
|
||||||
|
2.15.1
|
||||||
|
|
|
@ -0,0 +1,68 @@
|
||||||
|
From e58fa0ba66272c5f28828b15d06c7e42a9882b3b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jungshik Shin <jshin@chromium.org>
|
||||||
|
Date: Sat, 16 Dec 2017 04:19:27 +0000
|
||||||
|
Subject: [PATCH] Use fromUTF8() for UnicodeString construction from UTF-8
|
||||||
|
|
||||||
|
Chrome's copy of ICU is built with U_CHARSET_IS_UTF8=1 so that |char *|
|
||||||
|
buffer is treated as UTF-8 when constructing UnicodeString() regardless
|
||||||
|
of the default encoding of the current locale on Linux or non-Unicode code
|
||||||
|
page on Windows.
|
||||||
|
|
||||||
|
However, some Linux distros do not set U_CHARSET_IS_UTF=1 when building
|
||||||
|
ICU and Chromium build with system_icu crashes when Chromium is run in
|
||||||
|
non-UTF-8 locale (e.g. 'C').
|
||||||
|
|
||||||
|
To make Chromium work in a non-UTF-8 locale (which is pretty rare these
|
||||||
|
days), use 'icu::UnicodeString::fromUTF8(StringPiece)' instead of
|
||||||
|
'icu::UnicodeString(const char*)'.
|
||||||
|
|
||||||
|
Bug: 772655
|
||||||
|
Test: components_unittests --gtest_filter=*IDN*
|
||||||
|
Test: Chromium built with system_icu does not crash in C locale.
|
||||||
|
Change-Id: I0daa284ec06b8e83814fc70eb8e9e5c96444ebfa
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/831247
|
||||||
|
Reviewed-by: Peter Kasting <pkasting@chromium.org>
|
||||||
|
Commit-Queue: Jungshik Shin <jshin@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/master@{#524586}
|
||||||
|
---
|
||||||
|
components/url_formatter/idn_spoof_checker.cc | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/components/url_formatter/idn_spoof_checker.cc b/components/url_formatter/idn_spoof_checker.cc
|
||||||
|
index a88c5e8f8331..aee748d8a4d5 100644
|
||||||
|
--- a/components/url_formatter/idn_spoof_checker.cc
|
||||||
|
+++ b/components/url_formatter/idn_spoof_checker.cc
|
||||||
|
@@ -110,8 +110,8 @@ IDNSpoofChecker::IDNSpoofChecker() {
|
||||||
|
|
||||||
|
// These Cyrillic letters look like Latin. A domain label entirely made of
|
||||||
|
// these letters is blocked as a simplified whole-script-spoofable.
|
||||||
|
- cyrillic_letters_latin_alike_ =
|
||||||
|
- icu::UnicodeSet(icu::UnicodeString("[асԁеһіјӏорԛѕԝхуъЬҽпгѵѡ]"), status);
|
||||||
|
+ cyrillic_letters_latin_alike_ = icu::UnicodeSet(
|
||||||
|
+ icu::UnicodeString::fromUTF8("[асԁеһіјӏорԛѕԝхуъЬҽпгѵѡ]"), status);
|
||||||
|
cyrillic_letters_latin_alike_.freeze();
|
||||||
|
|
||||||
|
cyrillic_letters_ =
|
||||||
|
@@ -141,8 +141,8 @@ IDNSpoofChecker::IDNSpoofChecker() {
|
||||||
|
UParseError parse_error;
|
||||||
|
diacritic_remover_.reset(icu::Transliterator::createFromRules(
|
||||||
|
UNICODE_STRING_SIMPLE("DropAcc"),
|
||||||
|
- icu::UnicodeString("::NFD; ::[:Nonspacing Mark:] Remove; ::NFC;"
|
||||||
|
- " ł > l; ø > o; đ > d;"),
|
||||||
|
+ icu::UnicodeString::fromUTF8("::NFD; ::[:Nonspacing Mark:] Remove; ::NFC;"
|
||||||
|
+ " ł > l; ø > o; đ > d;"),
|
||||||
|
UTRANS_FORWARD, parse_error, status));
|
||||||
|
|
||||||
|
// Supplement the Unicode confusable list by the following mapping.
|
||||||
|
@@ -158,7 +158,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
|
||||||
|
// - U+0D1F (ട) => s
|
||||||
|
extra_confusable_mapper_.reset(icu::Transliterator::createFromRules(
|
||||||
|
UNICODE_STRING_SIMPLE("ExtraConf"),
|
||||||
|
- icu::UnicodeString(
|
||||||
|
+ icu::UnicodeString::fromUTF8(
|
||||||
|
"ӏ > l; [кĸκ] > k; п > n; [ƅь] > b; в > b; м > m; н > h; "
|
||||||
|
"т > t; [шщ] > w; ട > s;"),
|
||||||
|
UTRANS_FORWARD, parse_error, status));
|
||||||
|
--
|
||||||
|
2.15.1
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
|
|
||||||
Date: Fri, 13 Oct 2017 15:49:32 +0200
|
|
||||||
Subject: [PATCH] IWYU: Include math.h for round(3).
|
|
||||||
|
|
||||||
math.h was being implicitly included, which can break the build with
|
|
||||||
alternative libc implementations.
|
|
||||||
|
|
||||||
Bug: None
|
|
||||||
Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
|
|
||||||
Reviewed-on: https://webrtc-review.googlesource.com/9384
|
|
||||||
Reviewed-by: Tommi <tommi@webrtc.org>
|
|
||||||
Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#20292}
|
|
||||||
---
|
|
||||||
p2p/base/port.cc | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
|
|
||||||
index a1b478d11..81aa0aadb 100644
|
|
||||||
--- a/third_party/webrtc/p2p/base/port.cc
|
|
||||||
+++ b/third_party/webrtc/p2p/base/port.cc
|
|
||||||
@@ -10,6 +10,8 @@
|
|
||||||
|
|
||||||
#include "p2p/base/port.h"
|
|
||||||
|
|
||||||
+#include <math.h>
|
|
||||||
+
|
|
||||||
#include <algorithm>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
--
|
|
||||||
2.15.0.rc2
|
|
||||||
|
|
Loading…
Reference in a new issue