uppkg -> 108.0.5359.94-1

5 files changed, 38 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8316d1a09e7b..b291e74f6323 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 = 107.0.5304.122
-	pkgrel = 2
+	pkgver = 108.0.5359.94
+	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -47,6 +47,7 @@ pkgbase = ungoogled-chromium-xdg
 	depends = opus
 	depends = harfbuzz
 	depends = re2
+	depends = libavif
 	depends = jsoncpp
 	depends = libxslt
 	depends = libpng
@@ -59,37 +60,35 @@ pkgbase = ungoogled-chromium-xdg
 	conflicts = chromium
 	options = debug
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-107.0.5304.122.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-108.0.5359.94.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-107-patchset-1/chromium-107-patchset-1.tar.xz
-	source = unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-108-patchset-2/chromium-108-patchset-2.tar.xz
 	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 = disable-GlobalMediaControlsCastStartStop.patch
 	source = angle-wayland-include-protocol.patch
 	source = use-oauth2-client-switches-as-default.patch
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
-	source = ungoogled-chromium-107.0.5304.122-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/107.0.5304.122-1.tar.gz
+	source = ungoogled-chromium-108.0.5359.94-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/108.0.5359.94-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 = 05c91722709a117b86997d929796225d4489a707135b1a808a45876be96e5238
+	sha256sums = 0607518481a8a5b993fb371eec544f7d20e43c2eb706ca7bf40ef584496cb6fe
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4
-	sha256sums = b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00
+	sha256sums = 40ef8af65e78901bb8554eddbbb5ebc55c0b8e7927f6ca51b2a353d1c7c50652
 	sha256sums = 9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716
-	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
 	sha256sums = 30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44
 	sha256sums = 4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152
+	sha256sums = 7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302
 	sha256sums = cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 2d82330c725c4eeddb83f5f7476add0b5dd888e23d9524881ec241e8df9323a9
