diff --git a/PKGBUILD b/PKGBUILD index 1ba9e21..ccf1b3a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,13 +9,13 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=124.0.6367.155 +pkgver=124.0.6367.201 pkgrel=1 _launcher_ver=8 _system_clang=1 # ungoogled chromium variables _uc_usr=ungoogled-software -_uc_ver=124.0.6367.155-1 +_uc_ver=124.0.6367.201-1 pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') url="https://github.com/ungoogled-software/ungoogled-chromium" @@ -46,11 +46,10 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom 0001-vaapi-flag-ozone-wayland.patch drop-flag-unsupported-by-clang17.patch compiler-rt-adjust-paths.patch - qt-6.7.patch fix-a-missing-build-dependency.patch ninja-out-of-order-generation-fix.patch) -sha256sums=('667d5b3522238b2458816b7e409540e47e9e70c8f2921f64342408fa2323bbc4' - '51b8c00c225e49ca2db0e842da87ae9a65cc5035fa3ecea2fa5f8ed389234d80' +sha256sums=('11773c4cfce4b39ae1bbe711b2907cb86e9aa299b7c6a71656edb876f0c85992' + '1572690cd4dbe6ae038227575e4d34688bd5911853bce7795bf79db9fdbc9647' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' 'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' @@ -62,9 +61,8 @@ sha256sums=('667d5b3522238b2458816b7e409540e47e9e70c8f2921f64342408fa2323bbc4' '9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec' '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' - 'e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f' '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93' - '1a17064c2a2ba35fddca4f9a5f42a3eb386078a0ed8f9f38641543989b04c037') + '813e6a1209ab72e4ab34f5f062412087e9664189d7b8f1dc1d0bb9481c574c45') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py # Keys are the names in the above script; values are the dependencies in Arch @@ -126,9 +124,6 @@ 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 - # Fix ninja 1.12 generating files out of order patch -Np1 -i ../ninja-out-of-order-generation-fix.patch diff --git a/ninja-out-of-order-generation-fix.patch b/ninja-out-of-order-generation-fix.patch index 37d1233..7b7df00 100644 --- a/ninja-out-of-order-generation-fix.patch +++ b/ninja-out-of-order-generation-fix.patch @@ -26,3 +26,13 @@ "//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", +--- a/chrome/common/BUILD.gn ++++ b/chrome/common/BUILD.gn +@@ -605,6 +605,7 @@ + "//components/optimization_guide/optimization_guide_internals/webui:url_constants", + "//components/password_manager/content/common", + "//components/safe_browsing/core/common", ++ "//components/supervised_user/core/common:buildflags", + "//device/vr/buildflags", + ] + } diff --git a/qt-6.7.patch b/qt-6.7.patch deleted file mode 100644 index 53c1ca8..0000000 --- a/qt-6.7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3a812de6e7e0b285eda21ebbb670ca809c4db2b5 Mon Sep 17 00:00:00 2001 -From: Matt Jolly -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 -Signed-off-by: Matt Jolly ---- 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