diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 58 | ||||
| -rw-r--r-- | fix-a-missing-build-dependency.patch | 29 | ||||
| -rw-r--r-- | ninja-out-of-order-generation-fix.patch | 38 | ||||
| -rw-r--r-- | qt-6.7.patch | 31 | ||||
| -rw-r--r-- | use-oauth2-client-switches-as-default.patch | 9 |
6 files changed, 110 insertions, 81 deletions
@@ -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.78 + pkgver = 125.0.6422.60 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -53,40 +53,42 @@ 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.78 - provides = chromedriver=124.0.6367.78 + provides = chromium=125.0.6422.60 + provides = chromedriver=125.0.6422.60 conflicts = chromium conflicts = chromedriver options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.78.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-125.0.6422.60.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 = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/125/chromium-patches-125.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.78-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/124.0.6367.78-1.tar.gz + source = ungoogled-chromium-125.0.6422.60-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/125.0.6422.60-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 = 697ea9e8591e0a74deea260a50441711b1ea499ca19e91d6012c5b4d200d1acf + source = ninja-out-of-order-generation-fix.patch + sha256sums = 93f5850101225945d7ec80959b38460e6a63777055bf2d9e893860c33cb60080 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a - sha256sums = c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12 + sha256sums = 58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e + sha256sums = 75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93 sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1 sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 - sha256sums = e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f - sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 + sha256sums = 69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83 sha256sums = 41258e1eb5c9523e543c88459fffa2eadc8dd90972a4d4fb4f4172ba3f1c4d23 sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8 sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665 - sha256sums = 8dabdfa54e0293790d6299aff28aaeb25d61359b0f99321ddd20df9031877c5b + sha256sums = 306409b826eeaed7484ebc8283eb538f51d364ef6ceeb35c178a44ff18dfb6e6 sha256sums = 8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f sha256sums = 2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3 sha256sums = d9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285 sha256sums = a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a + sha256sums = 813e6a1209ab72e4ab34f5f062412087e9664189d7b8f1dc1d0bb9481c574c45 pkgname = ungoogled-chromium-xdg @@ -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.78 +pkgver=125.0.6422.60 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -33,17 +33,17 @@ options=('!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://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2 + 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=('697ea9e8591e0a74deea260a50441711b1ea499ca19e91d6012c5b4d200d1acf' +sha256sums=('93f5850101225945d7ec80959b38460e6a63777055bf2d9e893860c33cb60080' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - 'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12' + '58c8787bd215c4818893405dbb88c17b08bf13039fb5fbcb9dfe95ac51a86f3e' + '75e1482d1b27c34ebe9d4bf27104fedcc219cdd95ce71fc41e77a486befd3f93' '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' - 'e30623f36c54f4af3a8aa7d9400f7d2bed6ef560f15d665d2aa8fd777cb2565f' - 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') + '69d2f076223cab0cf1094ae58c39b5687a98f69bf4545414a35f6a4d2708ed83') # ungoogled-chromium-xdg patches source=(${source[@]} @@ -75,13 +75,15 @@ source=(${source[@]} 0001-adjust-buffer-format-order.patch 0001-enable-linux-unstable-deb-target.patch 0001-ozone-wayland-implement-text_input_manager_v3.patch - 0001-ozone-wayland-implement-text_input_manager-fixes.patch) + 0001-ozone-wayland-implement-text_input_manager-fixes.patch + ninja-out-of-order-generation-fix.patch) sha256sums=(${sha256sums[@]} - '8dabdfa54e0293790d6299aff28aaeb25d61359b0f99321ddd20df9031877c5b' + '306409b826eeaed7484ebc8283eb538f51d364ef6ceeb35c178a44ff18dfb6e6' '8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f' '2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3' 'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285' - 'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a') + 'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a' + '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 @@ -121,7 +123,6 @@ depends+=(${_system_libs[@]}) # # Starting with Chromium 89 (2021-03-02) the OAuth2 credentials have been left # out: https://archlinux.org/news/chromium-losing-sync-support-in-early-march/ -_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM prepare() { if (( _manual_clone )); then @@ -146,6 +147,7 @@ prepare() { patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes + patch -Np1 -i ../fix-a-missing-build-dependency.patch # Drop compiler flag that needs newer clang patch -Np1 -i ../drop-flag-unsupported-by-clang17.patch @@ -153,28 +155,14 @@ 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 # 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 @@ -264,18 +252,25 @@ build() { 'use_custom_libcxx=true' # https://github.com/llvm/llvm-project/issues/61705 'use_sysroot=false' 'use_system_libffi=true' - 'enable_hangout_services_extension=true' 'enable_widevine=true' 'enable_nacl=false' 'use_qt6=true' 'moc_qt6_path="/usr/lib/qt6"' - "google_api_key=\"$_google_api_key\"" + 'use_vaapi=true' + 'enable_platform_hevc=true' + 'enable_hevc_parser_and_hw_decoder=true' ) if [[ -n ${_system_libs[icu]+set} ]]; then _flags+=('icu_use_data_file=false') fi + # Append ungoogled chromium flags to _flags array + # _ungoogled_repo="$srcdir/ungoogled-chromium-update" + _ungoogled_repo="$srcdir/${pkgname%-*}-$_uc_ver" + readarray -t -O ${#_flags[@]} _flags < "${_ungoogled_repo}/flags.gn" + + if (( _system_clang )); then local _clang_version=$( clang --version | grep -m1 version | sed 's/.* \([0-9]\+\).*/\1/') @@ -297,11 +292,6 @@ build() { ) fi - # Append ungoogled chromium flags to _flags array - # _ungoogled_repo="$srcdir/ungoogled-chromium-update" - _ungoogled_repo="$srcdir/${pkgname%-*}-$_uc_ver" - readarray -t -O ${#_flags[@]} _flags < "${_ungoogled_repo}/flags.gn" - # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn) CFLAGS+=' -Wno-builtin-macro-redefined' CXXFLAGS+=' -Wno-builtin-macro-redefined' @@ -405,4 +395,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: diff --git a/fix-a-missing-build-dependency.patch b/fix-a-missing-build-dependency.patch new file mode 100644 index 000000000000..7de5cd95f41d --- /dev/null +++ b/fix-a-missing-build-dependency.patch @@ -0,0 +1,29 @@ +From a976cb05b4024b7a6452d1541378d718cdfe33e6 Mon Sep 17 00:00:00 2001 +From: Takuto Ikuta <tikuta@chromium.org> +Date: Thu, 25 Apr 2024 07:25:32 +0000 +Subject: [PATCH] [devtools] fix a missing build dependency to a generated file + +Bug: 336911498 +Change-Id: I6e6d3afaf33ace53a68271b70165b8c3ab596340 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5487538 +Auto-Submit: Takuto Ikuta <tikuta@chromium.org> +Commit-Queue: Takuto Ikuta <tikuta@chromium.org> +Reviewed-by: Danil Somsikov <dsv@chromium.org> +Commit-Queue: Danil Somsikov <dsv@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1292300} +--- + chrome/browser/devtools/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn +index f0c07cad8cfb..053199e462f5 100644 +--- a/chrome/browser/devtools/BUILD.gn ++++ b/chrome/browser/devtools/BUILD.gn +@@ -117,6 +117,7 @@ static_library("devtools") { + "//chrome/browser/autofill:autofill", + "//components/autofill/content/browser:browser", + "//components/autofill/core/browser:browser", ++ "//components/enterprise/buildflags", + "//components/paint_preview/buildflags:buildflags", + "//components/variations/service:service", + "//components/webapps/common:common", diff --git a/ninja-out-of-order-generation-fix.patch b/ninja-out-of-order-generation-fix.patch new file mode 100644 index 000000000000..7b7df008f086 --- /dev/null +++ b/ninja-out-of-order-generation-fix.patch @@ -0,0 +1,38 @@ +--- a/content/browser/BUILD.gn ++++ b/content/browser/BUILD.gn +@@ -73,6 +73,7 @@ + "//cc/animation", + "//cc/mojo_embedder", + "//cc/paint", ++ "//chrome/common:buildflags", + "//components/attribution_reporting:mojom", + "//components/back_forward_cache:enum", + "//components/browsing_topics/common:common", +@@ -83,6 +84,7 @@ + "//components/download/public/common:public", + "//components/file_access", + "//components/filename_generation", ++ "//components/lens:buildflags", + "//components/link_header_util", + "//components/metrics", + "//components/metrics:single_sample_metrics", +--- a/chrome/browser/extensions/BUILD.gn ++++ b/chrome/browser/extensions/BUILD.gn +@@ -898,6 +898,7 @@ + "//components/resources", + "//components/safe_browsing:buildflags", + "//components/safe_browsing/content/browser/web_ui:web_ui", ++ "//components/safe_browsing/content/common/proto:download_file_types_proto", + "//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 53c1ca89222f..000000000000 --- a/qt-6.7.patch +++ /dev/null @@ -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 diff --git a/use-oauth2-client-switches-as-default.patch b/use-oauth2-client-switches-as-default.patch index 9d9c57bfb0d2..55289a8ff3f9 100644 --- a/use-oauth2-client-switches-as-default.patch +++ b/use-oauth2-client-switches-as-default.patch @@ -1,7 +1,8 @@ -diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc ---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000 -+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000 -@@ -154,11 +154,11 @@ class APIKeyCache { +diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc +index 49c396d69d17..9493e7e5aa48 100644 +--- a/google_apis/google_api_keys-inc.cc ++++ b/google_apis/google_api_keys-inc.cc +@@ -182,11 +182,11 @@ class APIKeyCache { std::string default_client_id = CalculateKeyValue( GOOGLE_DEFAULT_CLIENT_ID, |