diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rwxr-xr-x | fetch-chromium-release | 46 |
3 files changed, 71 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 130.0.6723.58 + pkgver = 130.0.6723.69 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -19,6 +19,11 @@ pkgbase = ungoogled-chromium makedepends = qt6-base makedepends = java-runtime-headless makedepends = git + makedepends = python-httplib2 + makedepends = python-pyparsing + makedepends = python-six + makedepends = npm + makedepends = rsync depends = gtk3 depends = nss depends = alsa-lib @@ -54,13 +59,13 @@ pkgbase = ungoogled-chromium optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce optdepends = kwallet: support for storing passwords in KWallet on Plasma optdepends = upower: Battery Status API support - provides = chromium=130.0.6723.58 - provides = chromedriver=130.0.6723.58 + provides = chromium=130.0.6723.69 + provides = chromedriver=130.0.6723.69 conflicts = chromium conflicts = chromedriver options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-130.0.6723.58.tar.xz - source = ungoogled-chromium-130.0.6723.58-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/130.0.6723.58-1.tar.gz + source = fetch-chromium-release + source = ungoogled-chromium-130.0.6723.69-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/130.0.6723.69-1.tar.gz source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz source = compiler-rt-adjust-paths.patch source = increase-fortify-level.patch @@ -70,8 +75,8 @@ pkgbase = ungoogled-chromium source = 0001-ozone-wayland-implement-text_input_manager_v3.patch source = 0001-ozone-wayland-implement-text_input_manager-fixes.patch source = 0001-vaapi-flag-ozone-wayland.patch - sha256sums = aa296edec7275d19feade5ef32cbe7dfdd41594d4c0c1afd94bbf4d310c38c4e - sha256sums = 366cfa97db2fedccc2670c0547d24b820a781e7e1dbccaf39574c167fb257833 + sha256sums = 720a1196410080056cd97a1f5ec34d68ba216a281d9b5157b7ea81ea018ec661 + sha256sums = b7a3975ed17ec7cc4ab6143e3f3e1a056ab4b522d98643bc82cdfee726e919c1 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 sha256sums = d634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342 @@ -9,13 +9,14 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ungoogled-chromium -pkgver=130.0.6723.58 +pkgver=130.0.6723.69 pkgrel=1 _launcher_ver=8 +_manual_clone=1 _system_clang=1 # ungoogled chromium variables _uc_usr=ungoogled-software -_uc_ver=130.0.6723.58-1 +_uc_ver=130.0.6723.69-1 pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') url="https://github.com/ungoogled-software/ungoogled-chromium" @@ -46,8 +47,8 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom 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=('aa296edec7275d19feade5ef32cbe7dfdd41594d4c0c1afd94bbf4d310c38c4e' - '366cfa97db2fedccc2670c0547d24b820a781e7e1dbccaf39574c167fb257833' +sha256sums=('720a1196410080056cd97a1f5ec34d68ba216a281d9b5157b7ea81ea018ec661' + 'b7a3975ed17ec7cc4ab6143e3f3e1a056ab4b522d98643bc82cdfee726e919c1' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' 'd634d2ce1fc63da7ac41f432b1e84c59b7cceabf19d510848a7cff40c8025342' @@ -58,6 +59,11 @@ sha256sums=('aa296edec7275d19feade5ef32cbe7dfdd41594d4c0c1afd94bbf4d310c38c4e' 'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a' '9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec') +if (( _manual_clone )); then + source[0]=fetch-chromium-release + makedepends+=('python-httplib2' 'python-pyparsing' 'python-six' 'npm' 'rsync') +fi + # 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 declare -gA _system_libs=( @@ -91,6 +97,9 @@ _unwanted_bundled_libs=( depends+=(${_system_libs[@]}) prepare() { + if (( _manual_clone )); then + ./fetch-chromium-release $pkgver + fi cd "$srcdir/chromium-$pkgver" # Allow building against system libraries in official builds diff --git a/fetch-chromium-release b/fetch-chromium-release new file mode 100755 index 0000000..ac15243 --- /dev/null +++ b/fetch-chromium-release @@ -0,0 +1,46 @@ +#!/bin/bash + +set -e + +readonly VERSION=$1 +if [[ -z $VERSION ]]; then + echo >&2 'No version given as an argument' + exit 1 +fi + +mkdir chromium-checkout +cd chromium-checkout +cat >.gclient <<EOF +solutions = [ + { + "name": "src", + "url": "https://chromium.googlesource.com/chromium/src.git", + "managed": False, + "custom_deps": {}, + "custom_vars": {}, + }, +] +EOF + +git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools +export PATH+=":$PWD/depot_tools" DEPOT_TOOLS_UPDATE=0 +# system python fails to load six.moves module +#export VPYTHON_BYPASS='manually managed python not supported by chrome operations' + +git clone -b $VERSION --depth=2 https://chromium.googlesource.com/chromium/src +gclient sync --no-history --nohooks +src/build/util/lastchange.py -o src/build/util/LASTCHANGE +src/build/util/lastchange.py -m GPU_LISTS_VERSION \ + --revision-id-only --header src/gpu/config/gpu_lists_version.h +src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ + -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h +src/build/util/lastchange.py \ + -s src/third_party/dawn --revision src/gpu/webgpu/DAWN_VERSION +src/tools/update_pgo_profiles.py --target=linux update \ + --gs-url-base=chromium-optimization-profiles/pgo_profiles + +# https://gitlab.archlinux.org/archlinux/packaging/packages/electron32/-/issues/1 +src/third_party/node/update_npm_deps + +find src/third_party/jdk/current -type f -delete +mv src ../chromium-$VERSION |