From 1c2196bc2c275ce2452c3aa043305c40ea10943a Mon Sep 17 00:00:00 2001 From: JustKidding Date: Tue, 19 Sep 2023 07:17:42 -0500 Subject: upgpkg: ungoogled-chromium 117.0.5938.88-1 upstream release --- .SRCINFO | 21 ++++--- PKGBUILD | 23 ++++--- ...mory-for-std-unique_ptr-in-third_party-ip.patch | 27 +++++++++ material-color-utilities-cmath.patch | 11 ++++ ...ird_party-libavif-src-b33d9ebfc.676aded35.patch | 70 ++++++++++++++++++++++ 5 files changed, 138 insertions(+), 14 deletions(-) create mode 100644 add-memory-for-std-unique_ptr-in-third_party-ip.patch create mode 100644 material-color-utilities-cmath.patch create mode 100644 roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch diff --git a/.SRCINFO b/.SRCINFO index c1ffb90..3b89fe2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 116.0.5845.140 + pkgver = 117.0.5938.88 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -46,6 +46,7 @@ pkgbase = ungoogled-chromium depends = opus depends = harfbuzz depends = re2 + depends = libavif depends = jsoncpp depends = libxslt depends = libpng @@ -55,26 +56,32 @@ pkgbase = ungoogled-chromium optdepends = qt5-base: enable Qt5 with --enable-features=AllowQt optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce optdepends = kwallet: support for storing passwords in KWallet on Plasma - provides = chromium=116.0.5845.140 - provides = chromedriver=116.0.5845.140 + provides = chromium=117.0.5938.88 + provides = chromedriver=117.0.5938.88 conflicts = chromium conflicts = chromedriver options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-116.0.5845.140.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-117.0.5938.88.tar.xz source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz source = https://github.com/stha09/chromium-patches/releases/download/chromium-116-patchset-2/chromium-116-patchset-2.tar.xz + source = add-memory-for-std-unique_ptr-in-third_party-ip.patch + source = roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch source = REVERT-disable-autoupgrading-debug-info.patch + source = material-color-utilities-cmath.patch source = use-oauth2-client-switches-as-default.patch - source = ungoogled-chromium-116.0.5845.140-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/116.0.5845.140-1.tar.gz + source = ungoogled-chromium-117.0.5938.88-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/117.0.5938.88-1.tar.gz source = ozone-add-va-api-support-to-wayland.patch source = vaapi-add-av1-support.patch source = remove-main-main10-profile-limit.patch - sha256sums = f89677b9da05baa569fd143a3456cb5cbce8bde9ea7d10b4f3907dcd1132716c + sha256sums = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906 sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a sha256sums = 25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0 + sha256sums = 7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9 + sha256sums = 30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6 sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69 + sha256sums = 55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1 sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 - sha256sums = 773743829f782fabe33d84cb7f719bd8296875e270e37f954d1561a27ace8cc4 + sha256sums = 97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33 sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69 sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307 sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c diff --git a/PKGBUILD b/PKGBUILD index 86e8ad6..7b4b7d0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=116.0.5845.140 +pkgver=117.0.5938.88 pkgrel=1 _launcher_ver=8 _gcc_patchset=116-patchset-2 @@ -32,12 +32,18 @@ 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://github.com/stha09/chromium-patches/releases/download/chromium-$_gcc_patchset/chromium-$_gcc_patchset.tar.xz + add-memory-for-std-unique_ptr-in-third_party-ip.patch + roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch REVERT-disable-autoupgrading-debug-info.patch + material-color-utilities-cmath.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('f89677b9da05baa569fd143a3456cb5cbce8bde9ea7d10b4f3907dcd1132716c' +sha256sums=('4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' '25ad7c1a5e0b7332f80ed15ccf07d7e871d8ffb4af64df7c8fef325a527859b0' + '7b9708f0dbfd697be7043d3cfe52da991185aa0ee29a3b8263506cd3ae4d41a9' + '30841fbe0785f8df584eeaa86584fe75f89da26e71df80cf536887557ddef0b6' '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69' + '55e6097d347be40cffebf3ce13ba84ea92d940f60865f1bd7c9af1ef2a2ef8e1' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') if (( _manual_clone )); then @@ -55,7 +61,7 @@ source=(${source[@]} vaapi-add-av1-support.patch remove-main-main10-profile-limit.patch) sha256sums=(${sha256sums[@]} - '773743829f782fabe33d84cb7f719bd8296875e270e37f954d1561a27ace8cc4' + '97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33' 'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69' 'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307' 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c') @@ -72,8 +78,8 @@ declare -gA _system_libs=( [harfbuzz-ng]=harfbuzz [icu]=icu [jsoncpp]=jsoncpp - #[libaom]=aom # https://aomedia.googlesource.com/aom/+/706ee36dcc82 - #[libavif]=libavif # https://github.com/AOMediaCodec/libavif/commit/4d2776a3 + #[libaom]=aom + [libavif]=libavif [libdrm]= [libjpeg]=libjpeg [libpng]=libpng @@ -123,16 +129,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 # 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 ../patches/chromium-116-object_paint_properties_sparse-include.patch - patch -Np1 -i ../patches/chromium-116-profile_view_utils-include.patch # Custom Patches #patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch 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 new file mode 100644 index 0000000..2d6005f --- /dev/null +++ b/add-memory-for-std-unique_ptr-in-third_party-ip.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 0000000..3948c5f --- /dev/null +++ b/material-color-utilities-cmath.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 0000000..ba821a9 --- /dev/null +++ b/roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch @@ -0,0 +1,70 @@ +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. -- cgit v1.2.3