diff options
author | Ting-Wei Lan <lantw44@gmail.com> | 2018-10-19 08:46:40 +0800 |
---|---|---|
committer | Ting-Wei Lan <lantw44@gmail.com> | 2018-10-19 08:46:40 +0800 |
commit | 5f2837d631da271a93b8c63b7d1403d7c35a8369 (patch) | |
tree | 705bd8a2bf422a0d1320f88d5d3e4a5d4fc6429b | |
parent | 43079e260603eb84eff9481f8d7b403dd2bfe3d9 (diff) | |
download | copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar.gz copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar.bz2 copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar.lz copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar.xz copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.tar.zst copr-rpm-spec-5f2837d631da271a93b8c63b7d1403d7c35a8369.zip |
chromium: Chromium 69.0.3497.100 -> 70.0.3538.67
-rw-r--r-- | chromium/chromium/chromium-gcc8-r588316.patch | 98 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc8-r588547.patch | 30 | ||||
-rw-r--r-- | chromium/chromium/chromium-gcc8-r589614.patch | 37 | ||||
-rw-r--r-- | chromium/chromium/chromium-nacl-llvm-ar.patch | 24 | ||||
-rw-r--r-- | chromium/chromium/chromium.spec | 31 |
5 files changed, 199 insertions, 21 deletions
diff --git a/chromium/chromium/chromium-gcc8-r588316.patch b/chromium/chromium/chromium-gcc8-r588316.patch new file mode 100644 index 0000000..d980805 --- /dev/null +++ b/chromium/chromium/chromium-gcc8-r588316.patch @@ -0,0 +1,98 @@ +From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001 +From: Wang Qing <wangqing-hf@loongson.cn> +Date: Mon, 3 Sep 2018 02:41:08 +0000 +Subject: [PATCH] Fix build error for blink. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This CLs fixed the error of constexpr function call to non-constexpr function. + +Bug: 878202 +Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9 +Reviewed-on: https://chromium-review.googlesource.com/1192467 +Commit-Queue: 汪 清 <wangqing-hf@loongson.cn> +Reviewed-by: Eric Willigers <ericwilligers@chromium.org> +Cr-Commit-Position: refs/heads/master@{#588316} +--- + .../core/animation/animation_time_delta.cc | 22 ++++++++++++++ + .../core/animation/animation_time_delta.h | 30 +++++++------------ + 2 files changed, 32 insertions(+), 20 deletions(-) + +diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc +index 1b25469c7f2f..2e30a18890da 100644 +--- a/third_party/blink/renderer/core/animation/animation_time_delta.cc ++++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc +@@ -7,6 +7,28 @@ + namespace blink { + + #if !defined(BLINK_ANIMATION_USE_TIME_DELTA) ++// Comparison operators on AnimationTimeDelta. ++bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs) { ++ return lhs.InSecondsF() == rhs.InSecondsF(); ++} ++bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs) { ++ return lhs.InSecondsF() != rhs.InSecondsF(); ++} ++bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs) { ++ return lhs.InSecondsF() > rhs.InSecondsF(); ++} ++bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs) { ++ return lhs.InSecondsF() >= rhs.InSecondsF(); ++} ++bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs) { ++ return lhs.InSecondsF() <= rhs.InSecondsF(); ++} ++ + std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) { + return os << time.InSecondsF() << " s"; + } +diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h +index 1903c1150d3e..95d218466d90 100644 +--- a/third_party/blink/renderer/core/animation/animation_time_delta.h ++++ b/third_party/blink/renderer/core/animation/animation_time_delta.h +@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) { + } + + // Comparison operators on AnimationTimeDelta. +-constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, +- const AnimationTimeDelta& rhs) { +- return lhs.InSecondsF() == rhs.InSecondsF(); +-} +-constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, +- const AnimationTimeDelta& rhs) { +- return lhs.InSecondsF() != rhs.InSecondsF(); +-} +-constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, +- const AnimationTimeDelta& rhs) { +- return lhs.InSecondsF() > rhs.InSecondsF(); +-} +-constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, +- const AnimationTimeDelta& rhs) { +- return lhs.InSecondsF() >= rhs.InSecondsF(); +-} +-constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, +- const AnimationTimeDelta& rhs) { +- return lhs.InSecondsF() <= rhs.InSecondsF(); +-} ++bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs); ++bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs); ++bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs); ++bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs); ++bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, ++ const AnimationTimeDelta& rhs); + + // Defined to allow DCHECK_EQ/etc to work with the class. + CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time); +-- +2.17.2 + diff --git a/chromium/chromium/chromium-gcc8-r588547.patch b/chromium/chromium/chromium-gcc8-r588547.patch new file mode 100644 index 0000000..5f12f7f --- /dev/null +++ b/chromium/chromium/chromium-gcc8-r588547.patch @@ -0,0 +1,30 @@ +From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001 +From: Henrique Nakashima <hnakashima@chromium.org> +Date: Tue, 4 Sep 2018 16:49:51 +0000 +Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t + +Bug: 879900 +Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886 +Reviewed-on: https://chromium-review.googlesource.com/1204410 +Reviewed-by: Lei Zhang <thestig@chromium.org> +Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> +Cr-Commit-Position: refs/heads/master@{#588547} +--- + pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h +index 03c54bb63800..82e82d23684d 100644 +--- a/pdf/pdfium/pdfium_mem_buffer_file_write.h ++++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h +@@ -6,6 +6,7 @@ + #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_ + + #include <stddef.h> ++#include <stdint.h> + + #include <vector> + +-- +2.17.2 + diff --git a/chromium/chromium/chromium-gcc8-r589614.patch b/chromium/chromium/chromium-gcc8-r589614.patch new file mode 100644 index 0000000..0c187fd --- /dev/null +++ b/chromium/chromium/chromium-gcc8-r589614.patch @@ -0,0 +1,37 @@ +From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001 +From: Maksim Sisov <msisov@igalia.com> +Date: Fri, 7 Sep 2018 18:57:42 +0000 +Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization + +It looks like there is bug in GCC 6, which cannot go through +structure initialization normally. + +Thus, instead of a default initialization of one of the members, +explicitly initialize it to a default value. + +Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c +Reviewed-on: https://chromium-review.googlesource.com/1213181 +Reviewed-by: Scott Violet <sky@chromium.org> +Commit-Queue: Maksim Sisov <msisov@igalia.com> +Cr-Commit-Position: refs/heads/master@{#589614} +--- + chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc +index f0a8083dc930..9021284f166d 100644 +--- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc ++++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc +@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style, + style = {part_color, .baseline = gfx::SUPERIOR}; + break; + case SuggestionAnswer::TextStyle::BOLD: +- style = {part_color, .weight = gfx::Font::Weight::BOLD}; ++ style = {part_color, .baseline = gfx::NORMAL_BASELINE, ++ .weight = gfx::Font::Weight::BOLD}; + break; + case SuggestionAnswer::TextStyle::NORMAL: + case SuggestionAnswer::TextStyle::NORMAL_DIM: +-- +2.17.2 + diff --git a/chromium/chromium/chromium-nacl-llvm-ar.patch b/chromium/chromium/chromium-nacl-llvm-ar.patch index 7fd81be..40bc529 100644 --- a/chromium/chromium/chromium-nacl-llvm-ar.patch +++ b/chromium/chromium/chromium-nacl-llvm-ar.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 76f24c9671a6..3940ee13b1a9 100644 +index 08939c54483d..a7008d7278b8 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1659,7 +1659,7 @@ config("thin_archive") { +@@ -1688,7 +1688,7 @@ config("thin_archive") { # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { @@ -12,21 +12,15 @@ index 76f24c9671a6..3940ee13b1a9 100644 } diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni -index b6f63d7556aa..066d4d854522 100644 +index e7c88708c366..bdb8ab4d36a0 100644 --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni -@@ -339,12 +339,12 @@ template("gcc_toolchain") { - # We use slightly different arflags for AIX. - extra_arflags = "-r -c -s" +@@ -336,7 +336,7 @@ template("gcc_toolchain") { } else { -- extra_arflags = "-r -c -s -D" -+ extra_arflags = "rcsD" + rspfile = "{{output}}.rsp" + rspfile_content = "{{inputs}}" +- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\"" ++ command = "\"$ar\" rcsD{{arflags}} {{output}} @\"$rspfile\"" } - # Almost all targets build with //build/config/compiler:thin_archive which - # adds -T to arflags. -- command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\"" -+ command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"$extra_arflags{{arflags}}\" @\"$rspfile\"" - description = "AR {{output}}" - rspfile_content = "{{inputs}}" - outputs = [ + # Remove the output file first so that ar doesn't try to modify the diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 8765341..aced76c 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -8,8 +8,8 @@ # Get the version number of latest stable version # $ curl -s 'https://omahaproxy.appspot.com/all?os=linux&channel=stable' | sed 1d | cut -d , -f 3 -# Require harfbuzz >= 1.5.0 for hb_glyph_info_t -%if 0%{?fedora} >= 28 +# Require harfbuzz >= 1.8.6 for hb_font_funcs_set_glyph_h_advances_func +%if 0%{?fedora} >= 29 %bcond_without system_harfbuzz %else %bcond_with system_harfbuzz @@ -44,7 +44,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 69.0.3497.100 +Version: 70.0.3538.67 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -91,6 +91,11 @@ Patch50: chromium-nacl-llvm-ar.patch # https://src.fedoraproject.org/rpms/chromium/c/cb0be2c990fc724e Patch60: chromium-bootstrap-python2.patch +# Add patches from upstream to fix build with GCC +Patch70: chromium-gcc8-r588316.patch +Patch71: chromium-gcc8-r588547.patch +Patch72: chromium-gcc8-r589614.patch + # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -216,6 +221,7 @@ find -type f -exec \ net/third_party/nss \ net/third_party/quic \ net/third_party/spdy \ + net/third_party/uri_template \ third_party/abseil-cpp \ third_party/adobe \ third_party/analytics \ @@ -283,6 +289,8 @@ find -type f -exec \ third_party/leveldatabase \ third_party/libaddressinput \ third_party/libaom \ + third_party/libaom/source/libaom/third_party/vector \ + third_party/libaom/source/libaom/third_party/x86inc \ third_party/libjingle \ third_party/libphonenumber \ third_party/libsecret \ @@ -354,6 +362,13 @@ find -type f -exec \ third_party/webdriver \ third_party/WebKit \ third_party/webrtc \ + third_party/webrtc/common_audio/third_party/fft4g \ + third_party/webrtc/common_audio/third_party/spl_sqrt_floor \ + third_party/webrtc/modules/third_party/fft \ + third_party/webrtc/modules/third_party/g711 \ + third_party/webrtc/modules/third_party/g722 \ + third_party/webrtc/rtc_base/third_party/base64 \ + third_party/webrtc/rtc_base/third_party/sigslot \ third_party/widevine \ third_party/woff2 \ third_party/xdg-utils \ @@ -363,8 +378,8 @@ find -type f -exec \ url/third_party/mozilla \ v8/src/third_party/valgrind \ v8/src/third_party/utf8-decoder \ - v8/third_party/antlr4 \ - v8/third_party/inspector_protocol + v8/third_party/inspector_protocol \ + v8/third_party/v8 ./build/linux/unbundle/replace_gn_files.py --system-libraries \ flac \ @@ -428,7 +443,7 @@ export LDFLAGS='%{__global_ldflags}' export CC=clang CXX=clang++ %else export CC=gcc CXX=g++ -export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" +export CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fpermissive" %endif gn_args=( @@ -595,6 +610,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Oct 17 2018 - Ting-Wei Lan <lantw44@gmail.com> - 70.0.3538.67-100 +- Update to 70.0.3538.67 +- Add -fpermissive to CXXFLAGS again + * Tue Sep 18 2018 - Ting-Wei Lan <lantw44@gmail.com> - 69.0.3497.100-100 - Update to 69.0.3497.100 |