upgpkg: ungoogled-chromium 107.0.5304.87-1

upstream release

4 files changed, 78 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b46d780..87fedbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 106.0.5249.119
-	pkgrel = 2
+	pkgver = 107.0.5304.87
+	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -28,6 +28,7 @@ pkgbase = ungoogled-chromium
 	depends = libpulse
 	depends = pciutils
 	depends = libva
+	depends = wayland
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = fontconfig
@@ -58,30 +59,32 @@ pkgbase = ungoogled-chromium
 	conflicts = chromium
 	options = debug
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-106.0.5249.119.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-107.0.5304.87.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
-	source = https://github.com/stha09/chromium-patches/releases/download/chromium-106-patchset-2/chromium-106-patchset-2.tar.xz
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-107-patchset-1/chromium-107-patchset-1.tar.xz
 	source = unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
+	source = re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
 	source = REVERT-enable-GlobalMediaControlsCastStartStop.patch
 	source = REVERT-roll-src-third_party-ffmpeg-m102.patch
 	source = REVERT-roll-src-third_party-ffmpeg-m106.patch
 	source = angle-wayland-include-protocol.patch
 	source = use-oauth2-client-switches-as-default.patch
-	source = ungoogled-chromium-106.0.5249.119-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/106.0.5249.119-1.tar.gz
+	source = ungoogled-chromium-107.0.5304.87-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/107.0.5304.87-1.tar.gz
 	source = ozone-add-va-api-support-to-wayland.patch
 	source = remove-main-main10-profile-limit.patch
 	source = chromium-drirc-disable-10bpc-color-configs.conf
-	sha256sums = 0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192
+	sha256sums = 6c0e00c186e22a1be29177ea410ba40ff0bf65f3ded67a345eb5b17f76c93c59
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121
+	sha256sums = 2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4
 	sha256sums = b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00
+	sha256sums = 9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716
 	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
 	sha256sums = 30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44
 	sha256sums = 4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152
 	sha256sums = cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
-	sha256sums = 033ee30553302d606ae4449792dbbe2af5e0fd34bccb73f029b6e9882676ea2b
-	sha256sums = e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293
+	sha256sums = de6f84f9a1c49fb316f4f4ce1c1fde8e0710a6a196f0bf11dd403b9a53f65c12
+	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
 	sha256sums = 01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 
diff --git a/PKGBUILD b/PKGBUILD
index ca8a1ff..55085d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,17 +9,17 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium
-pkgver=106.0.5249.119
-pkgrel=2
+pkgver=107.0.5304.87
+pkgrel=1
 _launcher_ver=8
-_gcc_patchset=2
+_gcc_patchset=1
 pkgdesc="A lightweight approach to removing Google web service dependency"
 arch=('x86_64')
 url="https://github.com/ungoogled-software/ungoogled-chromium"
 license=('BSD')
 depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
          'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva'
