diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
commit | f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch) | |
tree | c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /www-client/chromium/files | |
parent | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff) |
gentoo resync : 16.06.2018
Diffstat (limited to 'www-client/chromium/files')
11 files changed, 156 insertions, 555 deletions
diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch deleted file mode 100644 index 8ebf42a46a84..000000000000 --- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch +++ /dev/null @@ -1,30 +0,0 @@ -Drop _FORTIFY_SOURCE=2 from defines - -Gentoo toolchains enable this by default. Removing this prevents spammy -warnings about the macro being redefined. - ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1213,22 +1213,6 @@ - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] diff --git a/www-client/chromium/files/chromium-clang-r2.patch b/www-client/chromium/files/chromium-clang-r2.patch deleted file mode 100644 index aaee16717643..000000000000 --- a/www-client/chromium/files/chromium-clang-r2.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -422,18 +422,6 @@ - cflags += [ "-fcolor-diagnostics" ] - } - -- # TODO(hans): Remove this once Clang generates better optimized debug info by -- # default. https://crbug.com/765793 -- if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -- cflags += [ -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- ] -- } -- - # Print absolute paths in diagnostics. There is no precedent for doing this - # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and - # Windows developers rely on it (crbug.com/636109) so only do this on Windows. diff --git a/www-client/chromium/files/chromium-clang-r4.patch b/www-client/chromium/files/chromium-clang-r4.patch deleted file mode 100644 index 8d5122f70c3d..000000000000 --- a/www-client/chromium/files/chromium-clang-r4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/device/fido/u2f_ble_transaction.cc -+++ b/device/fido/u2f_ble_transaction.cc -@@ -131,7 +131,7 @@ - - void U2fBleTransaction::OnError() { - request_frame_.reset(); -- request_cont_fragments_ = {}; -+ request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>(); - response_frame_assembler_.reset(); - std::move(callback_).Run(base::nullopt); - } diff --git a/www-client/chromium/files/chromium-compiler-r1.patch b/www-client/chromium/files/chromium-compiler-r1.patch deleted file mode 100644 index 3c75c1d96dff..000000000000 --- a/www-client/chromium/files/chromium-compiler-r1.patch +++ /dev/null @@ -1,174 +0,0 @@ -From f1e0c5fc3b81053c8851efde9ca77e04c77d4563 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Wed, 25 Apr 2018 13:22:49 -0400 -Subject: [PATCH] Disable various compiler configs - ---- - build/config/compiler/BUILD.gn | 67 +++++++++------------------------- - 1 file changed, 18 insertions(+), 49 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 3dbf872f7038..f8b2dcc9b026 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -222,8 +222,6 @@ config("compiler") { - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ] - -@@ -474,24 +472,6 @@ config("compiler") { - cflags += [ "-fcolor-diagnostics" ] - } - -- if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -- cflags += [ -- # TODO(hans): Remove this once Clang generates better optimized debug info -- # by default. https://crbug.com/765793 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- -- # TODO(rnk): Remove this once it's the default. https://crbug.com/793819 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-fast-isel-sink-local-values=1", -- ] -- } -- - # Print absolute paths in diagnostics. There is no precedent for doing this - # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and - # Windows developers rely on it (crbug.com/636109) so only do this on Windows. -@@ -1403,10 +1383,6 @@ config("default_warnings") { - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", -- -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - } else if (use_xcode_clang) { - cflags += [ -@@ -1450,22 +1426,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1799,7 +1759,8 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - # TODO(thakis): Remove is_clang here, https://crbug.com/598772 - if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -1833,7 +1794,8 @@ config("optimize") { - } - - # Same config as 'optimize' but without the WPO flag. --config("optimize_no_wpo") { -+config("optimize_no_wpo") { } -+config("xoptimize_no_wpo") { - if (is_win) { - # Favor size over speed, /O1 must be before the common flags. The GYP - # build also specifies /Os and /GF but these are implied by /O1. -@@ -1856,7 +1818,8 @@ config("optimize_no_wpo") { - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -1880,7 +1843,8 @@ config("no_optimize") { - # Turns up the optimization level. On Windows, this implies whole program - # optimization and link-time code generation which is very expensive and should - # be used sparingly. --config("optimize_max") { -+config("optimize_max") { } -+config("xoptimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -1927,7 +1891,8 @@ config("optimize_max") { - # - # TODO(crbug.com/621335) - rework how all of these configs are related - # so that we don't need this disclaimer. --config("optimize_speed") { -+config("optimize_speed") { } -+config("xoptimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -1965,7 +1930,8 @@ config("optimize_speed") { - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - ldflags = common_optimize_on_ldflags - visibility = [ ":default_optimization" ] -@@ -2047,7 +2013,8 @@ config("afdo") { - # configs += [ "//build/config/compiler:symbols" ] - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (use_goma || is_clang) { - # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -2139,7 +2106,8 @@ config("symbols") { - # Minimal symbols. - # This config guarantees to hold symbol for stack trace which are shown to user - # when crash happens in unittests running on buildbot. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Linker symbols for backtraces only. - cflags = [] -@@ -2170,7 +2138,8 @@ config("minimal_symbols") { - } - - # No symbols. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (!is_win) { - cflags = [ "-g0" ] - asmflags = cflags --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch new file mode 100644 index 000000000000..b724cd44df70 --- /dev/null +++ b/www-client/chromium/files/chromium-cors-string-r0.patch @@ -0,0 +1,51 @@ +From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena@lge.com> +Date: Thu, 31 May 2018 17:03:37 +0000 +Subject: [PATCH] CORS legacy: add missing string include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The cors_legacy.h file includes declarations using std::string, but +it is not declared due to missing #include <string>. + +Also drop unneeded declarations in .cpp file. + +Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd +Reviewed-on: https://chromium-review.googlesource.com/1080707 +Reviewed-by: Tom Sepez <tsepez@chromium.org> +Commit-Queue: José Dapena Paz <jose.dapena@lge.com> +Cr-Commit-Position: refs/heads/master@{#563282} +--- + services/network/public/cpp/cors/cors_legacy.cc | 2 -- + services/network/public/cpp/cors/cors_legacy.h | 1 + + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc +index 8f32ac3be64e..f01af63619b5 100644 +--- a/services/network/public/cpp/cors/cors_legacy.cc ++++ b/services/network/public/cpp/cors/cors_legacy.cc +@@ -5,8 +5,6 @@ + #include "services/network/public/cpp/cors/cors_legacy.h" + + #include <algorithm> +-#include <string> +-#include <vector> + + #include "url/gurl.h" + #include "url/url_util.h" +diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h +index d2cdf026ca3a..dc9295a92c47 100644 +--- a/services/network/public/cpp/cors/cors_legacy.h ++++ b/services/network/public/cpp/cors/cors_legacy.h +@@ -5,6 +5,7 @@ + #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ + #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ + ++#include <string> + #include <vector> + + #include "base/component_export.h" +-- +2.17.1 + diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch deleted file mode 100644 index 5d9d0d26ecd5..000000000000 --- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 92b5903a360931a7ba335fc10ae2e0802652326b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 6 May 2018 13:13:37 -0400 -Subject: [PATCH] Remove arch-specic code from build_ffmpeg.py - ---- - chromium/scripts/build_ffmpeg.py | 185 ------------------------------- - 1 file changed, 185 deletions(-) - -diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py -index aa1fc54755..d7d8878db6 100755 ---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -534,201 +534,16 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, - configure_flags['Common'].extend(SetupAndroidToolchain(target_arch)) - else: - configure_flags['Common'].extend([ -- # --optflags doesn't append multiple entries, so set all at once. -- '--optflags="-O2"', - '--enable-decoder=theora,vp8', - '--enable-parser=vp3,vp8', - ]) - -- if target_os in ('linux', 'linux-noasm', 'android'): -- if target_arch == 'x64': -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--arch=x86_64', -- ]) -- if target_os != 'android': -- configure_flags['Common'].extend(['--enable-lto']) -- pass -- elif target_arch == 'ia32': -- configure_flags['Common'].extend([ -- '--arch=i686', -- '--extra-cflags="-m32"', -- '--extra-ldflags="-m32"', -- ]) -- # Android ia32 can't handle textrels and ffmpeg can't compile without -- # them. http://crbug.com/559379 -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--disable-x86asm', -- ]) -- elif target_arch == 'arm' or target_arch == 'arm-neon': -- # TODO(ihf): ARM compile flags are tricky. The final options -- # overriding everything live in chroot /build/*/etc/make.conf -- # (some of them coming from src/overlays/overlay-<BOARD>/make.conf). -- # We try to follow these here closely. In particular we need to -- # set ffmpeg internal #defines to conform to make.conf. -- # TODO(ihf): For now it is not clear if thumb or arm settings would be -- # faster. I ran experiments in other contexts and performance seemed -- # to be close and compiler version dependent. In practice thumb builds are -- # much smaller than optimized arm builds, hence we go with the global -- # CrOS settings. -- configure_flags['Common'].extend([ -- '--arch=arm', -- '--enable-armv6', -- '--enable-armv6t2', -- '--enable-vfp', -- '--enable-thumb', -- '--extra-cflags=-march=armv7-a', -- ]) -- -- if target_os == 'android': -- configure_flags['Common'].extend([ -- # Runtime neon detection requires /proc/cpuinfo access, so ensure -- # av_get_cpu_flags() is run outside of the sandbox when enabled. -- '--enable-neon', -- '--extra-cflags=-mtune=generic-armv7-a', -- # Enabling softfp lets us choose either softfp or hardfp when doing -- # the chrome build. -- '--extra-cflags=-mfloat-abi=softfp', -- ]) -- if target_arch == 'arm': -- print('arm-neon is the only supported arm arch for Android.\n') -- return 1 -- -- if target_arch == 'arm-neon': -- configure_flags['Common'].extend([ -- '--extra-cflags=-mfpu=neon', -- ]) -- else: -- configure_flags['Common'].extend([ -- '--extra-cflags=-mfpu=vfpv3-d16', -- ]) -- else: -- if host_arch != 'arm': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--extra-cflags=--target=arm-linux-gnueabihf', -- '--extra-ldflags=--target=arm-linux-gnueabihf', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_arm-sysroot'), -- '--extra-cflags=-mtune=cortex-a8', -- # NOTE: we don't need softfp for this hardware. -- '--extra-cflags=-mfloat-abi=hard', -- # For some reason configure drops this... -- '--extra-cflags=-O2', -- ]) -- -- if target_arch == 'arm-neon': -- configure_flags['Common'].extend([ -- '--enable-neon', -- '--extra-cflags=-mfpu=neon', -- ]) -- else: -- configure_flags['Common'].extend([ -- '--disable-neon', -- '--extra-cflags=-mfpu=vfpv3-d16', -- ]) -- elif target_arch == 'arm64': -- if target_os != 'android': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--cross-prefix=/usr/bin/aarch64-linux-gnu-', -- '--target-os=linux', -- '--extra-cflags=--target=aarch64-linux-gnu', -- '--extra-ldflags=--target=aarch64-linux-gnu', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_arm64-sysroot'), -- ]) -- configure_flags['Common'].extend([ -- '--arch=aarch64', -- '--enable-armv8', -- '--extra-cflags=-march=armv8-a', -- ]) -- elif target_arch == 'mipsel': -- # These flags taken from android chrome build with target_cpu='mipsel' -- configure_flags['Common'].extend([ -- '--arch=mipsel', -- '--disable-mips32r6', -- '--disable-mips32r5', -- '--disable-mips32r2', -- '--disable-mipsdsp', -- '--disable-mipsdspr2', -- '--disable-msa', -- '--enable-mipsfpu', -- '--extra-cflags=-march=mipsel', -- '--extra-cflags=-mcpu=mips32', -- # Required to avoid errors about dynamic relocation w/o -fPIC. -- '--extra-ldflags=-z notext', -- ]) -- if target_os == 'linux': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_mips-sysroot'), -- '--extra-cflags=--target=mipsel-linux-gnu', -- '--extra-ldflags=--target=mipsel-linux-gnu', -- ]) -- elif target_arch == 'mips64el': -- # These flags taken from android chrome build with target_cpu='mips64el' -- configure_flags['Common'].extend([ -- '--arch=mips64el', -- '--enable-mipsfpu', -- '--disable-mipsdsp', -- '--disable-mipsdspr2', -- '--extra-cflags=-march=mips64el', -- # Required to avoid errors about dynamic relocation w/o -fPIC. -- '--extra-ldflags=-z notext', -- ]) -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--enable-mips64r6', -- '--extra-cflags=-mcpu=mips64r6', -- '--disable-mips64r2', -- '--enable-msa', -- ]) -- if target_os == 'linux': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--sysroot=' + os.path.join( -- CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_mips64el-sysroot'), -- '--enable-mips64r2', -- '--disable-mips64r6', -- '--disable-msa', -- '--extra-cflags=-mcpu=mips64r2', -- '--extra-cflags=--target=mips64el-linux-gnuabi64', -- '--extra-ldflags=--target=mips64el-linux-gnuabi64', -- ]) -- else: -- print( -- 'Error: Unknown target arch %r for target OS %r!' % (target_arch, -- target_os), -- file=sys.stderr) -- return 1 -- - if target_os == 'linux-noasm': - configure_flags['Common'].extend([ - '--disable-asm', - '--disable-inline-asm', - ]) - -- if 'win' not in target_os: -- configure_flags['Common'].extend([ -- '--enable-pic', -- '--cc=clang', -- '--cxx=clang++', -- '--ld=clang', -- ]) -- -- # Clang Linux will use the first 'ld' it finds on the path, which will -- # typically be the system one, so explicitly configure use of Clang's -- # ld.lld, to ensure that things like cross-compilation and LTO work. -- # This does not work for arm64, ia32 and is always used on mac. -- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac': -- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld') -- - # Should be run on Mac. - if target_os == 'mac': - if host_os != 'mac': --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch b/www-client/chromium/files/chromium-gn-bootstrap-r23.patch deleted file mode 100644 index e826a4dfc37b..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0d3bbfb6b8ba05af199b49f5dd71d842f6acffda Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Fri, 27 Apr 2018 18:07:35 +0000 -Subject: [PATCH] Fix gn bootstrap - -BUG=837312 -R=dpranke - -Change-Id: Ia5c57f596388a4ba325208c638fac558984202f0 -Reviewed-on: https://chromium-review.googlesource.com/1030895 -Reviewed-by: Dirk Pranke <dpranke@chromium.org> -Commit-Queue: Dirk Pranke <dpranke@chromium.org> -Cr-Commit-Position: refs/heads/master@{#554419} ---- - tools/gn/bootstrap/bootstrap.py | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 7fa9f0489f5b..ebc32371acc3 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -525,8 +525,11 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/location.cc', - 'base/logging.cc', - 'base/md5.cc', -+ 'base/memory/platform_shared_memory_region.cc', -+ 'base/memory/read_only_shared_memory_region.cc', - 'base/memory/ref_counted.cc', - 'base/memory/ref_counted_memory.cc', -+ 'base/memory/shared_memory_mapping.cc', - 'base/memory/shared_memory_handle.cc', - 'base/memory/shared_memory_tracker.cc', - 'base/memory/weak_ptr.cc', -@@ -663,6 +666,19 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/vlog.cc', - ]) - -+ if is_win: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_win.cc' -+ ]) -+ elif is_mac: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_mac.cc' -+ ]) -+ elif is_posix: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_posix.cc' -+ ]) -+ - if is_posix: - static_libraries['base']['sources'].extend([ - 'base/base_paths_posix.cc', --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch deleted file mode 100644 index 0577dd4cf73b..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Thu, 24 May 2018 22:39:20 +0000 -Subject: [PATCH] Fix gn bootstrap - -R=dpranke - -Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44 -Reviewed-on: https://chromium-review.googlesource.com/1072740 -Reviewed-by: Dirk Pranke <dpranke@chromium.org> -Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> -Cr-Commit-Position: refs/heads/master@{#561663} ---- - tools/gn/bootstrap/bootstrap.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 0d5f42a1d4a8..300abacdbca0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/trace_event/memory_peak_detector.cc', - 'base/trace_event/memory_usage_estimator.cc', - 'base/trace_event/process_memory_dump.cc', -- 'base/trace_event/sharded_allocation_register.cc', - 'base/trace_event/trace_buffer.cc', - 'base/trace_event/trace_config.cc', - 'base/trace_event/trace_config_category_filter.cc', --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch new file mode 100644 index 000000000000..5354281caced --- /dev/null +++ b/www-client/chromium/files/chromium-libjpeg-r0.patch @@ -0,0 +1,62 @@ +From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 +From: Daniel Bratell <bratell@opera.com> +Date: Mon, 28 May 2018 13:13:01 +0000 +Subject: [PATCH] Use the same libjpeg in all of blink/platform + +The normal libjpeg renames some symbols with macros so if its +headers are included together with libjpeg-turbo's headers +in the same translation unit, there will be an inconsistent +renaming of libjpeg symbols. This happened in some extreme +jumbo configuration and resulted in confising linker errors. + +This patch changes an include so that jpeglib.h becomes included +the same way everywhere. + +Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e +Reviewed-on: https://chromium-review.googlesource.com/1073423 +Reviewed-by: Kentaro Hara <haraken@chromium.org> +Commit-Queue: Daniel Bratell <bratell@opera.com> +Cr-Commit-Position: refs/heads/master@{#562243} +--- + .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ + .../renderer/platform/image-encoders/image_encoder.h | 2 -- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +index 0c7f14c7c0e4..4c450f5d6783 100644 +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -4,6 +4,17 @@ + + #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" + ++#include "build/build_config.h" ++ ++#if defined(OS_WIN) ++#include <basetsd.h> // Included before jpeglib.h because of INT32 clash ++#endif // OS_WIN ++#include <stdio.h> // Needed by jpeglib.h ++ ++#include "jpeglib.h" // for JPEG_MAX_DIMENSION ++ ++#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++ + namespace blink { + + bool ImageEncoder::Encode(Vector<unsigned char>* dst, +diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +index 0d1460f34827..40306097d507 100644 +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +@@ -7,8 +7,6 @@ + + #include "third_party/blink/renderer/platform/platform_export.h" + #include "third_party/blink/renderer/platform/wtf/vector.h" +-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/encode/SkJpegEncoder.h" + #include "third_party/skia/include/encode/SkPngEncoder.h" +-- +2.17.1 + diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch new file mode 100644 index 000000000000..cb387a4a0030 --- /dev/null +++ b/www-client/chromium/files/chromium-libwebp-shim-r0.patch @@ -0,0 +1,43 @@ +diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn +index ab92adecf400..12574d87be58 100644 +--- a/build/linux/unbundle/libwebp.gn ++++ b/build/linux/unbundle/libwebp.gn +@@ -2,12 +2,34 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/linux/pkg_config.gni") ++import("//build/shim_headers.gni") ++ ++pkg_config("system_libwebp") { ++ packages = [ ++ "libwebp", ++ "libwebpdemux", ++ "libwebpmux", ++ ] ++} ++ ++shim_headers("libwebp_shim") { ++ root_path = "src" ++ headers = [ ++ "webp/decode.h", ++ "webp/demux.h", ++ "webp/encode.h", ++ "webp/mux.h", ++ "webp/mux_types.h", ++ "webp/types.h", ++ ] ++} ++ + source_set("libwebp_webp") { +- libs = [ +- "webp", +- "webpdemux", +- "webpmux", ++ deps = [ ++ ":libwebp_shim", + ] ++ public_configs = [ ":system_libwebp" ] + } + + group("libwebp") { diff --git a/www-client/chromium/files/chromium-widevine-r1.patch b/www-client/chromium/files/chromium-widevine-r1.patch deleted file mode 100644 index f206878cf073..000000000000 --- a/www-client/chromium/files/chromium-widevine-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -Minimal patch to get chromium to compile with widevine support - -https://bugs.gentoo.org/show_bug.cgi?id=547630 - ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,7 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - #define WIDEVINE_CDM_AVAILABLE - - #endif // WIDEVINE_CDM_VERSION_H_ |