fixed ARM build
authorAdrian Schr?ter <adrian@suse.de>
Fri, 25 May 2012 09:12:54 +0200
changeset 457 0c2249d015b6
parent 456 7b9ab7747a11
child 462 2d86bdb4277f
child 463 916711b0f1d6
fixed ARM build
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/mozilla-arm-disable-edsp.patch
mozilla-arm-disable-edsp.patch
series
xulrunner/xulrunner.changes
xulrunner/xulrunner.spec
--- a/MozillaFirefox/MozillaFirefox.changes	Wed May 30 17:39:29 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri May 25 09:12:54 2012 +0200
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
-Tue May 15 11:51:34 UTC 2012 - wr@rosenauer.org
-
-- update to Aurora 14 (20120514)
+Wed May 30 15:42:48 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 14 (20120530)
 - enable crashreporter for Factory/12.2
   (fixed in mozilla-gcc47.patch)
+- license change from tri license to MPL-2.0
+
+-------------------------------------------------------------------
+Wed May 23 14:40:16 UTC 2012 - adrian@suse.de
+
+- fix build on arm
 
 -------------------------------------------------------------------
 Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec	Wed May 30 17:39:29 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri May 25 09:12:54 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012051400
+%define         releasedate 2012053000
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -96,6 +96,7 @@
 Patch12:        mozilla-disable-neon-option.patch
 Patch13:        mozilla-yarr-pcre.patch
 Patch14:        mozilla-gcc47.patch
+Patch15:        mozilla-arm-disable-edsp.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
@@ -224,6 +225,7 @@
 #%patch12 -p1
 #%patch13 -p1
 %patch14 -p1
+%patch15 -p1
 #
 %patch30 -p1
 %if %suse_version >= 1110
--- /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	Wed May 30 17:39:29 2012 +0200
+++ b/series	Fri May 25 09:12:54 2012 +0200
@@ -16,6 +16,7 @@
 mozilla-dump_syms-static.patch
 mozilla-sle11.patch
 mozilla-gcc47.patch
+mozilla-arm-disable-edsp.patch
 #mozilla-disable-neon-option.patch
 #mozilla-yarr-pcre.patch
 
--- a/xulrunner/xulrunner.changes	Wed May 30 17:39:29 2012 +0200
+++ b/xulrunner/xulrunner.changes	Fri May 25 09:12:54 2012 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 30 15:44:20 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 14.0 (20120530)
+- license change from tri license to MPL-2.0
+
 -------------------------------------------------------------------
 Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org
 
--- a/xulrunner/xulrunner.spec	Wed May 30 17:39:29 2012 +0200
+++ b/xulrunner/xulrunner.spec	Fri May 25 09:12:54 2012 +0200
@@ -46,7 +46,7 @@
 BuildRequires:  mozilla-nss-devel >= 3.13.4
 Version:        13.98
 Release:        0
-%define         releasedate 2012042800
+%define         releasedate 2012053000
 %define         version_internal 14.0
 %define         apiversion 14
 %define         uaweight 1400000