* [PR PATCH] chromium: update to 83.0.4103.61.
@ 2020-05-20 18:21 pbui
2020-05-20 19:35 ` [PR PATCH] [Merged]: " Hoshpak
0 siblings, 1 reply; 2+ messages in thread
From: pbui @ 2020-05-20 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
There is a new pull request by pbui against master on the void-packages repository
https://github.com/pbui/void-packages chromium
https://github.com/void-linux/void-packages/pull/22159
chromium: update to 83.0.4103.61.
- Built for x86_64, x86_64-musl.
- Tested on x86_64.
- Also update chromium-widevine.
A patch file from https://github.com/void-linux/void-packages/pull/22159.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-22159.patch --]
[-- Type: text/x-diff, Size: 30950 bytes --]
From 11fa89b42c0845d3ac5dcff925af11221c9c4edd Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 20 May 2020 12:11:30 -0400
Subject: [PATCH 1/2] chromium: update to 83.0.4103.61.
[ci skip]
- Built for x86_64, x86_64-musl.
- Tested on x86_64.
---
.../files/musl-patches/musl-fixes.patch | 6 +-
...remove-unsupported-compiler-warnings.patch | 84 ++--------------
| 29 ++++++
| 32 +++++++
| 32 +++++++
...mplete-type-in-AXTree-for-NodeSetSiz.patch | 62 ++++++++++++
...link-custom-iterators-STL-compatible.patch | 95 +++++++++++++++++++
...x-frame-button-cache-when-activation.patch | 62 ------------
...out-in-DesktopWindowTreeHostPlatform.patch | 64 -------------
.../patches/upstream-vaapi-build-fix.patch | 51 ----------
srcpkgs/chromium/template | 7 +-
11 files changed, 267 insertions(+), 257 deletions(-)
create mode 100644 srcpkgs/chromium/patches/upstream-add-missing-algorithm-header.patch
create mode 100644 srcpkgs/chromium/patches/upstream-add-missing-limits-header.patch
create mode 100644 srcpkgs/chromium/patches/upstream-add-missing-memory-header.patch
create mode 100644 srcpkgs/chromium/patches/upstream-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
create mode 100644 srcpkgs/chromium/patches/upstream-make-some-of-blink-custom-iterators-STL-compatible.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-rebuild-Linux-frame-button-cache-when-activation.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
delete mode 100644 srcpkgs/chromium/patches/upstream-vaapi-build-fix.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index 6edbcf37a77..f29d66b98ca 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
@@ -158,11 +158,11 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
// correctly for the main thread.
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
defined(OS_FUCHSIA)
// pthread_getattr_np() can fail if the thread is not invoked by
- // pthread_create() (e.g., the main thread of webkit_unit_tests).
+ // pthread_create() (e.g., the main thread of blink_unittests).
@@ -96,7 +96,7 @@
}
diff --git a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
index 928e3783b0d..73042bc38e9 100644
--- a/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
+++ b/srcpkgs/chromium/patches/llvm-remove-unsupported-compiler-warnings.patch
@@ -1,76 +1,12 @@
---- build/config/compiler/BUILD.gn.orig 2020-04-03 00:11:19.000000000 -0400
-+++ build/config/compiler/BUILD.gn 2020-04-11 23:49:51.153896808 -0400
-@@ -702,14 +702,6 @@
- ldflags += [ "-Wl,--no-rosegment" ]
- }
+--- build/config/compiler/BUILD.gn.orig 2020-05-20 09:34:53.358598296 -0400
++++ build/config/compiler/BUILD.gn 2020-05-20 09:35:40.589648947 -0400
+@@ -1508,9 +1508,6 @@
+ # TODO(https://crbug.com/1028110): Evaluate and possible enable.
+ "-Wno-deprecated-copy",
-- # This flag enforces that member pointer base types are complete. It helps
-- # prevent us from running into problems in the Microsoft C++ ABI (see
-- # https://crbug.com/847724).
-- if (is_clang && !is_nacl && target_os != "chromeos" && !use_xcode_clang &&
-- (is_win || use_custom_libcxx)) {
-- cflags += [ "-fcomplete-member-pointers" ]
-- }
+- # TODO(https://crbug.com/1050281): Clean up, enable.
+- "-Wno-non-c-typedef-for-linkage",
-
- # Pass the same C/C++ flags to the objective C/C++ compiler.
- cflags_objc += cflags_c
- cflags_objcc += cflags_cc
-@@ -1506,42 +1498,6 @@
- # Currently goma can not handle case sensitiveness for windows well.
- cflags += [ "-Wno-nonportable-include-path" ]
- }
--
-- if (current_toolchain == host_toolchain || !use_xcode_clang) {
-- # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
-- # recognize.
-- cflags += [
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
-- "-Wno-ignored-pragma-optimize",
--
-- # TODO(https://crbug.com/989932): Evaluate and possibly enable.
-- "-Wno-implicit-int-float-conversion",
--
-- # TODO(https://crbug.com/999886): Clean up, enable.
-- "-Wno-final-dtor-non-final-class",
--
-- # TODO(https://crbug.com/1016947) Clean up, enable.
-- "-Wno-bitwise-conditional-parentheses",
--
-- # TODO(https://crbug.com/1016945) Clean up, enable.
-- "-Wno-builtin-assume-aligned-alignment",
--
-- # TODO(https://crbug.com/1028110): Evaluate and possible enable.
-- "-Wno-deprecated-copy",
--
-- # TODO(https://crbug.com/1031169): Clean up and enable.
-- "-Wno-misleading-indentation",
--
-- # TODO(https://crbug.com/1039697): Evaluate and possibly enable.
-- "-Wno-range-loop-analysis",
-- ]
--
-- cflags_c += [
-- # TODO(https://crbug.com/995993): Clean up and enable.
-- "-Wno-implicit-fallthrough",
-- ]
-- }
- }
- }
- }
---- third_party/blink/renderer/BUILD.gn.orig 2020-04-12 00:55:11.146544560 -0400
-+++ third_party/blink/renderer/BUILD.gn 2020-04-12 00:55:29.106560641 -0400
-@@ -48,13 +48,6 @@
- "-Wno-implicit-float-conversion",
- "-Wno-implicit-int-conversion",
- ]
--
-- if (!is_chromeos || default_toolchain != "//build/toolchain/cros:target") {
-- cflags += [
-- "-Wno-enum-enum-conversion",
-- "-Wno-enum-float-conversion",
-- ]
-- }
- }
- }
-
+ # TODO(https://crbug.com/1059231): Clean up, enable.
+ "-Wno-pointer-to-int-cast",
+ ]
--git a/srcpkgs/chromium/patches/upstream-add-missing-algorithm-header.patch b/srcpkgs/chromium/patches/upstream-add-missing-algorithm-header.patch
new file mode 100644
index 00000000000..0de478ce405
--- /dev/null
+++ b/srcpkgs/chromium/patches/upstream-add-missing-algorithm-header.patch
@@ -0,0 +1,29 @@
+From 2b9d6daa0ab5ce45ec5555466d5a5a583a020ea8 Mon Sep 17 00:00:00 2001
+From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
+Date: Sat, 18 Apr 2020 00:27:38 +0000
+Subject: [PATCH] Add missing algorithm header in crx_install_error.cc
+
+This is needed for the use of std::find.
+
+Change-Id: I2dc43b3887c467986c5346be5a9e27a987e1e5b3
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152333
+Reviewed-by: Ken Rockot <rockot@google.com>
+Commit-Queue: Ken Rockot <rockot@google.com>
+Cr-Commit-Position: refs/heads/master@{#760272}
+---
+ extensions/browser/install/crx_install_error.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/extensions/browser/install/crx_install_error.cc b/extensions/browser/install/crx_install_error.cc
+index a9765bb0a5a..bd0d3e35a16 100644
+--- extensions/browser/install/crx_install_error.cc
++++ extensions/browser/install/crx_install_error.cc
+@@ -4,6 +4,8 @@
+
+ #include "extensions/browser/install/crx_install_error.h"
+
++#include <algorithm>
++
+ #include "base/logging.h"
+ #include "extensions/browser/install/sandboxed_unpacker_failure_reason.h"
+
--git a/srcpkgs/chromium/patches/upstream-add-missing-limits-header.patch b/srcpkgs/chromium/patches/upstream-add-missing-limits-header.patch
new file mode 100644
index 00000000000..1972056d369
--- /dev/null
+++ b/srcpkgs/chromium/patches/upstream-add-missing-limits-header.patch
@@ -0,0 +1,32 @@
+From 74f76a6be385ef056b0be2362c32c728141cca16 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 17 Apr 2020 16:04:12 +0000
+Subject: [PATCH] IWYU: std::numeric_limits is defined in limits
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ifbc379adc5bb7242c21e7da0bcfc28f49e4dd06f
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153111
+Reviewed-by: François Doray <fdoray@chromium.org>
+Commit-Queue: François Doray <fdoray@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#760075}
+---
+ .../graph/policies/background_tab_loading_policy_helpers.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc
+index 4881c010bb9..593501d16a7 100644
+--- chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc.orig 2020-05-20 09:08:05.395896528 -0400
++++ chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc 2020-05-20 09:12:27.367172702 -0400
+@@ -3,6 +3,10 @@
+ // found in the LICENSE file.
+
+ #include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
++
++#include <cmath>
++#include <limits>
++
+ #include "base/logging.h"
+
+ namespace performance_manager {
--git a/srcpkgs/chromium/patches/upstream-add-missing-memory-header.patch b/srcpkgs/chromium/patches/upstream-add-missing-memory-header.patch
new file mode 100644
index 00000000000..b3c0b25634a
--- /dev/null
+++ b/srcpkgs/chromium/patches/upstream-add-missing-memory-header.patch
@@ -0,0 +1,32 @@
+From 40d994e4aa2e4d5077c1810e4623549618a19c05 Mon Sep 17 00:00:00 2001
+From: Piotr Tworek <ptworek@vewd.com>
+Date: Mon, 27 Apr 2020 16:31:46 +0000
+Subject: [PATCH] Include "memory" header to get the definition of
+ std::unique_ptr.
+
+Right now the code im the affected fails to build when using libstdc++
+instead of bundled libcxx. Apparently libcxx pulls the necessary header
+indirectly.
+
+Change-Id: Ie5e86f228434ab16d622ae7a912d9ce607258931
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164645
+Reviewed-by: Jochen Eisinger <jochen@chromium.org>
+Commit-Queue: Jochen Eisinger <jochen@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#762881}
+---
+ .../blink/renderer/core/html/trust_token_attribute_parsing.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h b/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
+index f5a7ab03892..ef19cfaf680 100644
+--- third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
++++ third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
+@@ -5,6 +5,8 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
+ #define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
+
++#include <memory>
++
+ #include "base/optional.h"
+ #include "services/network/public/mojom/trust_tokens.mojom-blink-forward.h"
+ #include "third_party/blink/renderer/core/core_export.h"
diff --git a/srcpkgs/chromium/patches/upstream-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch b/srcpkgs/chromium/patches/upstream-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
new file mode 100644
index 00000000000..0306d14ab26
--- /dev/null
+++ b/srcpkgs/chromium/patches/upstream-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
@@ -0,0 +1,62 @@
+From aeef68888d4c00b69facead2b934095a8cd17329 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 20 Apr 2020 18:21:43 +0000
+Subject: [PATCH] libstdc++: fix incomplete-type in AXTree for
+ NodeSetSizePosInSetInfo
+
+has only forward declaration of NodeSetSizePosInSetInfo. Therefore,
+move declaration from ax_tree.cc.
+
+std: :unordered_map<T, U> requires U to be fully declared. ax_tree.h
+Bug: 957519
+Change-Id: Ic1f4bf3ebfea229ece84251e46d4461b31873868
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132403
+Reviewed-by: David Tseng <dtseng@chromium.org>
+Commit-Queue: David Tseng <dtseng@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#760588}
+---
+ ui/accessibility/ax_tree.cc | 10 ++--------
+ ui/accessibility/ax_tree.h | 9 ++++++++-
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
+index 7b8d9b1b161..e9154028d66 100644
+--- ui/accessibility/ax_tree.cc
++++ ui/accessibility/ax_tree.cc
+@@ -567,14 +567,8 @@ struct AXTreeUpdateState {
+ const AXTree& tree;
+ };
+
+-struct AXTree::NodeSetSizePosInSetInfo {
+- NodeSetSizePosInSetInfo() = default;
+- ~NodeSetSizePosInSetInfo() = default;
+-
+- int32_t pos_in_set = 0;
+- int32_t set_size = 0;
+- base::Optional<int> lowest_hierarchical_level;
+-};
++AXTree::NodeSetSizePosInSetInfo::NodeSetSizePosInSetInfo() = default;
++AXTree::NodeSetSizePosInSetInfo::~NodeSetSizePosInSetInfo() = default;
+
+ struct AXTree::OrderedSetContent {
+ explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
+diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
+index a51ca8de4c8..8c1c57517ac 100644
+--- ui/accessibility/ax_tree.h
++++ ui/accessibility/ax_tree.h
+@@ -328,7 +328,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
+ bool enable_extra_mac_nodes_ = false;
+
+ // Contains pos_in_set and set_size data for an AXNode.
+- struct NodeSetSizePosInSetInfo;
++ struct NodeSetSizePosInSetInfo {
++ NodeSetSizePosInSetInfo();
++ ~NodeSetSizePosInSetInfo();
++
++ int32_t pos_in_set = 0;
++ int32_t set_size = 0;
++ base::Optional<int> lowest_hierarchical_level;
++ };
+
+ // Represents the content of an ordered set which includes the ordered set
+ // items and the ordered set container if it exists.
diff --git a/srcpkgs/chromium/patches/upstream-make-some-of-blink-custom-iterators-STL-compatible.patch b/srcpkgs/chromium/patches/upstream-make-some-of-blink-custom-iterators-STL-compatible.patch
new file mode 100644
index 00000000000..de162e18a64
--- /dev/null
+++ b/srcpkgs/chromium/patches/upstream-make-some-of-blink-custom-iterators-STL-compatible.patch
@@ -0,0 +1,95 @@
+From d3cabbc7321d349a9bffda482df5afc0d4df1ac2 Mon Sep 17 00:00:00 2001
+From: Piotr Tworek <ptworek@vewd.com>
+Date: Thu, 30 Apr 2020 21:33:47 +0000
+Subject: [PATCH] Make some of blink custom iterators STL compatible.
+
+Blink has recently started using functions like std::any_of with some of
+the custom iterators it provides. On Linux this works in the default
+setup using libcxx, but fails with even the most recent versions of
+libstdc++. In all cases the error message (text in bug report) complains
+about lack of matching std::__iterator_category definition.
+
+From what I understand the error message is basically saying those
+iterators are not STL compatible due to missing traits as described
+in https://en.cppreference.com/w/cpp/iterator/iterator_traits. Such
+traits are provided by custom iterators defined in //base, or //cc.
+
+This patch adds the necessary traits to iterators that are currently
+affected by this problem.
+
+Bug: 1076869
+Change-Id: I9950a7100c32499ba96647317fa70b87dc22eaf9
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2174199
+Reviewed-by: Kentaro Hara <haraken@chromium.org>
+Commit-Queue: Piotr Tworek <ptworek@vewd.com>
+Cr-Commit-Position: refs/heads/master@{#764426}
+---
+ .../core/layout/ng/ng_physical_container_fragment.h | 6 ++++++
+ .../blink/renderer/platform/wtf/hash_iterators.h | 12 ++++++++++++
+ third_party/blink/renderer/platform/wtf/hash_table.h | 6 ++++++
+ 3 files changed, 24 insertions(+)
+
+diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
+index 1256e77c146..8b93107f2fc 100644
+--- third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
++++ third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
+@@ -38,6 +38,12 @@ class CORE_EXPORT NGPhysicalContainerFragment : public NGPhysicalFragment {
+ STACK_ALLOCATED();
+
+ public:
++ using iterator_category = std::bidirectional_iterator_tag;
++ using value_type = NGLink;
++ using difference_type = ptrdiff_t;
++ using pointer = value_type*;
++ using reference = value_type&;
++
+ ConstIterator(const NGLink* current) : current_(current) {}
+
+ const NGLink& operator*() const { return *PostLayoutOrCurrent(); }
+diff --git a/third_party/blink/renderer/platform/wtf/hash_iterators.h b/third_party/blink/renderer/platform/wtf/hash_iterators.h
+index f8e66e6be85..6003d02c509 100644
+--- third_party/blink/renderer/platform/wtf/hash_iterators.h
++++ third_party/blink/renderer/platform/wtf/hash_iterators.h
+@@ -53,6 +53,12 @@ struct HashTableConstIteratorAdapter<HashTableType,
+ typedef HashTableConstValuesIterator<HashTableType, KeyType, MappedType>
+ ValuesIterator;
+
++ using iterator_category = std::bidirectional_iterator_tag;
++ using value_type = HashTableType;
++ using difference_type = ptrdiff_t;
++ using pointer = value_type*;
++ using reference = value_type&;
++
+ HashTableConstIteratorAdapter() = default;
+ HashTableConstIteratorAdapter(
+ const typename HashTableType::const_iterator& impl)
+@@ -94,6 +100,12 @@ struct HashTableIteratorAdapter<HashTableType,
+ typedef HashTableValuesIterator<HashTableType, KeyType, MappedType>
+ ValuesIterator;
+
++ using iterator_category = std::bidirectional_iterator_tag;
++ using value_type = HashTableType;
++ using difference_type = ptrdiff_t;
++ using pointer = value_type*;
++ using reference = value_type&;
++
+ HashTableIteratorAdapter() = default;
+ HashTableIteratorAdapter(const typename HashTableType::iterator& impl)
+ : impl_(impl) {}
+diff --git a/third_party/blink/renderer/platform/wtf/hash_table.h b/third_party/blink/renderer/platform/wtf/hash_table.h
+index f596fb5d41e..5a4468d6bd1 100644
+--- third_party/blink/renderer/platform/wtf/hash_table.h
++++ third_party/blink/renderer/platform/wtf/hash_table.h
+@@ -2204,6 +2204,12 @@ struct HashTableConstIteratorAdapter {
+ STACK_ALLOCATED();
+
+ public:
++ using iterator_category = std::bidirectional_iterator_tag;
++ using value_type = HashTableType;
++ using difference_type = ptrdiff_t;
++ using pointer = value_type*;
++ using reference = value_type&;
++
+ HashTableConstIteratorAdapter() = default;
+ HashTableConstIteratorAdapter(
+ const typename HashTableType::const_iterator& impl)
diff --git a/srcpkgs/chromium/patches/upstream-rebuild-Linux-frame-button-cache-when-activation.patch b/srcpkgs/chromium/patches/upstream-rebuild-Linux-frame-button-cache-when-activation.patch
deleted file mode 100644
index e334cde0561..00000000000
--- a/srcpkgs/chromium/patches/upstream-rebuild-Linux-frame-button-cache-when-activation.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d10f885b9327399be9348b780967ebd6b7f2c4bc Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Fri, 7 Feb 2020 22:44:54 +0000
-Subject: [PATCH] Rebuild Linux frame button cache when activation state
- changes
-
-This fixes an issue where the frame buttons would always render in an
-inactive state on Linux (see repro steps in bug 1049258).
-
-Bug: 1049258
-R=sky
-CC=pkasting
-
-Change-Id: Ic5af33199003e1d1cdf6cedf506e32388ea11fa9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2044538
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#739585}
----
- .../ui/views/frame/desktop_linux_browser_frame_view.cc | 6 +++---
- .../desktop_aura/desktop_window_tree_host_platform.cc | 3 +++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc b/chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc
-index 954e776057f..4f579955675 100644
---- chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc
-+++ chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.cc
-@@ -22,13 +22,13 @@ DesktopLinuxBrowserFrameView::DesktopLinuxBrowserFrameView(
- : OpaqueBrowserFrameView(frame, browser_view, layout),
- nav_button_provider_(std::move(nav_button_provider)) {}
-
--DesktopLinuxBrowserFrameView::~DesktopLinuxBrowserFrameView() {}
-+DesktopLinuxBrowserFrameView::~DesktopLinuxBrowserFrameView() = default;
-
- void DesktopLinuxBrowserFrameView::Layout() {
- // Calling MaybeUpdateCachedFrameButtonImages() from Layout() is sufficient to
- // catch all cases that could update the appearance, since
-- // DesktopWindowTreeHostPlatform::OnWindowStateChanged() does a layout any
-- // time any properties change.
-+ // DesktopWindowTreeHostPlatform::On{Window,Activation}StateChanged() does a
-+ // layout any time the maximized and activation state changes, respectively.
- MaybeUpdateCachedFrameButtonImages();
- OpaqueBrowserFrameView::Layout();
- }
-diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-index 9c695d8e5b1..9662f19aa90 100644
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -677,9 +677,12 @@ void DesktopWindowTreeHostPlatform::OnCloseRequest() {
- }
-
- void DesktopWindowTreeHostPlatform::OnActivationChanged(bool active) {
-+ if (is_active_ == active)
-+ return;
- is_active_ = active;
- aura::WindowTreeHostPlatform::OnActivationChanged(active);
- desktop_native_widget_aura_->HandleActivationChanged(active);
-+ ScheduleRelayout();
- }
-
- base::Optional<gfx::Size>
diff --git a/srcpkgs/chromium/patches/upstream-rename-Relayout-in-DesktopWindowTreeHostPlatform.patch b/srcpkgs/chromium/patches/upstream-rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
deleted file mode 100644
index 554919b59d1..00000000000
--- a/srcpkgs/chromium/patches/upstream-rename-Relayout-in-DesktopWindowTreeHostPlatform.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5a2cd2409c7d65c019ad9f4595a4e85315857ac4 Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Mon, 3 Feb 2020 23:18:46 +0000
-Subject: [PATCH] Rename Relayout() in DesktopWindowTreeHostPlatform to
- ScheduleRelayout()
-
-R=sky
-
-Bug: None
-Change-Id: I680cafd25935e59a280e3b2baac754d3d5f13a35
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036553
-Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#737974}
----
- .../desktop_aura/desktop_window_tree_host_platform.cc | 6 +++---
- .../widget/desktop_aura/desktop_window_tree_host_platform.h | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-index 6c00d49eb3f..9c695d8e5b1 100644
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -556,7 +556,7 @@ void DesktopWindowTreeHostPlatform::SetFullscreen(bool fullscreen) {
- DCHECK_EQ(fullscreen, IsFullscreen());
-
- if (IsFullscreen() == fullscreen)
-- Relayout();
-+ ScheduleRelayout();
- // Else: the widget will be relaid out either when the window bounds change
- // or when |platform_window|'s fullscreen state changes.
- }
-@@ -669,7 +669,7 @@ void DesktopWindowTreeHostPlatform::OnWindowStateChanged(
- // Now that we have different window properties, we may need to relayout the
- // window. (The windows code doesn't need this because their window change is
- // synchronous.)
-- Relayout();
-+ ScheduleRelayout();
- }
-
- void DesktopWindowTreeHostPlatform::OnCloseRequest() {
-@@ -712,7 +712,7 @@ gfx::Rect DesktopWindowTreeHostPlatform::ToPixelRect(
- return gfx::ToEnclosingRect(rect_in_pixels);
- }
-
--void DesktopWindowTreeHostPlatform::Relayout() {
-+void DesktopWindowTreeHostPlatform::ScheduleRelayout() {
- Widget* widget = native_widget_delegate_->AsWidget();
- NonClientView* non_client_view = widget->non_client_view();
- // non_client_view may be NULL, especially during creation.
-diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
-index 89beb8d2245..75a401e02a7 100644
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
-+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
-@@ -129,7 +129,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
- gfx::Rect ToPixelRect(const gfx::Rect& rect_in_dip) const;
-
- private:
-- void Relayout();
-+ void ScheduleRelayout();
-
- Widget* GetWidget();
- const Widget* GetWidget() const;
diff --git a/srcpkgs/chromium/patches/upstream-vaapi-build-fix.patch b/srcpkgs/chromium/patches/upstream-vaapi-build-fix.patch
deleted file mode 100644
index cf88df4f260..00000000000
--- a/srcpkgs/chromium/patches/upstream-vaapi-build-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5b2ff215473e0526b5b24aeff4ad90d369b21c75 Mon Sep 17 00:00:00 2001
-From: Julien Isorce <julien.isorce@chromium.org>
-Date: Wed, 05 Feb 2020 17:59:59 +0000
-Subject: [PATCH] Fix vaapi with GLX
-
-The signature of ui's gl::GLImageGLX has changed a little bit
-since "mplement GpuMemoryBuffers for EGL and GLX":
- https://chromium-review.googlesource.com/c/chromium/src/+/1984712
-
-Bug: 1031269
-Test: build with use_vaapi=true and run with --use-gl=desktop, see
-Change-Id: I80b07294b9abdfa8233aaf79f7d9ec4c58117090
-https: //chromium.googlesource.com/chromium/src.git/+/refs/heads/master/docs/gpu/vaapi.md#vaapi-on-linux
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036494
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Reviewed-by: Miguel Casas <mcasas@chromium.org>
-Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#738595}
----
-
-diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
-index 227c31b..b42620d 100644
---- media/gpu/vaapi/vaapi_picture_tfp.cc
-+++ media/gpu/vaapi/vaapi_picture_tfp.cc
-@@ -57,7 +57,7 @@
- if (make_context_current_cb_ && !make_context_current_cb_.Run())
- return false;
-
-- glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
-+ glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888);
- if (!glx_image_->Initialize(x_pixmap_)) {
- // x_pixmap_ will be freed in the destructor.
- DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP";
---- media/mojo/services/gpu_mojo_media_client.cc 2020-04-02 21:11:34.000000000 -0700
-+++ media/mojo/services/gpu_mojo_media_client.cc 2020-04-09 00:44:58.871366432 -0700
-@@ -158,6 +158,7 @@
- *d3d11_supported_configs_;
-
- #elif BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION)
-+#if defined(OS_CHROMEOS)
- if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) {
- if (!cros_supported_configs_) {
- cros_supported_configs_ =
-@@ -167,6 +168,7 @@
- *cros_supported_configs_;
- return supported_config_map;
- }
-+#endif //defined(OS_CHROMEOS)
- #endif
-
- auto& default_configs =
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 225060dff2a..8775ca32284 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See http://www.chromium.org/developers/calendar for the latest version
-version=81.0.4044.138
+version=83.0.4103.61
revision=1
archs="i686 x86_64*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=f478f28b8111cb70231df4c36e754d812ad7a94b7c844e9d0515345a71fd77a6
+checksum=4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc
lib32disabled=yes
nodebug=yes
@@ -31,7 +31,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
re2-devel fontconfig-devel freetype-devel opus-devel
- ffmpeg-devel libva-devel"
+ ffmpeg-devel libva-devel python-setuptools"
depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils"
build_options_default="clang"
@@ -125,6 +125,7 @@ do_configure() {
\! -path "*third_party/$LIB/google/*" \
\! -path './base/third_party/icu/*' \
\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
+ \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
\! -path './third_party/yasm/run_yasm.py' \
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-delete
From 57fab49f5e9045f6ddabf949ebd2e165110c3f0d Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 20 May 2020 14:18:57 -0400
Subject: [PATCH 2/2] chromium-widevine: update to 83.0.4103.61.
[ci skip]
---
srcpkgs/chromium-widevine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 4c6373db2d7..b2db08d320b 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
_channel="stable"
pkgname=chromium-widevine
-version=81.0.4044.138
+version=83.0.4103.61
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -17,7 +17,7 @@ depends="chromium binutils xz"
homepage="https://www.google.com/chrome"
repository=nonfree
distfiles="https://dl.google.com/linux/direct/google-chrome-${_channel}_${_chromeVersion}_amd64.deb"
-checksum=9d13d41d79ce1f04d1f150b5d22fffd31779224cc7d8274f8479b06bcfe6846a
+checksum=adba3364137bfd377a590ba7256052f59faf34be6ff36e3d3d4ac467a60a51f2
do_extract() {
:
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 83.0.4103.61.
2020-05-20 18:21 [PR PATCH] chromium: update to 83.0.4103.61 pbui
@ 2020-05-20 19:35 ` Hoshpak
0 siblings, 0 replies; 2+ messages in thread
From: Hoshpak @ 2020-05-20 19:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 83.0.4103.61.
https://github.com/void-linux/void-packages/pull/22159
Description:
- Built for x86_64, x86_64-musl.
- Tested on x86_64.
- Also update chromium-widevine.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-20 19:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 18:21 [PR PATCH] chromium: update to 83.0.4103.61 pbui
2020-05-20 19:35 ` [PR PATCH] [Merged]: " Hoshpak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).