From 4fe167bc604c5a73161f1e7d8f1285d11ef06715 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Sun, 11 Mar 2018 09:19:49 +0800 Subject: chromium: Chromium 64.0.3282.186 -> 65.0.3325.146 --- chromium/chromium/chromium-angle.patch | 89 ------------------------------ chromium/chromium/chromium-cc-memcpy.patch | 35 ------------ chromium/chromium/chromium-ffmpeg-clean.sh | 5 +- chromium/chromium/chromium-math.patch | 29 ++++++++++ chromium/chromium/chromium-stdint.patch | 21 +++++++ chromium/chromium/chromium.spec | 25 +++++---- 6 files changed, 67 insertions(+), 137 deletions(-) delete mode 100644 chromium/chromium/chromium-angle.patch delete mode 100644 chromium/chromium/chromium-cc-memcpy.patch create mode 100644 chromium/chromium/chromium-math.patch create mode 100644 chromium/chromium/chromium-stdint.patch diff --git a/chromium/chromium/chromium-angle.patch b/chromium/chromium/chromium-angle.patch deleted file mode 100644 index 462b8ae..0000000 --- a/chromium/chromium/chromium-angle.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001 -From: Kai Ninomiya -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 -Commit-Queue: Kai Ninomiya ---- - -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 --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 --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; } diff --git a/chromium/chromium/chromium-cc-memcpy.patch b/chromium/chromium/chromium-cc-memcpy.patch deleted file mode 100644 index dd2fd57..0000000 --- a/chromium/chromium/chromium-cc-memcpy.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001 -From: Tomas Popela -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 -Reviewed-by: vmpstr -Commit-Queue: Thomas Anderson -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 -+ - namespace cc { - - ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry( --- -2.15.1 - diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh index 7ab7cbb..4d74e2d 100755 --- a/chromium/chromium/chromium-ffmpeg-clean.sh +++ b/chromium/chromium/chromium-ffmpeg-clean.sh @@ -100,6 +100,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/h264chroma.h \ libavcodec/hpeldsp.h \ libavcodec/hwaccel.h \ + libavcodec/hwaccels.h \ libavcodec/idctdsp.h \ libavcodec/internal.h \ libavcodec/kbdwin.h \ @@ -122,6 +123,8 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/mpegvideodsp.h \ libavcodec/mpegvideoencdsp.h \ libavcodec/options_table.h \ + libavcodec/opus_celt.h \ + libavcodec/opus_pvq.h \ libavcodec/opus_rc.h \ libavcodec/pcm_tablegen.h \ libavcodec/pixblockdsp.h \ @@ -171,8 +174,6 @@ header_files=" libavcodec/x86/inline_asm.h \ libavutil/x86/intreadwrite.h \ libavutil/x86/intmath.h libavutil/x86/timer.h \ - libavutil/atomic.h \ - libavutil/atomic_gcc.h \ libavutil/attributes.h \ libavutil/audio_fifo.h \ libavutil/avassert.h \ diff --git a/chromium/chromium/chromium-math.patch b/chromium/chromium/chromium-math.patch new file mode 100644 index 0000000..6c7c747 --- /dev/null +++ b/chromium/chromium/chromium-math.patch @@ -0,0 +1,29 @@ +From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Sat, 27 Jan 2018 20:03:37 +0000 +Subject: [PATCH] Fix build with glibc 2.27 + +BUG=806340 +TBR=hamelphi@chromium.org + +Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e +Reviewed-on: https://chromium-review.googlesource.com/890059 +Reviewed-by: Thomas Anderson +Reviewed-by: Philippe Hamel +Commit-Queue: Thomas Anderson +Cr-Commit-Position: refs/heads/master@{#532249} +--- + +diff --git a/components/assist_ranker/ranker_example_util.cc b/components/assist_ranker/ranker_example_util.cc +index 54d4dbd..ceedd8f 100644 +--- a/components/assist_ranker/ranker_example_util.cc ++++ b/components/assist_ranker/ranker_example_util.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "components/assist_ranker/ranker_example_util.h" + #include "base/bit_cast.h" + #include "base/format_macros.h" diff --git a/chromium/chromium/chromium-stdint.patch b/chromium/chromium/chromium-stdint.patch new file mode 100644 index 0000000..8774439 --- /dev/null +++ b/chromium/chromium/chromium-stdint.patch @@ -0,0 +1,21 @@ +From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001 +From: Tomas Popela +Date: Wed, 31 Jan 2018 18:57:07 +0000 +Subject: [PATCH] Add missing stdint include + +diff --git a/chrome/browser/vr/sample_queue.cc b/chrome/browser/vr/sample_queue.cc +index c2ca777ce90c..53cb3aab1576 100644 +--- a/chrome/browser/vr/sample_queue.cc ++++ b/chrome/browser/vr/sample_queue.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include ++ + #include "chrome/browser/vr/sample_queue.h" + + namespace vr { +-- +2.16.2 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 5791063..43194dd 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -58,7 +58,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 64.0.3282.186 +Version: 65.0.3325.146 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -98,14 +98,10 @@ Source13: chromium-browser.appdata.xml # https://src.fedoraproject.org/cgit/rpms/chromium.git/commit/?id=0df9641 Patch10: chromium-last-commit-position.patch -# Add a patch from Gentoo to fix ANGLE build -# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8dd9f -Patch20: chromium-angle.patch - -# Add a patch from Gentoo to fix compositor build -# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b71cea -# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad380a -Patch30: chromium-cc-memcpy.patch +# Add two patches from Gentoo to add the missing includes +# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e99b +Patch20: chromium-stdint.patch +Patch21: chromium-math.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -285,6 +281,7 @@ Conflicts: chromedriver-unstable third_party/khronos \ third_party/leveldatabase \ third_party/libaddressinput \ + third_party/libaom \ third_party/libjingle \ third_party/libphonenumber \ third_party/libsecret \ @@ -330,6 +327,7 @@ Conflicts: chromedriver-unstable third_party/protobuf \ third_party/protobuf/third_party/six \ third_party/qcms \ + third_party/s2cellid \ third_party/sfntly \ third_party/skia \ third_party/skia/third_party/gif \ @@ -358,11 +356,13 @@ Conflicts: chromedriver-unstable third_party/zlib/google \ url/third_party/mozilla \ v8/src/third_party/valgrind \ + v8/src/third_party/utf8-decoder \ v8/third_party/inspector_protocol ./build/linux/unbundle/replace_gn_files.py --system-libraries \ flac \ freetype \ + fontconfig \ %if %{with system_libicu} icu \ %endif @@ -426,7 +426,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=( @@ -436,7 +436,6 @@ gn_args=( use_custom_libcxx=false use_aura=true use_cups=true - use_gconf=false use_gnome_keyring=true use_gio=true use_kerberos=true @@ -596,6 +595,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Mar 08 2018 - Ting-Wei Lan - 65.0.3325.146-100 +- Update to 65.0.3325.146 +- Temporarily add -fpermissive to CXXFLAGS + * Mon Feb 26 2018 - Ting-Wei Lan - 64.0.3282.186-100 - Update to 64.0.3282.186 -- cgit v1.2.3