Release v95.0.4630.54 (#8)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,6 @@
+**Checklist**
+- [ ] Void template release ([Release](//github.com/void-linux/void-packages/tree/master/srcpkgs/chromium))
+- [ ] ungoogled-chromium release ([Release](//github.com/Eloston/ungoogled-chromium/releases))
+- Build
+	- [ ] x86-64
+	- [ ] x86-64-musl

.github/workflows/testing-ci.yml

@@ -4,7 +4,7 @@ concurrency: kongou
 on:
   pull_request:
     types: [ labeled, synchronize ]
-    branches: [ testing ]
+    branches: [ testing, master ]
 
 jobs:
   setup:
@@ -19,6 +19,10 @@ jobs:
         with:
           path: master
 
+      - name: Xlint
+        run: |
+          xlint master/ungoogled-chromium/template
+
       - name: Update void-packages
         run: |
           cd void-packages

README.md

@@ -2,6 +2,8 @@
 
 Ungoogled Chromium template and builds for Void Linux, based on the void-packages `Chromium` template.
 
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/DAINRA/ungoogled-chromium-void?style=flat-square)
+
 ## Content Overview
 
 - [Building from sources](#building-from-source)
@@ -31,6 +33,7 @@ Ungoogled Chromium template and builds for Void Linux, based on the void-package
 
 Clone this repository or download the source archive from the [Releases](//github.com/DAINRA/ungoogled-chromium-void/releases) page.
 
+    # if it exists, remove the old void-packages/srcpkgs/ungoogled-chromium folder
     # copy the folder ungoogled-chromium-void/ungoogled-chromium to void-packages/srcpkgs/
     $ ./xbps-src pkg ungoogled-chromium
     $ xbps-install -vR hostdir/binpkgs ungoogled-chromium
@@ -51,8 +54,6 @@ All packages are build using `void-packages` with `build_options="clang vaapi pu
 - `debug` is disabled to reduce the package size
 - `js-optimize` is disabled (ungoogled-chromium flags.gn `enable_js_type_check=false`)
 
-Musl version is built with `enable_widevine=false` since it's not available anyway (might improve stability).
-
 ### Troubleshooting
 
 - In the past `gtk+3` was a runtime dependency for the package. On clean installs, it is required to install the `gtk+3` package manually.
@@ -62,11 +63,8 @@ Musl version is built with `enable_widevine=false` since it's not available anyw
 
 ### Available builds
 
-Architecture | Status
-:---: | ---
-**`x86_64`** | Released
-**`x86_64-musl`** | Released
-**`i686`** | Unreleased, builds fine, can't test if it's actually running.
+- **`x86_64`**
+- **`x86_64-musl`**
 
 ### Installing the binary package
 

ungoogled-chromium/files/musl-patches/resolver.patch

@@ -51,10 +51,12 @@
      UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read",
                            dns_config_.has_value());
      if (!dns_config_.has_value())
-@@ -486,20 +480,11 @@
+--- net/dns/public/resolv_reader.cc.orig
++++ net/dns/public/resolv_reader.cc
+@@ -20,19 +20,10 @@
+ namespace net {
 
- std::unique_ptr<struct __res_state>
- DnsConfigServiceLinux::ResolvReader::GetResState() {
+ std::unique_ptr<struct __res_state> ResolvReader::GetResState() {
 -  auto res = std::make_unique<struct __res_state>();
 -  memset(res.get(), 0, sizeof(struct __res_state));
 -
@@ -67,9 +69,8 @@
 +  return nullptr;
  }
 
- void DnsConfigServiceLinux::ResolvReader::CloseResState(
-     struct __res_state* res) {
+ void ResolvReader::CloseResState(struct __res_state* res) {
 -  res_nclose(res);
  }
 
- DnsConfigServiceLinux::DnsConfigServiceLinux()
+ absl::optional<std::vector<IPEndPoint>> GetNameservers(

ungoogled-chromium/files/musl-patches/xxx-ppc64le-support.patch

@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc_config.h	2021-05-25 00:05:31.000000000 +0200
-+++ -	2021-05-26 22:23:47.172940826 +0200
-@@ -88,7 +88,8 @@
- // PUT_REF_COUNT_IN_PREVIOUS_SLOT does. In this case the refcount overlaps with
- // the next pointer shadow for the smallest bucket.
- #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \
--    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT)
-+    !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig
++++ base/allocator/partition_allocator/partition_alloc_config.h
+@@ -114,7 +114,8 @@
+ // platforms complicates things. Note that Chromium is not officially supported
+ // on any big endian architecture as well.
+ #if !BUILDFLAG(PUT_REF_COUNT_IN_PREVIOUS_SLOT) && \
+-    defined(ARCH_CPU_LITTLE_ENDIAN)
++    defined(ARCH_CPU_LITTLE_ENDIAN) && \
 +    !defined(__powerpc64__)
  #define PA_HAS_FREELIST_HARDENING
  #endif

ungoogled-chromium/patches/chromium-95-harfbuzz-3.patch

@@ -0,0 +1,31 @@
+From 9e00e702633c47c590a869bc66b5c2ceec09da50 Mon Sep 17 00:00:00 2001
+From: Dominik Röttsches <drott@chromium.org>
+Date: Tue, 28 Sep 2021 15:31:50 +0000
+Subject: [PATCH] Roll src/third_party/harfbuzz-ng/src/ 6602cbb70..a52c6df38 (80 commits)
+
+Fixed: 1252284
+Change-Id: Ie2ff99da5e41ca97b8881e1bd3e158881f4d5a8e
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3190252
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org>
+Auto-Submit: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Calder Kitagawa <ckitagawa@chromium.org>
+Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#925776}
+
+(only components/paint_preview/common/subset_font.cc)
+---
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index 45daea7b1..43a448e 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -79,7 +79,7 @@
+   // Retain all variation information for OpenType variation fonts. See:
+   // https://docs.microsoft.com/en-us/typography/opentype/spec/otvaroverview
+   hb_set_t* skip_subset =
+-      hb_subset_input_no_subset_tables_set(input.get());  // Owned by |input|.
++      hb_subset_input_set(input.get(), HB_SUBSET_SETS_NO_SUBSET_TABLE_TAG);
+   hb_set_add(skip_subset, HB_TAG('a', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('c', 'v', 'a', 'r'));
+   hb_set_add(skip_subset, HB_TAG('f', 'v', 'a', 'r'));

ungoogled-chromium/patches/chromium-95-quiche-include.patch

@@ -0,0 +1,25 @@
+From a9d986203bcfbaab84f270c1dc6c3abb4c450ee1 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 17 Sep 2021 14:57:33 +0000
+Subject: [PATCH] IWYU: add stddef.h for size_t in WindowManager
+
+---
+ net/third_party/quiche/src/http2/adapter/window_manager.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h b/net/third_party/quiche/src/http2/adapter/window_manager.h
+index f15982d..5a7701e 100644
+--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
+@@ -1,6 +1,8 @@
+ #ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+ #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
+
++#include <stddef.h>
++
+ #include <functional>
+
+ #include "common/platform/api/quiche_export.h"
+-- 
+2.32.0
+

ungoogled-chromium/patches/chromium-i686-vaapi-fpermissive.patch

@@ -0,0 +1,23 @@
+--- a/media/gpu/vaapi/BUILD.gn.orig
++++ b/media/gpu/vaapi/BUILD.gn
+@@ -14,6 +14,12 @@
+ assert(is_linux || is_chromeos)
+ assert(use_vaapi)
+
++config("vaapi_permissive") {
++  if (target_cpu == "x86") {
++    cflags = [ "-fpermissive" ]
++  }
++}
++
+ generate_stubs("libva_stubs") {
+   extra_header = "va_stub_header.fragment"
+   sigs = [ "va.sigs" ]
+@@ -90,6 +96,7 @@
+   configs += [
+     "//build/config/linux/libva",
+     "//third_party/libvpx:libvpx_config",
++    ":vaapi_permissive",
+   ]
+
+   deps = [

ungoogled-chromium/patches/fix-bits-stdint-intn-include.patch

@@ -0,0 +1,11 @@
+--- a/ui/ozone/platform/wayland/host/wayland_window.cc.orig
++++ b/ui/ozone/platform/wayland/host/wayland_window.cc
+@@ -4,7 +4,7 @@
+
+ #include "ui/ozone/platform/wayland/host/wayland_window.h"
+
+-#include <bits/stdint-intn.h>
++#include <stdint.h>
+ #include <wayland-cursor.h>
+ #include <algorithm>
+ #include <memory>