Date: Wednesday, July 6, 2022 @ 13:52:02 Author: heftig Revision: 449934
102.0.1-1 Added: firefox/trunk/cbindgen-0.24.0.diff Modified: firefox/trunk/PKGBUILD ----------------------+ PKGBUILD | 10 +++++++--- cbindgen-0.24.0.diff | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-07-05 22:54:55 UTC (rev 449933) +++ PKGBUILD 2022-07-06 13:52:02 UTC (rev 449934) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=102.0 +pkgver=102.0.1 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) @@ -22,10 +22,11 @@ 'xdg-desktop-portal: Screensharing with Wayland') options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - zstandard-0.18.0.diff + cbindgen-0.24.0.diff zstandard-0.18.0.diff $pkgname.desktop identity-icons-brand.svg) -sha256sums=('01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf' +sha256sums=('7bba6ffd6e8e42d5c38aa2a453f5fa30dfc9ef150f2175aa0625edb68fddae70' 'SKIP' + '4628d136c3beada292e83cd8e89502cac4aa3836851b34259a665582a7713978' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9') @@ -47,6 +48,9 @@ mkdir mozbuild cd firefox-$pkgver + # Unbreak build with cbindgen 0.24.0 + patch -Np1 -i ../cbindgen-0.24.0.diff + # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff Added: cbindgen-0.24.0.diff =================================================================== --- cbindgen-0.24.0.diff (rev 0) +++ cbindgen-0.24.0.diff 2022-07-06 13:52:02 UTC (rev 449934) @@ -0,0 +1,17 @@ +Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places. +Author: Olivier Tilloy <[email protected]> +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 +Forwarded: not-needed + +--- a/gfx/webrender_bindings/webrender_ffi.h ++++ b/gfx/webrender_bindings/webrender_ffi.h +@@ -73,8 +73,6 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; +- + } // namespace wr + } // namespace mozilla + +
