From 9a719d11987ce2d529b5a776645dcb058926ae50 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 1 Feb 2024 13:39:32 +0100 Subject: [PATCH] PKGBUILD+Patches: Upgrade to extra/chromium 121.0.6167.139-1 and ungoogled-chromium 121.0.6167.139-1 --- PKGBUILD | 66 +++++++++++++++++++++++++----------- chromium-121-constexpr.patch | 12 +++++++ compiler-rt-16.patch | 36 ++++++++++++++++++++ 3 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 chromium-121-constexpr.patch create mode 100644 compiler-rt-16.patch diff --git a/PKGBUILD b/PKGBUILD index c845d55..7e63af2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,13 +9,13 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=121.0.6167.85 +pkgver=121.0.6167.139 pkgrel=1 _launcher_ver=8 -_system_clang=0 +_system_clang=1 # ungoogled chromium variables _uc_usr=ungoogled-software -_uc_ver=121.0.6167.85-1 +_uc_ver=121.0.6167.139-1 pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') url="https://github.com/ungoogled-software/ungoogled-chromium" @@ -24,7 +24,7 @@ depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt' 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva' 'libffi' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire' - 'qt5-base' 'java-runtime-headless' 'git') + 'rust' 'qt5-base' 'java-runtime-headless' 'git') optdepends=('pipewire: WebRTC desktop sharing under Wayland' 'kdialog: support for native dialogs in Plasma' 'qt5-base: enable Qt5 with --enable-features=AllowQt' @@ -46,9 +46,12 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom 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-vaapi-flag-ozone-wayland.patch) -sha256sums=('a2f46c5266681126ea9e15c1c3067560d84f3e5d902e1ace934a3813c84e7152' - 'de62d7c174b443bb31d0a20ac96be3dbd7ac355d6f0778886b90cb4da8a0c727' + 0001-vaapi-flag-ozone-wayland.patch + REVERT-simplify-blink-NativeValueTraitsBase.patch::https://github.com/chromium/chromium/commit/940af9f2c87b436559b97c53763aa9eaaf1254eb.patch + chromium-121-constexpr.patch + compiler-rt-16.patch) +sha256sums=('e12cc967bef7a79630828792f02d95297a06eb905c98e4c6e065fd5e74d6f9ff' + 'a4f389f9159effbbe47a07ade0b8b9b86ebb64a56230ea7a4b43664cd499f829' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' 'e9113c1ed2900b84b488e608774ce25212d3c60094abdae005d8a943df9b505e' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' @@ -59,7 +62,10 @@ sha256sums=('a2f46c5266681126ea9e15c1c3067560d84f3e5d902e1ace934a3813c84e7152' '2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3' 'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285' 'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a' - '9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec') + '9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec' + '318df8f8662071cebcdf953698408058e17f59f184500b7e12e01a04a4206b50' + '09677c39ff9b910c732a049252969bfa03587e70502765d68b0345bac396c0b2' + '8a2649dcc6ff8d8f24ddbe40dc2a171824f681c6f33c39c4792b645b87c9dcab') # 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 @@ -86,7 +92,7 @@ declare -gA _system_libs=( #[re2]=re2 # needs libstdc++ #[snappy]=snappy # needs libstdc++ #[woff2]=woff2 # needs libstdc++ - #[zlib]=minizip + [zlib]=minizip ) _unwanted_bundled_libs=( $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') @@ -117,25 +123,38 @@ prepare() { # Fix build with ICU 74 patch -Np1 -i ../icu-74.patch + # Fix "error: defaulted definition of equality comparison operator cannot + # be declared constexpr because it invokes a non-constexpr comparison + # function" (patch from Fedora) + patch -Np1 -i ../chromium-121-constexpr.patch + + # Revert usage of C++20 features which likely need newer clang + patch -Rp1 -i ../REVERT-simplify-blink-NativeValueTraitsBase.patch + # Drop compiler flags that need newer clang - #patch -Np1 -i ../drop-flags-unsupported-by-clang16.patch + patch -Np1 -i ../drop-flags-unsupported-by-clang16.patch + + # Allow libclang_rt.builtins from compiler-rt 16 to be used + patch -Np1 -i ../compiler-rt-16.patch # Fixes for building with libstdc++ instead of libc++ - #patch -Np1 -i ../chromium-patches-*/chromium-114-ruy-include.patch - #patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch - #patch -Np1 -i ../chromium-patches-*/chromium-119-clang16.patch + patch -Np1 -i ../chromium-patches-*/chromium-114-ruy-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-119-clang16.patch # Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ ln -s /usr/bin/java third_party/jdk/current/bin/ - # Use prebuilt rust as system rust cannot be used due to the error: - # error: the option `Z` is only accepted on the nightly compiler - ./tools/rust/update_rust.py + if (( !_system_clang )); then + # Use prebuilt rust as system rust cannot be used due to the error: + # error: the option `Z` is only accepted on the nightly compiler + ./tools/rust/update_rust.py - # To link to rust libraries we need to compile with prebuilt clang - ./tools/clang/scripts/update.py + # To link to rust libraries we need to compile with prebuilt clang + ./tools/clang/scripts/update.py + fi # Ungoogled Chromium changes _ungoogled_repo="$srcdir/$pkgname-$_uc_ver" @@ -228,7 +247,16 @@ build() { 'clang_base_path="/usr"' 'clang_use_chrome_plugins=false' "clang_version=\"$_clang_version\"" - #'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile + 'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile + ) + + # Allow the use of nightly features with stable Rust compiler + # https://github.com/ungoogled-software/ungoogled-chromium/pull/2696#issuecomment-1918173198 + export RUSTC_BOOTSTRAP=1 + + _flags+=( + 'rust_sysroot_absolute="/usr"' + "rustc_version=\"$(rustc --version)\"" ) fi diff --git a/chromium-121-constexpr.patch b/chromium-121-constexpr.patch new file mode 100644 index 0000000..a0b7166 --- /dev/null +++ b/chromium-121-constexpr.patch @@ -0,0 +1,12 @@ +diff -up chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h.me chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h +--- chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h.me 2024-01-18 17:00:24.791582422 +0100 ++++ chromium-121.0.6167.57/components/performance_manager/resource_attribution/query_params.h 2024-01-18 17:22:21.521682845 +0100 +@@ -27,7 +27,7 @@ struct QueryParams { + QueryParams(const QueryParams& other); + QueryParams& operator=(const QueryParams& other); + +- friend constexpr bool operator==(const QueryParams&, ++ friend bool operator==(const QueryParams&, + const QueryParams&) = default; + + // Individual resource contexts to measure. diff --git a/compiler-rt-16.patch b/compiler-rt-16.patch new file mode 100644 index 0000000..e14829a --- /dev/null +++ b/compiler-rt-16.patch @@ -0,0 +1,36 @@ +diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn +index d4de2e0cca0..57359c32121 100644 +--- a/build/config/clang/BUILD.gn ++++ b/build/config/clang/BUILD.gn +@@ -130,12 +130,15 @@ template("clang_lib") { + } else if (is_linux || is_chromeos) { + if (current_cpu == "x64") { + _dir = "x86_64-unknown-linux-gnu" ++ _suffix = "-x86_64" + } else if (current_cpu == "x86") { + _dir = "i386-unknown-linux-gnu" ++ _suffix = "-i386" + } else if (current_cpu == "arm") { + _dir = "armv7-unknown-linux-gnueabihf" + } else if (current_cpu == "arm64") { + _dir = "aarch64-unknown-linux-gnu" ++ _suffix = "-aarch64" + } else { + assert(false) # Unhandled cpu type + } +@@ -166,6 +169,15 @@ template("clang_lib") { + assert(false) # Unhandled target platform + } + ++ # Bit of a hack to make this find builtins from compiler-rt 16 ++ if (is_linux || is_chromeos) { ++ if (clang_version == "16") { ++ _dir = "linux" ++ } else { ++ _suffix = "" ++ } ++ } ++ + _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib" + _lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}" + libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]