diff --git a/www/tor-browser/browser/Makefile b/www/tor-browser/browser/Makefile index 48acd1c87d1..316b47eb156 100644 --- a/www/tor-browser/browser/Makefile +++ b/www/tor-browser/browser/Makefile @@ -10,6 +10,7 @@ MOZILLA_PROJECT = ${BROWSER_NAME} MOZILLA_CODENAME = browser TL_VERSION = 0.2.33 HE_VERSION = 2021.4.15 +REVISION = 0 EXTRACT_SUFX = .tar.xz PATCHORIG = .pat.orig diff --git a/www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h b/www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h new file mode 100644 index 00000000000..964d1f5fea7 --- /dev/null +++ b/www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h @@ -0,0 +1,18 @@ +Workaround for "error: redefinition of 'ROOT_CLIP_CHAIN'" with newer cbindgen. + +https://hg.mozilla.org/mozilla-central/diff/51947744ce12247f378a1db2379ffaad3fcd18c3/gfx/webrender_bindings/webrender_ffi.h +https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 +https://github.com/eqrion/cbindgen/issues/767#issuecomment-1153125949 + +Index: gfx/webrender_bindings/webrender_ffi.h +--- gfx/webrender_bindings/webrender_ffi.h.orig ++++ gfx/webrender_bindings/webrender_ffi.h +@@ -77,8 +77,6 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; +- + } // namespace wr + } // namespace mozilla +