uppkg -> 107.0.5304.88-1

3 files changed, 67 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23d503f1fdec..4fb4f30e800a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 106.0.5249.119
-	pkgrel = 2
+	pkgver = 107.0.5304.88
+	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -28,6 +28,7 @@ pkgbase = ungoogled-chromium-xdg
 	depends = libpulse
 	depends = pciutils
 	depends = libva
+	depends = wayland
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = fontconfig
@@ -58,10 +59,11 @@ pkgbase = ungoogled-chromium-xdg
 	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.88.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
@@ -70,14 +72,14 @@ pkgbase = ungoogled-chromium-xdg
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
-	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.88-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/107.0.5304.88-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 = 1e6595af1e56882627982b5e69dff0cb3575d65449dbe79697f3d4b0922492cc
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121
+	sha256sums = 2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4
 	sha256sums = b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00
+	sha256sums = 9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716
 	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
 	sha256sums = 30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44
 	sha256sums = 4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152
@@ -86,9 +88,8 @@ pkgbase = ungoogled-chromium-xdg
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 033ee30553302d606ae4449792dbbe2af5e0fd34bccb73f029b6e9882676ea2b
+	sha256sums = 11e286263f629443e91027dd1ee84116b3ad5df5d90ad0eb2817e17d371af6d8
 	sha256sums = e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293
-	sha256sums = 01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 
 pkgname = ungoogled-chromium-xdg
diff --git a/PKGBUILD b/PKGBUILD
index bd9022028ecb..7b583acc55e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,17 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=106.0.5249.119
-pkgrel=2
+pkgver=107.0.5304.88
+pkgrel=1
 _launcher_ver=8
-_gcc_patchset=2
+_gcc_patchset=1
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
 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'
@@ -32,6 +32,7 @@ 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
@@ -40,10 +41,11 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('0f091b4950e120d5c3e23ab391bacfdb6ce8eb8d0acab55e9dae1a8c247dd192'
+sha256sums=('1e6595af1e56882627982b5e69dff0cb3575d65449dbe79697f3d4b0922492cc'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121'
+            '2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4'
             'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00'
+            '9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
             '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
@@ -59,12 +61,10 @@ _uc_ver=$pkgver-1
 source=(${source[@]}
         ${pkgname%-*}-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         ozone-add-va-api-support-to-wayland.patch
-        remove-main-main10-profile-limit.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
-            '033ee30553302d606ae4449792dbbe2af5e0fd34bccb73f029b6e9882676ea2b'
+            '11e286263f629443e91027dd1ee84116b3ad5df5d90ad0eb2817e17d371af6d8'
             'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
-            '01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -120,6 +120,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
@@ -136,7 +137,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
 
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
   patch -p1 -i ../xdg-basedir.patch
@@ -149,9 +149,6 @@ prepare() {
   # Enable vaapi on wayland
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
 
-  # Remove HEVC profile limits
-  patch -Np1 -i ../remove-main-main10-profile-limit.patch
-
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/${pkgname%xdg*}$_uc_ver"
   _utils="${_ungoogled_repo}/utils"
@@ -197,6 +194,7 @@ build() {
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'is_official_build=true' # implies is_cfi=true on x86_64
     'symbol_level=0' # sufficient for backtraces on x86(_64)
+    'clang_base_path="/usr"'
     'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile
     'disable_fieldtrial_testing_config=true'
     'blink_enable_generated_code_formatting=false'
@@ -204,8 +202,12 @@ build() {
     '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_system_libwayland_server=true'
+    'use_system_wayland_scanner=true'
     'use_custom_libcxx=false'
     'enable_widevine=true'
     'enable_platform_hevc=true'
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 000000000000..13d504d3e792
--- /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 {