diff --git a/PKGBUILD b/PKGBUILD index 51239b4..df238cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,13 +9,12 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=117.0.5938.149 -pkgrel=2 +pkgver=118.0.5993.70 +pkgrel=1 _launcher_ver=8 -_gcc_patchset=116-patchset-2 # ungoogled chromium variables _uc_usr=ungoogled-software -_uc_ver=117.0.5938.149-1 +_uc_ver=118.0.5993.70-1 pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') url="https://github.com/ungoogled-software/ungoogled-chromium" @@ -36,24 +35,18 @@ options=('!lto') # Chromium adds its own flags for ThinLTO source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz $pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz - https://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz + https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${pkgver%%.*}/chromium-patches-${pkgver%%.*}.tar.bz2 chromium-drirc-disable-10bpc-color-configs.conf use-oauth2-client-switches-as-default.patch REVERT-disable-autoupgrading-debug-info.patch - add-memory-for-std-unique_ptr-in-third_party-ip.patch - material-color-utilities-cmath.patch - roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch) -sha256sums=('ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df' - '0afcc1fef6e18c612e7a25c65f08b98d0db3e621c80ff855cbfd5a791b6ad03a' +sha256sums=('49ee00a734de3dae7c421eb3c974e8d451b4de6f5b4e34b603fd6435eab6993d' + 'd95a02dc7bad01302ed42c9f50daee53c998149f14ba6a4023198e7b1c6f5a36' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0' + '0d1eb054965711a2d4ed6b4cb7f06cbda5b374a48e1b99c8c38ebf6375a781a9' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711' '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69' - '7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9' - '55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1' - '30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6' 'ab1eb107ec1c915065dc59cf4832da27e17d60eb29038e2aec633daeb946cc6a') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py @@ -108,20 +101,19 @@ prepare() { patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes - patch -Np1 -i ../add-memory-for-std-unique_ptr-in-third_party-ip.patch - patch -Np1 -i ../roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch patch -Np1 -i ../free-the-X11-pixmap-in-the-NativePixmapEGLX11Bind.patch # Revert addition of compiler flag that needs newer clang patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch - # Build fixes - patch -Np0 -i ../material-color-utilities-cmath.patch - # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-114-maldoca-include.patch - patch -Np1 -i ../patches/chromium-114-ruy-include.patch - patch -Np1 -i ../patches/chromium-114-vk_mem_alloc-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-114-maldoca-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-114-ruy-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-114-vk_mem_alloc-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-117-material-color-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-118-SensorReadingField-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-118-LightweightDetector-include.patch + patch -Np1 -i ../chromium-patches-*/chromium-118-system-freetype.patch # Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin diff --git a/add-memory-for-std-unique_ptr-in-third_party-ip.patch b/add-memory-for-std-unique_ptr-in-third_party-ip.patch deleted file mode 100644 index 2d6005f..0000000 --- a/add-memory-for-std-unique_ptr-in-third_party-ip.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Wed, 9 Aug 2023 15:36:26 +0000 -Subject: [PATCH] IWYU: add memory for std::unique_ptr in //third_party/ipcz - -Bug: 957519 -Change-Id: I600f415a59206da283046b638a4f68eda0892ac7 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4754274 -Commit-Queue: Stephan Hartmann -Reviewed-by: Robert Sesek -Cr-Commit-Position: refs/heads/main@{#1181503} ---- - third_party/ipcz/src/ipcz/router_link.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/third_party/ipcz/src/ipcz/router_link.h b/third_party/ipcz/src/ipcz/router_link.h -index 09bc5626d99..619638cc7f1 100644 ---- a/third_party/ipcz/src/ipcz/router_link.h -+++ b/third_party/ipcz/src/ipcz/router_link.h -@@ -7,6 +7,7 @@ - - #include - #include -+#include - #include - #include - diff --git a/material-color-utilities-cmath.patch b/material-color-utilities-cmath.patch deleted file mode 100644 index 3948c5f..0000000 --- a/material-color-utilities-cmath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig 2023-08-30 22:58:42.101555407 +0000 -+++ third_party/material_color_utilities/src/cpp/palettes/tones.cc 2023-08-30 22:58:54.082340977 +0000 -@@ -14,6 +14,8 @@ - * limitations under the License. - */ - -+#include -+ - #include "cpp/palettes/tones.h" - - #include "cpp/cam/cam.h" diff --git a/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch b/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch deleted file mode 100644 index ba821a9..0000000 --- a/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 21d7cf44b1cd83bb0d847515e28ca550404b0033 Mon Sep 17 00:00:00 2001 -From: Wan-Teh Chang -Date: Tue, 22 Aug 2023 19:39:04 +0000 -Subject: [PATCH] Roll src/third_party/libavif/src/ b33d9ebfc..676aded35 (3 - commits) - -https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git/+log/b33d9ebfc961..676aded3501f - -$ git log b33d9ebfc..676aded35 --date=short --no-merges --format='%ad %ae %s' -2023-08-22 wtc Change imir.mode back to imir.axis -2023-08-22 wtc Don't use Identity matrix coefficients with 4:0:0 -2023-08-21 yguyon Increase test values in avifstreamtest - -Created with: - roll-dep src/third_party/libavif/src -R=dalecurtis@chromium.org,jzern@google.com - -Note that imir.mode is renamed imir.axis. - -Change-Id: Ie13972640969f123b7e4580f36d6d6bab913c0f8 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4803347 -Reviewed-by: Dale Curtis -Commit-Queue: Wan-Teh Chang -Cr-Commit-Position: refs/heads/main@{#1186746} ---- - .../image-decoders/avif/avif_image_decoder.cc | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc -index deb3e66d66f..c9f1b185417 100644 ---- a/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc -+++ b/third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.cc -@@ -1005,22 +1005,22 @@ bool AVIFImageDecoder::UpdateDemuxer() { - angle = container->irot.angle; - CHECK_LT(angle, 4); - } -- // |mode| specifies how the mirroring is performed. -+ // |axis| specifies how the mirroring is performed. - // -1: No mirroring. - // 0: The top and bottom parts of the image are exchanged. - // 1: The left and right parts of the image are exchanged. -- int mode = -1; -+ int axis = -1; - if (container->transformFlags & AVIF_TRANSFORM_IMIR) { -- mode = container->imir.mode; -- CHECK_LT(mode, 2); -+ axis = container->imir.axis; -+ CHECK_LT(axis, 2); - } - // MIAF Section 7.3.6.7 (Clean aperture, rotation and mirror) says: - // These properties, if used, shall be indicated to be applied in the - // following order: clean aperture first, then rotation, then mirror. - // -- // In the kModeAngleToOrientation array, the first dimension is mode (with an -+ // In the kAxisAngleToOrientation array, the first dimension is axis (with an - // offset of 1). The second dimension is angle. -- constexpr ImageOrientationEnum kModeAngleToOrientation[3][4] = { -+ constexpr ImageOrientationEnum kAxisAngleToOrientation[3][4] = { - // No mirroring. - {ImageOrientationEnum::kOriginTopLeft, - ImageOrientationEnum::kOriginLeftBottom, -@@ -1037,7 +1037,7 @@ bool AVIFImageDecoder::UpdateDemuxer() { - ImageOrientationEnum::kOriginBottomLeft, - ImageOrientationEnum::kOriginLeftTop}, - }; -- orientation_ = kModeAngleToOrientation[mode + 1][angle]; -+ orientation_ = kAxisAngleToOrientation[axis + 1][angle]; - - // Determine whether the image can be decoded to YUV. - // * Alpha channel is not supported.