diff --git a/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch b/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch new file mode 100644 index 0000000000..6a0f7b6c4a --- /dev/null +++ b/srcpkgs/firefox/patches/eac40293649628d32911c909219d514bebb8ce63.patch @@ -0,0 +1,50 @@ + +# HG changeset patch +# User Zhao Jiazhong +# Date 1631000649 0 +# Node ID eac40293649628d32911c909219d514bebb8ce63 +# Parent 6582d77235867224aaf8621bad8ee167dfb31460 +Bug 1729124 - [MIPS64][ARM64] Fix gcc build issue. r=lth + +The SpecificRegs struct needs a constructor. + +Differential Revision: https://phabricator.services.mozilla.com/D124535 + +diff --git a/js/src/wasm/WasmBCRegDefs.h b/js/src/wasm/WasmBCRegDefs.h +--- a/js/src/wasm/WasmBCRegDefs.h ++++ b/js/src/wasm/WasmBCRegDefs.h +@@ -374,25 +374,31 @@ struct SpecificRegs { + }; + #elif defined(JS_CODEGEN_ARM) + struct SpecificRegs { + RegI64 abiReturnRegI64; + + SpecificRegs() : abiReturnRegI64(ReturnReg64) {} + }; + #elif defined(JS_CODEGEN_ARM64) +-struct SpecificRegs {}; ++struct SpecificRegs { ++ // Required by gcc. ++ SpecificRegs() {} ++}; + #elif defined(JS_CODEGEN_MIPS32) + struct SpecificRegs { + RegI64 abiReturnRegI64; + + SpecificRegs() : abiReturnRegI64(ReturnReg64) {} + }; + #elif defined(JS_CODEGEN_MIPS64) +-struct SpecificRegs {}; ++struct SpecificRegs { ++ // Required by gcc. ++ SpecificRegs() {} ++}; + #else + struct SpecificRegs { + # ifndef JS_64BIT + RegI64 abiReturnRegI64; + # endif + + SpecificRegs() { MOZ_CRASH("BaseCompiler porting interface: SpecificRegs"); } + }; + diff --git a/srcpkgs/firefox/patches/fix-i386-fdlibm.patch b/srcpkgs/firefox/patches/fix-i386-fdlibm.patch new file mode 100644 index 0000000000..831e5e0367 --- /dev/null +++ b/srcpkgs/firefox/patches/fix-i386-fdlibm.patch @@ -0,0 +1,18 @@ +# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double') +# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,12 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined(__linux__) && defined(__i386__) ++// rely on glibc's double_t ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch deleted file mode 100644 index 94de423ce5..0000000000 --- a/srcpkgs/firefox/patches/fix-tools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:09:40.980448579 +0100 -+++ b/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 -@@ -497,8 +501,10 @@ - ucontext_t sSyncUContext; - - void Registers::SyncPopulate() { -+#if defined(__GLIBC__) - if (!getcontext(&sSyncUContext)) { - PopulateRegsFromContext(*this, &sSyncUContext); - } -+#endif - } - #endif diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch index 908311cdb6..38657e80cf 100644 --- a/srcpkgs/firefox/patches/skia-sucks3.patch +++ b/srcpkgs/firefox/patches/skia-sucks3.patch @@ -33,9 +33,9 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp --- a/gfx/layers/composite/CompositableHost.cpp +++ b/gfx/layers/composite/CompositableHost.cpp @@ -13,6 +13,7 @@ - #include "ImageHost.h" // for ImageHostBuffered, etc + #include "Effects.h" // for EffectMask, Effect, etc + #include "gfxUtils.h" #include "Layers.h" - #include "TiledContentHost.h" // for TiledContentHost +#include "mozilla/EndianUtils.h" #include "mozilla/gfx/gfxVars.h" #include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 55cfb9e782..768d56ed52 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=92.0 +version=93.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84 +checksum=a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102 lib32disabled=yes @@ -173,6 +173,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' ' } do_install() { export MACH_USE_SYSTEM_PYTHON=1 + export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" DESTDIR="$DESTDIR" ./mach install vinstall ${FILESDIR}/vendor.js 644 usr/lib/firefox/browser/defaults/preferences