v102.0-2
This commit is contained in:
parent
21f8b6a752
commit
d48ad7c2b4
3 changed files with 22 additions and 1 deletions
17
deb_patches/fix-ftbfs-newer-cbindgen.patch
Normal file
17
deb_patches/fix-ftbfs-newer-cbindgen.patch
Normal file
|
|
@ -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 <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
|
||||||
|
|
||||||
|
|
@ -144,6 +144,10 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
|
||||||
# might make the build just a tiny bit cleaner, not really required though
|
# might make the build just a tiny bit cleaner, not really required though
|
||||||
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
|
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
|
||||||
|
|
||||||
|
# cbindgen >= 24 patch
|
||||||
|
|
||||||
|
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-ftbfs-newer-cbindgen.patch"
|
||||||
|
|
||||||
|
|
||||||
# Remove some pre-installed addons that might be questionable
|
# Remove some pre-installed addons that might be questionable
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
|
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ cd $srcdir;
|
||||||
rm -f mozconfig
|
rm -f mozconfig
|
||||||
|
|
||||||
# install cbindgen
|
# install cbindgen
|
||||||
cargo install --version 0.23.0 cbindgen
|
cargo install --version 0.24.3 cbindgen
|
||||||
|
|
||||||
if [[ $CARCH == 'aarch64' ]]; then
|
if [[ $CARCH == 'aarch64' ]]; then
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue