Browse Source

Update to 96.0.4664.93

master 96.0.4664.93-1
wchen342 12 months ago
parent
commit
b25fbdb697
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
  1. 16
      chromium-94.0.4606.81-clang-format.patch
  2. 24
      chromium-96-CommandLine-include.patch
  3. 18
      chromium-96-CouponDB-include.patch
  4. 4
      chromium-96-DrmRenderNodePathFinder-include.patch
  5. 16
      chromium-96-EnumTable-crash.patch
  6. 11
      chromium-base-include-memory.patch
  7. 4
      sources
  8. 45
      ungoogled-chromium.spec

16
chromium-93.0.4577.63-clang-format.patch → chromium-94.0.4606.81-clang-format.patch

@ -1,16 +1,16 @@
diff -up chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 chromium-93.0.4577.63/buildtools/linux64/clang-format
--- chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 2021-09-03 04:42:46.736294345 +0000
+++ chromium-93.0.4577.63/buildtools/linux64/clang-format 2021-09-03 04:59:55.296512600 +0000
diff -up chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3 chromium-94.0.4606.81/buildtools/linux64/clang-format
--- chromium-94.0.4606.81/buildtools/linux64/clang-format.clang-format-py3 2021-10-08 11:26:16.411861005 -0400
+++ chromium-94.0.4606.81/buildtools/linux64/clang-format 2021-10-08 11:32:16.005895508 -0400
@@ -12,9 +12,9 @@ def main():
args = sys.argv[1:]
inputfiles = [a for a in args if not a.startswith('-')]
- contents = ''
+ contents = b''
if '-' in args or not inputfiles:
- contents = sys.stdin.read()
+ contents = sys.stdin.buffer.read()
# Tarball builds may or may not have depot_tools in $PATH. In the former case,
# running 'clang-format' will call back into this script infinitely. Strip off
@@ -37,17 +37,17 @@ def main():
@ -25,13 +25,13 @@ diff -up chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3
except OSError:
# Ignore if clang-format is not installed.
pass
# If any failure happens, continue with unformatted files.
- sys.stdout.write(contents)
+ sys.stdout.buffer.write(contents)
for inputfile in inputfiles:
- sys.stdout.write(open(inputfile).read())
+ sys.stdout.buffer.write(open(inputfile).read())
return 0

24
chromium-96-CommandLine-include.patch

@ -0,0 +1,24 @@
From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Sat, 9 Oct 2021 08:27:04 +0000
Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine
---
base/command_line.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/base/command_line.h b/base/command_line.h
index 706726a..ad02812 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -19,6 +19,7 @@
#include <stddef.h>
#include <functional>
#include <map>
+#include <memory>
#include <string>
#include <vector>
--
2.32.0

18
chromium-commerce-coupons-coupon_db-vector.patch → chromium-96-CouponDB-include.patch

@ -1,11 +1,25 @@
From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <[email protected]>
Date: Wed, 6 Oct 2021 15:36:47 +0000
Subject: [PATCH] IWYU: add vector for std::vector in CouponDB
---
chrome/browser/commerce/coupons/coupon_db.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h
index f0758f4..93e2dd3 100644
--- a/chrome/browser/commerce/coupons/coupon_db.h
+++ b/chrome/browser/commerce/coupons/coupon_db.h
@@ -5,6 +5,7 @@
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
#define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_
+#include <vector>
+
#include "base/callback_helpers.h"
#include "base/memory/weak_ptr.h"
#include "url/gurl.h"
--
2.32.0

4
chromium-96-DrmRenderNodePathFinder-include.patch

@ -13,12 +13,12 @@ index 06776a7..d5b7b71 100644
+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h"
#include <fcntl.h>
+#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
--
--
2.32.0

16
chromium-96.0.4664.45-EnumTable-crash.patch → chromium-96-EnumTable-crash.patch

