uppkg -> 124.0.6367.155-1

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory (using pre-releases)
-	pkgver = 124.0.6367.118
+	pkgver = 124.0.6367.155
 	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
@@ -53,39 +53,37 @@ pkgbase = ungoogled-chromium-xdg
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet5: support for storing passwords in KWallet on Plasma
 	optdepends = chromium-extension-web-store: Web Store Functionality
-	provides = chromium=124.0.6367.118
-	provides = chromedriver=124.0.6367.118
+	provides = chromium=124.0.6367.155
+	provides = chromedriver=124.0.6367.155
 	conflicts = chromium
 	conflicts = chromedriver
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.118.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.155.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
 	source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/124/chromium-patches-124.tar.bz2
 	source = fix-a-missing-build-dependency.patch
 	source = drop-flag-unsupported-by-clang17.patch
 	source = compiler-rt-adjust-paths.patch
-	source = qt-6.7.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-124.0.6367.118-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/124.0.6367.118-1.tar.gz
+	source = ungoogled-chromium-124.0.6367.155-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/124.0.6367.155-1.tar.gz
 	source = 0001-adjust-buffer-format-order.patch
 	source = 0001-enable-linux-unstable-deb-target.patch
 	source = 0001-ozone-wayland-implement-text_input_manager_v3.patch
 	source = 0001-ozone-wayland-implement-text_input_manager-fixes.patch
-	sha256sums = 8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96
+	sha256sums = 667d5b3522238b2458816b7e409540e47e9e70c8f2921f64342408fa2323bbc4
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12
 	sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93
 	sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1
 	sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
-	sha256sums = e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = 41258e1eb5c9523e543c88459fffa2eadc8dd90972a4d4fb4f4172ba3f1c4d23
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = f56909f5071bac41c2c727ff217056925922125096d13a0cfcdce231adebe6f1
+	sha256sums = 51b8c00c225e49ca2db0e842da87ae9a65cc5035fa3ecea2fa5f8ed389234d80
 	sha256sums = 8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f
 	sha256sums = 2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3
 	sha256sums = d9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285

PKGBUILD

@@ -10,7 +10,7 @@
 # binary version of this package (-bin): github.com/noahvogt/ungoogled-chromium-xdg-bin-aur
 
 pkgname=ungoogled-chromium-xdg
-pkgver=124.0.6367.118
+pkgver=124.0.6367.155
 pkgrel=1
 _launcher_ver=8
 _manual_clone=0
@@ -36,15 +36,13 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         fix-a-missing-build-dependency.patch
         drop-flag-unsupported-by-clang17.patch
         compiler-rt-adjust-paths.patch
-        qt-6.7.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96'
+sha256sums=('667d5b3522238b2458816b7e409540e47e9e70c8f2921f64342408fa2323bbc4'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12'
             '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93'
             '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1'
             'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
-            'e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
 
 # ungoogled-chromium-xdg patches
@@ -79,7 +77,7 @@ source=(${source[@]}
         0001-ozone-wayland-implement-text_input_manager_v3.patch
         0001-ozone-wayland-implement-text_input_manager-fixes.patch)
 sha256sums=(${sha256sums[@]}
-            'f56909f5071bac41c2c727ff217056925922125096d13a0cfcdce231adebe6f1'
+            '51b8c00c225e49ca2db0e842da87ae9a65cc5035fa3ecea2fa5f8ed389234d80'
             '8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f'
             '2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3'
             'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285'
@@ -156,28 +154,11 @@ prepare() {
   # Allow libclang_rt.builtins from compiler-rt >= 16 to be used
   patch -Np1 -i ../compiler-rt-adjust-paths.patch
 
-  # Fix build with Qt 6.7
-  patch -Np1 -i ../qt-6.7.patch
-
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch
 
 
   # Custom Patches
-  sed -i '/^bool IsHevcProfileSupported(const VideoType& type) {$/{s++bool IsHevcProfileSupported(const VideoType\& type) { return true;+;h};${x;/./{x;q0};x;q1}' \
-			media/base/supported_types.cc
-
-  # Implement text_input_manager_v3
-  # https://chromium-review.googlesource.com/c/chromium/src/+/3750452
-  patch -Np1 -i ../0001-ozone-wayland-implement-text_input_manager_v3.patch
-  patch -Np1 -i ../0001-ozone-wayland-implement-text_input_manager-fixes.patch
-
-  # Enable VAAPI on Wayland
-  # https://discourse.ubuntu.com/t/chromium-hardware-accelerated-build-for-intel-based-platforms-available-for-beta-testing/35625
-  # https://git.launchpad.net/~chromium-team/chromium-browser/+git/snap-from-source/
-  # patch -Np1 -i ../0001-enable-linux-unstable-deb-target.patch
-  # patch -Np1 -i ../0001-adjust-buffer-format-order.patch
-  # patch -Np1 -i ../0001-vaapi-flag-ozone-wayland.patch
 
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
   patch -p1 -i ../xdg-basedir.patch
@@ -408,4 +389,4 @@ package() {
   install -Dm644 "${srcdir}/index.html" "$pkgdir/usr/share/ungoogled-chromium/index.html"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et ft=sh:

qt-6.7.patch

@@ -1,31 +0,0 @@
-From 3a812de6e7e0b285eda21ebbb670ca809c4db2b5 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Thu, 11 Apr 2024 12:42:17 +1000
-Subject: [PATCH] Add QtGui to the list of Qt modules
-
-Re: https://bugreports.qt.io/browse/QTBUG-124135 - certain versions of QT
-(6.6.3, 6.7.0) produce pkg-config files that no longer emit dependencies.
-This causes Chromium builds to fail as due to not seeing QtGui as a dependency
-of QtWidgets:
-
-    `gen/qt6/../../../../ui/qt/qt_shim.h:11:10: fatal error: 'QImage' file not found`
-
-While this has been resolved upstream, there will certainly be some users
-that are still using these versions of QT. This patch adds QtGui to the list of
-Qt modules that are required to build the Chromium UI.
-
-Bug: https://bugs.gentoo.org/928299
-Suggested-by: Chris Pritchard <chris@christopherpritchard.co.uk>
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
---- a/ui/qt/BUILD.gn
-+++ b/ui/qt/BUILD.gn
-@@ -60,6 +60,7 @@ template("qt_shim") {
-   pkg_config("qt" + invoker.qt_version + "_config") {
-     packages = [
-       "Qt" + invoker.qt_version + "Core",
-+      "Qt" + invoker.qt_version + "Gui",
-       "Qt" + invoker.qt_version + "Widgets",
-     ]
-   }
--- 
-2.44.0