summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustKidding <jk@vin.ovh>2022-09-24 23:16:19 -0500
committerJustKidding <jk@vin.ovh>2022-09-24 23:16:19 -0500
commit11cf7a75bab181e75f8247e009b821be4d9d145d (patch)
tree3fc06fe4411a4b636c832936359e8df3e7ace292
parentc034e1ecd9d3e25b246689522fe950d2274f970f (diff)
downloadungoogled-chromium-11cf7a75bab181e75f8247e009b821be4d9d145d.tar.gz
ungoogled-chromium-11cf7a75bab181e75f8247e009b821be4d9d145d.tar.bz2
ungoogled-chromium-11cf7a75bab181e75f8247e009b821be4d9d145d.zip
upgpkg: ungoogled-chromium 105.0.5195.125-3
use bundled jsoncpp
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
-rwxr-xr-xupdate-patches.sh2
3 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0224908..54bc413 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ungoogled-chromium
pkgdesc = A lightweight approach to removing Google web service dependency
pkgver = 105.0.5195.125
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/ungoogled-software/ungoogled-chromium
arch = x86_64
license = BSD
@@ -47,7 +47,6 @@ pkgbase = ungoogled-chromium
depends = harfbuzz
depends = re2
depends = libavif
- depends = jsoncpp
depends = libxslt
depends = libpng
depends = freetype2
diff --git a/PKGBUILD b/PKGBUILD
index 9ca1ffb..bdcb870 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgname=ungoogled-chromium
pkgver=105.0.5195.125
-pkgrel=2
+pkgrel=3
_launcher_ver=8
_gcc_patchset=1
pkgdesc="A lightweight approach to removing Google web service dependency"
@@ -73,7 +73,7 @@ declare -gA _system_libs=(
[freetype]=freetype2
[harfbuzz-ng]=harfbuzz
[icu]=icu
- [jsoncpp]=jsoncpp
+ #[jsoncpp]=jsoncpp # triggers a CFI violation (https://crbug.com/1365218)
[libaom]=aom
[libavif]=libavif
[libdrm]=
@@ -146,8 +146,11 @@ prepare() {
# Ungoogled Chromium changes
_ungoogled_repo="$srcdir/$pkgname-$_uc_ver"
_utils="${_ungoogled_repo}/utils"
+ msg2 'Pruning binaries'
python "$_utils/prune_binaries.py" ./ "$_ungoogled_repo/pruning.list"
+ msg2 'Applying patches'
python "$_utils/patches.py" apply ./ "$_ungoogled_repo/patches"
+ msg2 'Applying domain substitution'
python "$_utils/domain_substitution.py" apply -r "$_ungoogled_repo/domain_regex.list" \
-f "$_ungoogled_repo/domain_substitution.list" -c domainsubcache.tar.gz ./
diff --git a/update-patches.sh b/update-patches.sh
index 5882faf..edf046d 100755
--- a/update-patches.sh
+++ b/update-patches.sh
@@ -1,7 +1,7 @@
#!/bin/bash
mkdir tmp
-mv ozone-add-va-api-support-to-wayland.patch remove-main-main10-profile-limit.patch tmp
+mv ozone-add-va-api-support-to-wayland.patch remove-main-main10-profile-limit.patch revert-mutter-wayland-regression.patch tmp
rm *.patch
git clone https://github.com/archlinux/svntogit-packages.git --branch packages/chromium --single-branch chr