@ -7,25 +7,25 @@ index aad9e08..2f3fcad 100644
#include <cstring>
#include <ostream>
+#include <vector>
#include "base/check_op.h"
#include "base/macros.h"
@@ -188,7 +189,6 @@ class
inline constexpr GenericEnumTableEntry(int32_t value);
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
private:
@@ -254,7 +254,6 @@ class EnumTable {
constexpr Entry(E value, base::StringPiece str)
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
- Entry(const Entry&) = delete;
Entry& operator=(const Entry&) = delete;
};
@@ -313,15 +312,14 @@ class EnumTable {
if (is_sorted_) {
const std::size_t index = static_cast<std::size_t>(value);
@ -42,7 +42,7 @@ index aad9e08..2f3fcad 100644
- data_.size(), static_cast<int32_t>(value));
+ &data_[0], data_.size(), static_cast<int32_t>(value));
}
// This overload of GetString is designed for cases where the argument is a
@@ -349,8 +347,7 @@ class EnumTable {
// enum value directly.
@ -53,7 +53,7 @@ index aad9e08..2f3fcad 100644
+ &data_[0], data_.size(), str);
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
@@ -365,7 +362,7 @@ class EnumTable {
// Align the data on a cache line boundary.
alignas(64)
@ -61,7 +61,7 @@ index aad9e08..2f3fcad 100644
- std::initializer_list<Entry> data_;
+ const std::vector<Entry> data_;
bool is_sorted_;
constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
@@ -377,8 +374,8 @@ class EnumTable {

11
chromium-base-include-memory.patch

@ -1,11 +0,0 @@
diff --git a/base/command_line.h b/base/command_line.h
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -21,6 +21,7 @@
#include <map>
#include <string>
#include <vector>
+#include <memory>
#include "base/base_export.h"
#include "base/strings/string_piece.h"

4
sources

@ -3,5 +3,5 @@ SHA256 (MuktiNarrow-0.94.tar.bz2) = bb8af9b9437f1d13ff8cdc8784188ebf0c2ee8b97e32
SHA256 (Ahem.ttf) = b719ecb31c5b21fc573c03f6421c74ac63c271a5a3ff841e34f9705fb94b8448
SHA256 (NotoSansTibetan-Regular.ttf) = 5a45f430812ef981952553ef6dd6fa04c7849e97880cdfecc7bf572a58efed93
SHA256 (xcb-proto-1.14.tar.xz) = 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605
SHA256 (chromium-96.0.4664.45.tar.xz) = 488c6ad983ebf7781cb4d704f70496e8aa2165611b46656d7aa62f269c760407
SHA256 (ungoogled-chromium-96.0.4664.45-1.tar.gz) = 8f74125ac735b727c557b2473f650cf540810dbe19944331fefc8020d98ad5dd
SHA256 (chromium-96.0.4664.93.tar.xz) = 7c7b1f8e4e0abc3453d40c60d6a70f30851db96e5d872cbaa1b4dd7f43aa3493
SHA256 (ungoogled-chromium-96.0.4664.93-1.tar.gz) = c2c56ab281d60ba9541c88f7e39c20702cc4ae26d41e62340f183a7bc12fc1c5

45
ungoogled-chromium.spec

@ -115,12 +115,8 @@ BuildRequires: libicu-devel >= 5.4
# Hopefully it does not anymore.
%global gtk3 1
# As of Chromium 94, it uses functions in harfbuzz 2.9.0+, which is only found in F36+.
%if 0%{?fedora} >= 36
%global bundleharfbuzz 0
%else
%global bundleharfbuzz 1
%endif
%global bundleopus 1
%global bundlelibusbx 0
%global bundlelibwebp 0
@ -153,7 +149,7 @@ Name: ungoogled-chromium%{nsuffix}
%else
Name: ungoogled-chromium
%endif
Version: %{majorversion}.0.4664.45
Version: %{majorversion}.0.4664.93
Release: 1%{?dist}.%{revision}
%if %{?freeworld}
# chromium-freeworld
@ -179,9 +175,17 @@ Patch10: chromium-92.0.4515.107-widevine-other-locations.patch
Patch11: chromium-93.0.4577.63-py3-bootstrap.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
Patch52: chromium-81.0.4044.92-unbundle-zlib.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CouponDB-include.patch
Patch59: chromium-96-CouponDB-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-CommandLine-include.patch
Patch61: chromium-96-CommandLine-include.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-RestrictedCookieManager-tuple.patch
Patch62: chromium-96-RestrictedCookieManager-tuple.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-96-DrmRenderNodePathFinder-include.patch
Patch63: chromium-96-DrmRenderNodePathFinder-include.patch
# Fix issue where closure_compiler thinks java is only allowed in android builds
# https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
Patch64: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
Patch65: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
# Work around binutils bug in aarch64 (F33+)
Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
@ -189,13 +193,14 @@ Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
Patch76: chromium-92.0.4515.107-rawhide-gcc-std-max-fix.patch
# Do not download proprietary widevine module in the background (thanks Debian)
Patch79: chromium-93.0.4577.63-widevine-no-download.patch
# Fix crashes with components/cast_*
# Thanks to Gentoo
Patch80: chromium-96.0.4664.45-EnumTable-crash.patch
Patch80: chromium-96-EnumTable-crash.patch
# Clean up clang-format for python3
# thanks to Jon Nettleton
Patch86: chromium-93.0.4577.63-clang-format.patch
Patch86: chromium-94.0.4606.81-clang-format.patch
# include full UrlResponseHead header
Patch95: chromium-93.0.4577.63-mojo-header-fix.patch
# Fix multiple defines issue in webrtc/BUILD.gn
@ -217,13 +222,6 @@ Patch300: chromium-92.0.4515.107-rhel8-force-disable-use_gnome_keyring.patch
Patch400: chromium-glibc-2.34.patch
Patch401: chromium-VirtualCursor-standard-layout.patch
Patch405: chromium-base-include-memory.patch
Patch407: chromium-96-DrmRenderNodePathFinder-include.patch
Patch408: chromium-commerce-coupons-coupon_db-vector.patch
# Thanks void linux
Patch406: chromium-96-RestrictedCookieManager-tuple.patch
# Clang 12 cflags
Patch403: chromium-clang-12-cflags.patch
Patch404: chromium-clang-sanitizer-cflags.patch
@ -274,7 +272,7 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz
Source22: ungoogled-chromium.appdata.xml
# ungoogled-chromium source
%global ungoogled_chromium_revision 96.0.4664.45-1
%global ungoogled_chromium_revision 96.0.4664.93-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz
BuildRequires: llvm
@ -572,7 +570,11 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
%if 0%{?fedora}
%patch52 -p1 -b .unbundle-zlib
%endif
%patch64 -p1 -b .java-only-allowed
%patch59 -p1 -b .CouponDB-include
%patch61 -p1 -b .CommandLine-include
%patch62 -p1 -b .RestrictedCookieManager-tuple
%patch63 -p1 -b .DrmRenderNodePathFinder-include
%patch65 -p1 -b .java-only-allowed
# %%patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround
%if 0%{?fedora} >= 35
%patch76 -p1 -b .sigstkszfix
@ -599,10 +601,6 @@ ln -s depot_tools-%{depot_tools_revision} ../depot_tools
# glibc fix
%patch400 -p1 -b .glibc-2.34
%patch401 -p1 -b .virtualcursor
%patch405 -p1 -b .base-include-memory
%patch406 -p1 -b .restrictedcookiemanager-tuple
%patch407 -p1 -b .drmrendernodepathfinder
%patch408 -p1 -b .commerce-coupons-coupon_db-vector
# cflags
%if 0%{?fedora} < 35
@ -1332,6 +1330,9 @@ fi
%{chromium_path}/chromedriver
%changelog
* Sat Dec 11 2021 wchen342 <[email protected]> - 96.0.4664.93-1
- update Chromium to 96.0.4664.93
* Thu Nov 18 2021 wchen342 <[email protected]> - 96.0.4664.45-1
- update Chromium to 96.0.4664.45

Loading…
Cancel
Save