uppkg -> 106.0.5249.62-1

1 files changed, 20 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 29588dd9faf8..ef1a31f4480c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,10 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=105.0.5195.125
+pkgver=106.0.5249.62
 pkgrel=1
 _launcher_ver=8
-_gcc_patchset=1
+_gcc_patchset=2
 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"
@@ -31,22 +31,22 @@ options=('debug' '!lto') # Chromium adds its own flags for ThinLTO
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         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
-        fix-TFLite-build-on-linux-with-system-zlib.patch
-        fix-debug-crash-and-log-spam-with-GTK3-Wayland.patch
-        enable-GlobalMediaControlsCastStartStop.patch
-        roll-src-third_party-ffmpeg.patch
+        unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.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
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66'
+sha256sums=('18da3de37d4c63b6e196bb8c91472eab07d9c461be5e2ff630a2cc077287a6da'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            'f0c437c02cab7a6efc958f82fbb4ea35d5440f73d65731bad7c0dcaecb932121'
-            '5db1fae8a452774b5b177e493a2d1a435b980137b16ed74616d1fb86fe342ec7'
-            'a9a30d16ad6b0689c2c4a85a3c508f49254fc8e69e791a45302673812461eb58'
+            '2ad419439379d17385b7fd99039aca875ba36ca31b591b9cd4ccef84273be121'
+            'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
+            '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
             'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a'
@@ -62,7 +62,7 @@ source=(${source[@]}
         remove-main-main10-profile-limit.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
-            '1b5ae7912099d9a2a9aed97f3978e9c09bedb603313cb18204e2d64ecbe25d1f'
+            'b0d37cfa4bd60549cda5f067a488432d69aebf69ec0d02f64249209680225bdf'
             'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
             '01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
@@ -79,9 +79,9 @@ declare -gA _system_libs=(
   [harfbuzz-ng]=harfbuzz
   [icu]=icu
   [libdrm]=
-  #[jsoncpp]=jsoncpp # triggers a CFI violation (https://crbug.com/1365218)
+  [jsoncpp]=jsoncpp
   [libaom]=aom
-  [libavif]=libavif
+  #[libavif]=libavif  # needs https://github.com/AOMediaCodec/libavif/commit/d22d4de94120
   [libjpeg]=libjpeg
   [libpng]=libpng
   #[libvpx]=libvpx
@@ -118,25 +118,25 @@ prepare() {
   # runtime -- this allows signing into Chromium without baked-in values
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
-  # Upstream fixes
-  patch -Np1 -i ../fix-TFLite-build-on-linux-with-system-zlib.patch
+   # Upstream fixes
+  patch -Np1 -i ../unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
 
   # Revert kGlobalMediaControlsCastStartStop enabled by default
   # https://crbug.com/1314342
-  patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch
+  patch -Rp1 -F3 -i ../REVERT-enable-GlobalMediaControlsCastStartStop.patch
 
   # Revert ffmpeg roll requiring new channel layout API support
   # https://crbug.com/1325301
-  patch -Rp1 -i ../roll-src-third_party-ffmpeg.patch
+  patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m102.patch
+  # Revert switch from AVFrame::pkt_duration to AVFrame::duration
+  patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m106.patch
 
   # https://crbug.com/angleproject/7582
   patch -Np0 -i ../angle-wayland-include-protocol.patch
 
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../patches/chromium-103-VirtualCursor-std-layout.patch
-  patch -Np1 -i ../patches/chromium-105-Bitmap-include.patch
-  patch -Np1 -i ../patches/chromium-105-browser_finder-include.patch
-  patch -Np1 -i ../patches/chromium-105-AdjustMaskLayerGeometry-ceilf.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