diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 335cb5c..d3e70ea 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 23 14:40:16 UTC 2012 - adrian@suse.de + +- fix build on arm + ------------------------------------------------------------------- Wed May 16 05:34:01 UTC 2012 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 1ba6f96..ea861ce 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -94,6 +94,7 @@ Patch15: mozilla-yarr-pcre.patch Patch16: mozilla-revert_621446.patch Patch17: mozilla-libnotify.patch Patch18: mozilla-gcc47.patch +Patch19: mozilla-arm-disable-edsp.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -226,6 +227,7 @@ cd $RPM_BUILD_DIR/mozilla %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 # %patch31 -p1 %patch32 -p1 diff --git a/mozilla-arm-disable-edsp.patch b/mozilla-arm-disable-edsp.patch new file mode 100644 index 0000000..cf82251 --- /dev/null +++ b/mozilla-arm-disable-edsp.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Adrian Schröter +# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f +disable ESDP support (no BNC or BMO reference yet :-() + +diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h +--- a/xpcom/glue/arm.h ++++ b/xpcom/glue/arm.h +@@ -143,17 +143,17 @@ namespace mozilla { + extern bool NS_COM_GLUE neon_enabled; + #endif + #endif + } + + #if defined(MOZILLA_PRESUME_EDSP) + # define MOZILLA_MAY_SUPPORT_EDSP 1 + inline bool supports_edsp() { return true; } +-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ ++#elif 0 \ + && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) + inline bool supports_edsp() { return arm_private::edsp_enabled; } + #else + inline bool supports_edsp() { return false; } + #endif + + #if defined(MOZILLA_PRESUME_ARMV6) + # define MOZILLA_MAY_SUPPORT_ARMV6 1