diff options
| author | Danny Rawlins <contact@romster.me> | 2022-07-03 22:20:31 +1000 |
|---|---|---|
| committer | Danny Rawlins <contact@romster.me> | 2022-07-03 22:20:31 +1000 |
| commit | 9923d87491348ad18e11dbbe1a21304338a6e5cf (patch) | |
| tree | 05a67649243f52f79475fe1497c086b928900240 /firefox | |
| parent | eadb1cda129981819488586597a497eed86a3837 (diff) | |
| download | contrib-9923d87491348ad18e11dbbe1a21304338a6e5cf.tar.gz contrib-9923d87491348ad18e11dbbe1a21304338a6e5cf.tar.xz | |
firefox: 101.0 -> 102.0
Diffstat (limited to 'firefox')
| -rw-r--r-- | firefox/.signature | 7 | ||||
| -rw-r--r-- | firefox/Pkgfile | 7 | ||||
| -rw-r--r-- | firefox/fix-ftbfs-newer-cbindgen.patch | 16 |
3 files changed, 25 insertions, 5 deletions
diff --git a/firefox/.signature b/firefox/.signature index c16a6ec29..09e6f6100 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39ZGfkTWYEC+qSAO590oxkuR2pxU0LeALH7g2VCXnolE4ebQ4vXK6sNxEHQLs4kXKbxrOoVvAeal6qWkuT1urA4= -SHA256 (Pkgfile) = dc2aef1cffd89b387d0d5971a5be7ace504d9b9f005bc6ef90929d6a410d915b +RWSagIOpLGJF37z+SMLYSsJfpoR0MPmQP5w4KGamQMw7yD148Ai20C+8WrBjdalG3n6dtI9326N+DuLPmp6+WTlIEDPmdeSJIwo= +SHA256 (Pkgfile) = e5863d4ca7a5757b3b3dfcc6f03d5771ad555ffdfa8a23268f940a6f74192216 SHA256 (.footprint) = c8226cc240304363b6289982601426f70c5cd4e82ac62feff3485bee4f48e050 -SHA256 (firefox-101.0.source.tar.xz) = 55ab5b517d58bbcbc837640263a8371cf1fba3d9f508e54537c4d2cbbfb86095 +SHA256 (firefox-102.0.source.tar.xz) = 01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91 +SHA256 (fix-ftbfs-newer-cbindgen.patch) = d3ea2503dff0a602bb058153533ebccd8232e8aac1dc82437a55d724b8d22bc2 diff --git a/firefox/Pkgfile b/firefox/Pkgfile index b607bace6..19b6d93f1 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,14 +5,17 @@ # Optional: sccache jack name=firefox -version=101.0 +version=102.0 release=1 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz - firefox.desktop) + firefox.desktop + fix-ftbfs-newer-cbindgen.patch) build() { cd $name-$version + patch -p1 -i $SRC/fix-ftbfs-newer-cbindgen.patch + if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n" exit 1 diff --git a/firefox/fix-ftbfs-newer-cbindgen.patch b/firefox/fix-ftbfs-newer-cbindgen.patch new file mode 100644 index 000000000..a996d355b --- /dev/null +++ b/firefox/fix-ftbfs-newer-cbindgen.patch @@ -0,0 +1,16 @@ +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 <olivier.tilloy@canonical.com> +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 + |