diff options
author | graysky | 2019-09-11 15:30:59 -0400 |
---|---|---|
committer | graysky | 2019-09-11 15:30:59 -0400 |
commit | a1dd7fb06f6ea059c75d72d57363c8109f236be7 (patch) | |
tree | 62dad5753facc86adae0ef365b82bd6f646b15b0 | |
parent | 7864789760673b19659df6500ef647b3176ae66b (diff) | |
download | aur-a1dd7fb06f6ea059c75d72d57363c8109f236be7.tar.gz |
Update to 77.0.3865.75-1
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 34 | ||||
-rw-r--r-- | chromium-system-icu.patch | 20 | ||||
-rw-r--r-- | chromium-system-zlib.patch | 25 | ||||
-rw-r--r-- | fix-wrong-string-initialization-in-LinkedHashSet.patch | 135 | ||||
-rw-r--r-- | include-limits-in-web_time_range.cc.patch | 31 | ||||
-rw-r--r-- | include-memory-in-one_euro_filter.h.patch | 32 | ||||
-rw-r--r-- | link-against-harfbuzz-subset.patch | 55 |
8 files changed, 345 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = chromium-no-extras pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver - pkgver = 76.0.3809.132 + pkgver = 77.0.3865.75 pkgrel = 1 url = https://www.chromium.org/Home install = chromium.install @@ -52,14 +52,26 @@ pkgbase = chromium-no-extras optdepends = kdialog: needed for file dialogs in KDE optdepends = gnome-keyring: for storing passwords in GNOME keyring optdepends = kwallet: for storing passwords in KWallet - provides = chromium=76.0.3809.132 + provides = chromium=77.0.3865.75 conflicts = chromium - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-76.0.3809.132.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.75.tar.xz source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz + source = include-memory-in-one_euro_filter.h.patch + source = link-against-harfbuzz-subset.patch + source = fix-wrong-string-initialization-in-LinkedHashSet.patch + source = include-limits-in-web_time_range.cc.patch + source = chromium-system-icu.patch + source = chromium-system-zlib.patch source = chromium-widevine.patch source = chromium-skia-harmony.patch - sha256sums = d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241 + sha256sums = eb952ff241e719cbdcc2aae1832ecc1dd2263736ab38ee1dbf88ac9120119789 sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 + sha256sums = 33a5bcd1df2cc7aa7467fa882790ef143a4497d2b704c9e1ea86c8ede90c2d90 + sha256sums = ab986e4b723dfcedab1bc8dcada07526facae28a8a7ff3345f658532c1d99987 + sha256sums = 840f555020751ec284dca35b9317a9dd7dc69fcb910ea1cae2dd7cc9b237dfb7 + sha256sums = d3dfe3c86901a11636972a774ed6c941ac76e38c9e4a384f458043a0a03291a9 + sha256sums = e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5 + sha256sums = 0f7ba6882844542a7226b419dfefc5b6a16b5b7882698bd773b5ee9148aa6e87 sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1 @@ -6,7 +6,7 @@ pkgname=chromium-no-extras _pkgname=chromium -pkgver=76.0.3809.132 +pkgver=77.0.3865.75 pkgrel=1 _launcher_ver=6 pkgdesc="Chromium without hangout services, widevine, pipewire, or chromedriver" @@ -27,10 +27,22 @@ optdepends=('pepper-flash: support for Flash content' 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 + include-memory-in-one_euro_filter.h.patch + link-against-harfbuzz-subset.patch + fix-wrong-string-initialization-in-LinkedHashSet.patch + include-limits-in-web_time_range.cc.patch + chromium-system-icu.patch + chromium-system-zlib.patch chromium-widevine.patch chromium-skia-harmony.patch) -sha256sums=('d54e4640b5e399d170dffbc5bcff65157eb1b29314b94b5d808f727d9ce45241' +sha256sums=('eb952ff241e719cbdcc2aae1832ecc1dd2263736ab38ee1dbf88ac9120119789' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' + '33a5bcd1df2cc7aa7467fa882790ef143a4497d2b704c9e1ea86c8ede90c2d90' + 'ab986e4b723dfcedab1bc8dcada07526facae28a8a7ff3345f658532c1d99987' + '840f555020751ec284dca35b9317a9dd7dc69fcb910ea1cae2dd7cc9b237dfb7' + 'd3dfe3c86901a11636972a774ed6c941ac76e38c9e4a384f458043a0a03291a9' + 'e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5' + '0f7ba6882844542a7226b419dfefc5b6a16b5b7882698bd773b5ee9148aa6e87' 'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b' '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') @@ -82,6 +94,22 @@ prepare() { third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \ third_party/libxml/chromium/libxml_utils.cc + # https://crbug.com/819294 + patch -Np1 -i ../include-memory-in-one_euro_filter.h.patch + + # https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ + patch -Np1 -i ../link-against-harfbuzz-subset.patch + + # https://crbug.com/980025 + patch -Np1 -i ../fix-wrong-string-initialization-in-LinkedHashSet.patch + + # https://crbug.com/992832 + patch -Np1 -i ../include-limits-in-web_time_range.cc.patch + + # Fixes from Gentoo + patch -Np1 -i ../chromium-system-icu.patch + patch -Np1 -i ../chromium-system-zlib.patch + # Load Widevine CDM if available patch -Np1 -i ../chromium-widevine.patch @@ -196,7 +224,7 @@ package() { cp out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/" fi - for size in 22 24 48 64 128 256; do + for size in 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 diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch new file mode 100644 index 000000000000..1f848d7ee2be --- /dev/null +++ b/chromium-system-icu.patch @@ -0,0 +1,20 @@ +diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn +index 4450e40..9ca36dd 100644 +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -96,6 +96,7 @@ shim_headers("icui18n_shim") { + "unicode/fpositer.h", + "unicode/gender.h", + "unicode/gregocal.h", ++ "unicode/listformatter.h", + "unicode/measfmt.h", + "unicode/measunit.h", + "unicode/measure.h", +@@ -178,7 +179,6 @@ shim_headers("icuuc_shim") { + "unicode/icudataver.h", + "unicode/icuplug.h", + "unicode/idna.h", +- "unicode/listformatter.h", + "unicode/localpointer.h", + "unicode/locdspnm.h", + "unicode/locid.h", diff --git a/chromium-system-zlib.patch b/chromium-system-zlib.patch new file mode 100644 index 000000000000..d6c45ad816d8 --- /dev/null +++ b/chromium-system-zlib.patch @@ -0,0 +1,25 @@ +From e1bbdec720a333937bd1b990ae0f7ee97db0d3b0 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Fri, 28 Jun 2019 15:56:23 +0000 +Subject: [PATCH] update zlib + +--- + third_party/perfetto/gn/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn +index c951f5f..297eee3 100644 +--- a/third_party/perfetto/gn/BUILD.gn ++++ b/third_party/perfetto/gn/BUILD.gn +@@ -200,7 +200,7 @@ group("zlib") { + "//buildtools:zlib", + ] + } else if (build_with_chromium) { +- public_configs = [ "//third_party/zlib:zlib_config" ] ++ public_configs = [ "//third_party/zlib:system_zlib" ] + public_deps = [ + "//third_party/zlib", + ] +-- +2.21.0 + diff --git a/fix-wrong-string-initialization-in-LinkedHashSet.patch b/fix-wrong-string-initialization-in-LinkedHashSet.patch new file mode 100644 index 000000000000..0047c99f044d --- /dev/null +++ b/fix-wrong-string-initialization-in-LinkedHashSet.patch @@ -0,0 +1,135 @@ +From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001 +From: Jeremy Roman <jbroman@chromium.org> +Date: Wed, 7 Aug 2019 13:26:48 +0000 +Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset + initialization would be bad. + +Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits. + +Bug: 980025 +Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948 +Reviewed-by: Kentaro Hara <haraken@chromium.org> +Reviewed-by: Yutaka Hirano <yhirano@chromium.org> +Commit-Queue: Jeremy Roman <jbroman@chromium.org> +Cr-Commit-Position: refs/heads/master@{#684731} +--- + .../renderer/platform/fonts/font_cache_key.h | 4 ++ + .../renderer/platform/wtf/linked_hash_set.h | 10 ++++- + .../platform/wtf/list_hash_set_test.cc | 45 +++++++++++++++++-- + 3 files changed, 55 insertions(+), 4 deletions(-) + +diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h +index 0efc8fb909..90063cb2ea 100644 +--- a/third_party/blink/renderer/platform/fonts/font_cache_key.h ++++ b/third_party/blink/renderer/platform/fonts/font_cache_key.h +@@ -133,6 +133,10 @@ struct FontCacheKeyHash { + + struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> { + STATIC_ONLY(FontCacheKeyTraits); ++ ++ // std::string's empty state need not be zero in all implementations, ++ // and it is held within FontFaceCreationParams. ++ static const bool kEmptyValueIsZero = false; + }; + + } // namespace blink +diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h +index b35b6e95f1..77e524c084 100644 +--- a/third_party/blink/renderer/platform/wtf/linked_hash_set.h ++++ b/third_party/blink/renderer/platform/wtf/linked_hash_set.h +@@ -146,6 +146,11 @@ class LinkedHashSetNode : public LinkedHashSetNodeBase { + LinkedHashSetNodeBase* next) + : LinkedHashSetNodeBase(prev, next), value_(value) {} + ++ LinkedHashSetNode(ValueArg&& value, ++ LinkedHashSetNodeBase* prev, ++ LinkedHashSetNodeBase* next) ++ : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {} ++ + LinkedHashSetNode(LinkedHashSetNode&& other) + : LinkedHashSetNodeBase(std::move(other)), + value_(std::move(other.value_)) {} +@@ -445,10 +450,13 @@ struct LinkedHashSetTraits + + // The slot is empty when the next_ field is zero so it's safe to zero + // the backing. +- static const bool kEmptyValueIsZero = true; ++ static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero; + + static const bool kHasIsEmptyValueFunction = true; + static bool IsEmptyValue(const Node& node) { return !node.next_; } ++ static Node EmptyValue() { ++ return Node(ValueTraits::EmptyValue(), nullptr, nullptr); ++ } + + static const int kDeletedValue = -1; + +diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc +index 4c3f8990b0..cd1be0089b 100644 +--- a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc ++++ b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc +@@ -487,6 +487,7 @@ struct Simple { + }; + + struct Complicated { ++ Complicated() : Complicated(0) {} + Complicated(int value) : simple_(value) { objects_constructed_++; } + + Complicated(const Complicated& other) : simple_(other.simple_) { +@@ -495,9 +496,6 @@ struct Complicated { + + Simple simple_; + static int objects_constructed_; +- +- private: +- Complicated() = delete; + }; + + int Complicated::objects_constructed_ = 0; +@@ -731,4 +729,45 @@ TYPED_TEST(ListOrLinkedHashSetMoveOnlyTest, MoveOnlyValue) { + + } // anonymous namespace + ++// A unit type which objects to its state being initialized wrong. ++struct InvalidZeroValue { ++ InvalidZeroValue() = default; ++ InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {} ++ ~InvalidZeroValue() { CHECK(ok_); } ++ bool IsHashTableDeletedValue() const { return deleted_; } ++ ++ bool ok_ = true; ++ bool deleted_ = false; ++}; ++ ++template <> ++struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> { ++ static const bool kEmptyValueIsZero = false; ++}; ++ ++template <> ++struct DefaultHash<InvalidZeroValue> { ++ struct Hash { ++ static unsigned GetHash(const InvalidZeroValue&) { return 0; } ++ static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) { ++ return true; ++ } ++ }; ++}; ++ ++template <typename Set> ++class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {}; ++ ++using InvalidZeroValueSetTypes = ++ testing::Types<ListHashSet<InvalidZeroValue>, ++ ListHashSet<InvalidZeroValue, 1>, ++ LinkedHashSet<InvalidZeroValue>>; ++TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes); ++ ++TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) { ++ using Set = TypeParam; ++ Set set; ++ set.insert(InvalidZeroValue()); ++} ++ + } // namespace WTF diff --git a/include-limits-in-web_time_range.cc.patch b/include-limits-in-web_time_range.cc.patch new file mode 100644 index 000000000000..8ef9c77bcfb3 --- /dev/null +++ b/include-limits-in-web_time_range.cc.patch @@ -0,0 +1,31 @@ +From 5baf7df7f4c5971dab552897eeef94b194650ce5 Mon Sep 17 00:00:00 2001 +From: Dave Tapuska <dtapuska@chromium.org> +Date: Mon, 12 Aug 2019 22:30:13 +0000 +Subject: [PATCH] Fix build failure due to missing include for + std::numeric_limits usage. + +Some configurations fail to build, limits should have been included. + +BUG=992832 + +Change-Id: I894ba0543bfcef101c93259e39a31d12ae6d035c +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1747981 +Commit-Queue: Dave Tapuska <dtapuska@chromium.org> +Reviewed-by: Mostyn Bramley-Moore <mostynb@vewd.com> +Cr-Commit-Position: refs/heads/master@{#686214} +--- + third_party/blink/renderer/platform/exported/web_time_range.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/third_party/blink/renderer/platform/exported/web_time_range.cc b/third_party/blink/renderer/platform/exported/web_time_range.cc +index 384566a13e..68d83e14fe 100644 +--- a/third_party/blink/renderer/platform/exported/web_time_range.cc ++++ b/third_party/blink/renderer/platform/exported/web_time_range.cc +@@ -31,6 +31,7 @@ + #include "third_party/blink/public/platform/web_time_range.h" + + #include <cmath> ++#include <limits> + + namespace blink { + diff --git a/include-memory-in-one_euro_filter.h.patch b/include-memory-in-one_euro_filter.h.patch new file mode 100644 index 000000000000..d4a323f536fc --- /dev/null +++ b/include-memory-in-one_euro_filter.h.patch @@ -0,0 +1,32 @@ +From 8c747a9c14ed4905f60f6680e2e09e33ea34163e Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena@lge.com> +Date: Fri, 26 Jul 2019 16:18:17 +0000 +Subject: [PATCH] IWYU: include <memory> in one_euro_filter.h as it uses + std::unique_ptr +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: 819294 +Change-Id: Ie1530f7046b0c8eb76e26adca530fa57c67ed876 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720637 +Reviewed-by: Ella Ge <eirage@chromium.org> +Commit-Queue: José Dapena Paz <jose.dapena@lge.com> +Cr-Commit-Position: refs/heads/master@{#681321} +--- + third_party/one_euro_filter/src/one_euro_filter.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/third_party/one_euro_filter/src/one_euro_filter.h b/third_party/one_euro_filter/src/one_euro_filter.h +index 7f8d15b62a..a8cd0ab9a2 100644 +--- a/third_party/one_euro_filter/src/one_euro_filter.h ++++ b/third_party/one_euro_filter/src/one_euro_filter.h +@@ -1,6 +1,8 @@ + #ifndef ONE_EURO_ONE_EURO_FILTER_H_ + #define ONE_EURO_ONE_EURO_FILTER_H_ + ++#include <memory> ++ + #include "low_pass_filter.h" + + namespace one_euro_filter { diff --git a/link-against-harfbuzz-subset.patch b/link-against-harfbuzz-subset.patch new file mode 100644 index 000000000000..05731a55b2b5 --- /dev/null +++ b/link-against-harfbuzz-subset.patch @@ -0,0 +1,55 @@ +From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Mon, 29 Jul 2019 10:54:28 +0000 +Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz + is true +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building HarfBuzz as part of Chromium, there is a single source set +with all the files we need in the build. + +Upstream HarfBuzz, on the other hand, produces a few different libraries: +harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is +true, we were only looking for (and using) harfbuzz.pc with pkg-config even +though we also use symbols from libharfbuzz-subset.so. This resulted in +errors when linking: + + ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)': + SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset' + ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy' + +as reported in +https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ + +Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288 +Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Commit-Queue: Dominik Röttsches <drott@chromium.org> +Reviewed-by: Dominik Röttsches <drott@chromium.org> +Cr-Commit-Position: refs/heads/master@{#681760} +--- + third_party/harfbuzz-ng/BUILD.gn | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn +index 37d8e334c2..72013eb1db 100644 +--- a/third_party/harfbuzz-ng/BUILD.gn ++++ b/third_party/harfbuzz-ng/BUILD.gn +@@ -16,7 +16,10 @@ if (use_system_harfbuzz) { + "//third_party:freetype_harfbuzz", + "//third_party/freetype:freetype_source", + ] +- packages = [ "harfbuzz" ] ++ packages = [ ++ "harfbuzz", ++ "harfbuzz-subset", ++ ] + } + } else { + config("harfbuzz_config") { |