+	sha256sums = 26379c097c7ba655e4d943523575f00647308e2a75ab79c8ff99e4b62b40ae1a
 	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
 	sha256sums = fc810e3c495c77ac60b383a27e48cf6a38b4a95b65dd2984baa297c5df83133c
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
diff --git a/PKGBUILD b/PKGBUILD
index 0c22592e8e2a..84eb4b5433d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,10 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=107.0.5304.122
-pkgrel=2
+pkgver=108.0.5359.94
+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,24 +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
-        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
+        disable-GlobalMediaControlsCastStartStop.patch
         angle-wayland-include-protocol.patch
         use-oauth2-client-switches-as-default.patch
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('05c91722709a117b86997d929796225d4489a707135b1a808a45876be96e5238'
+sha256sums=('0607518481a8a5b993fb371eec544f7d20e43c2eb706ca7bf40ef584496cb6fe'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4'
-            'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00'
+            '40ef8af65e78901bb8554eddbbb5ebc55c0b8e7927f6ca51b2a353d1c7c50652'
             '9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716'
-            '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
             '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
+            '7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302'
             'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a'
@@ -64,7 +62,7 @@ source=(${source[@]}
         remove-main-main10-profile-limit.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
-            '2d82330c725c4eeddb83f5f7476add0b5dd888e23d9524881ec241e8df9323a9'
+            '26379c097c7ba655e4d943523575f00647308e2a75ab79c8ff99e4b62b40ae1a'
             'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
             'fc810e3c495c77ac60b383a27e48cf6a38b4a95b65dd2984baa297c5df83133c'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
@@ -83,7 +81,7 @@ declare -gA _system_libs=(
   [libdrm]=
   [jsoncpp]=jsoncpp
   [libaom]=aom
-  #[libavif]=libavif  # needs https://github.com/AOMediaCodec/libavif/commit/d22d4de94120
+  [libavif]=libavif
   [libjpeg]=libjpeg
   [libpng]=libpng
   #[libvpx]=libvpx
@@ -121,19 +119,18 @@ prepare() {
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
    # 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
-  patch -Rp1 -F3 -i ../REVERT-enable-GlobalMediaControlsCastStartStop.patch
-
   # Revert ffmpeg roll requiring new channel layout API support
   # https://crbug.com/1325301
   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
 
+  # Disable kGlobalMediaControlsCastStartStop by default
+  # https://crbug.com/1314342
+  patch -Np1 -i ../disable-GlobalMediaControlsCastStartStop.patch
+
   # https://crbug.com/angleproject/7582
   patch -Np0 -i ../angle-wayland-include-protocol.patch
 
@@ -208,7 +205,7 @@ build() {
     'use_gnome_keyring=false'
     'use_qt=false' # look into enabling this for M108
     'use_sysroot=false'
-    'use_system_libwayland_server=true'
+    'use_system_libwayland=true'
     'use_system_wayland_scanner=true'
     'use_custom_libcxx=false'
     'enable_widevine=true'
diff --git a/REVERT-enable-GlobalMediaControlsCastStartStop.patch b/REVERT-enable-GlobalMediaControlsCastStartStop.patch
deleted file mode 100644
index e0d4544de482..000000000000
--- a/REVERT-enable-GlobalMediaControlsCastStartStop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
-From: Muyao Xu <muyaoxu@google.com>
-Date: Thu, 20 Jan 2022 23:46:21 +0000
-Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
- default
-
-The feature is rolled out to 100% stable through finch for M96+.
-This CL enables it by default and fixes some unit tests failures.
-
-Bug: 1287242, 1287305
-Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
-Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
-Commit-Queue: Muyao Xu <muyaoxu@google.com>
-Cr-Commit-Position: refs/heads/main@{#961658}
----
- chrome/browser/media/router/media_router_feature.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
-index f28f9b0b802..a8d544f7d6d 100644
---- a/chrome/browser/media/router/media_router_feature.cc
-+++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -33,7 +33,7 @@ const base::Feature kMediaRouter{"MediaRouter",
- const base::Feature kCastAllowAllIPsFeature{"CastAllowAllIPs",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kGlobalMediaControlsCastStartStop{
--    "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT};
- const base::Feature kAllowAllSitesToInitiateMirroring{
-     "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kDialMediaRouteProvider{"DialMediaRouteProvider",
diff --git a/disable-GlobalMediaControlsCastStartStop.patch b/disable-GlobalMediaControlsCastStartStop.patch
new file mode 100644
index 000000000000..38c615e81012
--- /dev/null
+++ b/disable-GlobalMediaControlsCastStartStop.patch
@@ -0,0 +1,13 @@
+diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
+index 862329ef314..47c89123876 100644
+--- a/chrome/browser/media/router/media_router_feature.cc
++++ b/chrome/browser/media/router/media_router_feature.cc
+@@ -54,7 +54,7 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+ #else
+ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+              "GlobalMediaControlsCastStartStop",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+ #endif  // !BUILDFLAG(IS_ANDROID)
diff --git a/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch b/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
deleted file mode 100644
index 7bf1b5c701d8..000000000000
--- a/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 27 Sep 2022 22:20:41 +0000
-Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true
-
-Ensure jsoncpp symbols have public visibility and are thus excluded from
-CFI checks and whole-program optimization. This is achieved by defining
-JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as
-__attribute__((visibility("default"))). The latter macro is used to tag
-jsoncpp classes and namespace functions throughout jsoncpp's headers.
-
-BUG=1365218
-
-Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1052077}
----
- build/linux/unbundle/jsoncpp.gn | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn
-index 544f9d13c9..e84a0ef27a 100644
---- a/build/linux/unbundle/jsoncpp.gn
-+++ b/build/linux/unbundle/jsoncpp.gn
-@@ -3,6 +3,11 @@ import("//build/shim_headers.gni")
- 
- pkg_config("jsoncpp_config") {
-   packages = [ "jsoncpp" ]
-+
-+  # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes
-+  # thus deactivating CFI checks for them. This avoids CFI violations in
-+  # virtual calls to system jsoncpp library (https://crbug.com/1365218).
-+  defines = [ "JSON_DLL_BUILD" ]
- }
- 
- shim_headers("jsoncpp_shim") {