-         'desktop-file-utils' 'hicolor-icon-theme')
+         'wayland' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire'
              'java-runtime-headless' 'git')
 optdepends=('pipewire: WebRTC desktop sharing under Wayland'
@@ -31,15 +31,17 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
         https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
         unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
+        re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
         REVERT-enable-GlobalMediaControlsCastStartStop.patch
         REVERT-roll-src-third_party-ffmpeg-m102.patch
         REVERT-roll-src-third_party-ffmpeg-m106.patch
         angle-wayland-include-protocol.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192'
+sha256sums=('6c0e00c186e22a1be29177ea410ba40ff0bf65f3ded67a345eb5b17f76c93c59'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121'
+            '2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4'
             'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00'
+            '9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
             '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
@@ -56,8 +58,8 @@ source=(${source[@]}
         remove-main-main10-profile-limit.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
-            '033ee30553302d606ae4449792dbbe2af5e0fd34bccb73f029b6e9882676ea2b'
-            'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
+            'de6f84f9a1c49fb316f4f4ce1c1fde8e0710a6a196f0bf11dd403b9a53f65c12'
+            'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
             '01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
  
@@ -114,6 +116,7 @@ prepare() {
 
   # Upstream fixes
   patch -Np1 -i ../unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
+  patch -Np1 -i ../re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
 
   # Revert kGlobalMediaControlsCastStartStop enabled by default
   # https://crbug.com/1314342
@@ -130,7 +133,6 @@ prepare() {
 
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch
-  patch -Np1 -i ../patches/chromium-106-AutofillPopupControllerImpl-namespace.patch
 
   # Enable vaapi on wayland
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
@@ -184,18 +186,24 @@ build() {
   local _flags=(
     'custom_toolchain="//build/toolchain/linux/unbundle:default"'
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
+    'clang_base_path="/usr"'
+    'clang_use_chrome_plugins=false'
     'is_official_build=true' # implies is_cfi=true on x86_64
     'symbol_level=0' # sufficient for backtraces on x86(_64)
     'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
+    'treat_warnings_as_errors=false'
     'disable_fieldtrial_testing_config=true'
     'blink_enable_generated_code_formatting=false'
     'ffmpeg_branding="Chrome"'
     'proprietary_codecs=true'
     'rtc_use_pipewire=true'
     'link_pulseaudio=true'
+    'use_custom_libcxx=false'
     'use_gnome_keyring=false'
+    'use_qt=false' # look into enabling this for M108
     'use_sysroot=false'
-    'use_custom_libcxx=false'
+    'use_system_libwayland_server=true'
+    'use_system_wayland_scanner=true'
     'enable_widevine=true'
     'enable_platform_hevc=true'
     'enable_hevc_parser_and_hw_decoder=true'
diff --git a/ozone-add-va-api-support-to-wayland.patch b/ozone-add-va-api-support-to-wayland.patch
index 550029c..5abe859 100644
--- a/ozone-add-va-api-support-to-wayland.patch
+++ b/ozone-add-va-api-support-to-wayland.patch
@@ -17,7 +17,7 @@ by Wayland later.
 
 ---
 diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
-index 62e3a42..bde9c2d 100644
+index 54825cd..0a57166 100644
 --- a/media/gpu/vaapi/vaapi_picture_factory.cc
 +++ b/media/gpu/vaapi/vaapi_picture_factory.cc
 @@ -105,7 +105,7 @@ uint32_t VaapiPictureFactory::GetGLTextureTarget() {
@@ -30,7 +30,7 @@ index 62e3a42..bde9c2d 100644
  #else
    return gfx::BufferFormat::YUV_420_BIPLANAR;
 diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
-index 941f24c..a9c8035 100644
+index 18c6c22..fe614b6 100644
 --- a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
 +++ b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
 @@ -4,6 +4,7 @@
@@ -65,7 +65,7 @@ index 941f24c..a9c8035 100644
  
  bool VaapiPictureNativePixmap::AllowOverlay() const {
 diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-index bf791d8..9e394eb 100644
+index 37e3520..9d17122 100644
 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
 +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
 @@ -560,12 +560,12 @@ void VaapiVideoDecodeAccelerator::InitiateSurfaceSetChange(
@@ -84,7 +84,7 @@ index bf791d8..9e394eb 100644
    } else {
      requested_num_reference_frames_ = 0;
 diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
-index 35378d1..68969d2 100644
+index 1a5016b..eca714b 100644
 --- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
 +++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
 @@ -32,7 +32,9 @@ GbmPixmapWayland::GbmPixmapWayland(WaylandBufferManagerGpu* buffer_manager)
@@ -99,7 +99,7 @@ index 35378d1..68969d2 100644
  }
  
 diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
-index 9e8b2fa..9918508 100644
+index 84ebcba..dfb2675 100644
 --- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
 +++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
 @@ -92,6 +92,9 @@ class GbmPixmapWayland : public gfx::NativePixmap {
@@ -113,10 +113,10 @@ index 9e8b2fa..9918508 100644
  
  }  // namespace ui
 diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-index c13bd3a..04fa160 100644
+index afbd464..189678f 100644
 --- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
 +++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -297,6 +297,9 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -295,6 +295,9 @@ class OzonePlatformWayland : public OzonePlatform,
        properties->supports_global_screen_coordinates =
            features::IsWaylandScreenCoordinatesEnabled();
  
diff --git a/re-fix-TFLite-build-error-on-linux-with-system-zlib.patch b/re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
new file mode 100644
index 0000000..13d504d
--- /dev/null
+++ b/re-fix-TFLite-build-error-on-linux-with-system-zlib.patch
@@ -0,0 +1,41 @@
+From dda01a706453ded8c01c41775707cb5ef4e316f8 Mon Sep 17 00:00:00 2001
+From: Andres Salomon <dilinger@queued.net>
+Date: Tue, 25 Oct 2022 21:11:46 +0000
+Subject: [PATCH] Re-fix TFLite build error on linux when using the system zlib
+
+In commit ae0f9adb7e14c0d19ca695ef6ad40b321a8cb64c, I fixed some build
+errors related to minizip patch inclusion in TFLite. However, after that
+when TFLite Support was rolled to HEAD, a small part of that patch got
+dropped. The result is the following build error with 107.0.5304.62:
+
+../../third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc:22:10: fatal error: 'contrib/minizip/ioapi.h' file not found
+         ^~~~~~~~~~~~~~~~~~~~~~~~~
+1 error generated.
+
+This commit re-adds the lost fix.
+
+R=junzou@chromium.org
+
+Change-Id: Ie96c3571894b5100a1e2a2771da29699eff0beb3
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3972087
+Reviewed-by: Robert Ogden <robertogden@chromium.org>
+Commit-Queue: Robert Ogden <robertogden@chromium.org>
+Auto-Submit: Andres Salomon <dilinger@queued.net>
+Cr-Commit-Position: refs/heads/main@{#1063478}
+---
+ .../metadata/cc/utils/zip_readonly_mem_file.cc                  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+index 392b6b411fe..525ae4a2b45 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "contrib/minizip/ioapi.h"
++#include "third_party/zlib/contrib/minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {