--- a/MozillaFirefox/MozillaFirefox.changes Fri May 25 09:18:39 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Fri May 25 09:12:54 2012 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 23 14:40:16 UTC 2012 - adrian@suse.de
+
+- fix build on arm
+
-------------------------------------------------------------------
Wed May 23 06:06:08 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Fri May 25 09:18:39 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Fri May 25 09:12:54 2012 +0200
@@ -96,6 +96,7 @@
Patch18: mozilla-libnotify.patch
Patch19: mozilla-gcc47.patch
Patch20: mozilla-nsSound.patch
+Patch21: mozilla-arm-disable-edsp.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@@ -234,6 +235,7 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
#
%patch31 -p1
%patch32 -p1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-arm-disable-edsp.patch Fri May 25 09:12:54 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-arm-disable-edsp.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-arm-disable-edsp.patch Fri May 25 09:12:54 2012 +0200
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Adrian Schröter <adrian@suse.de>
+# 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
--- a/series Fri May 25 09:18:39 2012 +0200
+++ b/series Fri May 25 09:12:54 2012 +0200
@@ -23,6 +23,8 @@
mozilla-libnotify.patch
mozilla-gcc47.patch
mozilla-nsSound.patch
+mozilla-arm-disable-edsp.patch
+#mozilla-yarr-pcre.patch
# Firefox patches
firefox-browser-css.patch