From 2a94b2989acf6acfe465bcd7961b2eb10b43054ed2b02180e568b001a057b099 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 25 May 2012 07:14:05 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=278

---
 MozillaFirefox.spec            |  5 ++---
 fix-arm-build.patch            | 11 -----------
 mozilla-arm-disable-edsp.patch | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 14 deletions(-)
 delete mode 100644 fix-arm-build.patch
 create mode 100644 mozilla-arm-disable-edsp.patch

diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 6cbc82bd..ea861cee 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
@@ -102,8 +103,6 @@ Patch34:        firefox-kde-114.patch
 Patch38:        firefox-no-default-ualocale.patch
 Patch39:        firefox-multilocale-chrome.patch
 Patch41:        firefox-branded-icons.patch
-# compile fix in arm header file
-Patch42:        fix-arm-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -228,6 +227,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 #
 %patch31 -p1
 %patch32 -p1
@@ -240,7 +240,6 @@ cd $RPM_BUILD_DIR/mozilla
 %patch38 -p1
 %patch39 -p1
 %patch41 -p1
-%patch42 -p1
 
 %build
 # no need to add build time to binaries
diff --git a/fix-arm-build.patch b/fix-arm-build.patch
deleted file mode 100644
index 05783fb6..00000000
--- a/fix-arm-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/xpcom/glue/arm.h
-+++ mozilla/xpcom/glue/arm.h	2012-05-23 16:36:32.042201721 +0200
-@@ -148,7 +148,7 @@
- #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
diff --git a/mozilla-arm-disable-edsp.patch b/mozilla-arm-disable-edsp.patch
new file mode 100644
index 00000000..cf82251c
--- /dev/null
+++ b/mozilla-arm-disable-edsp.patch
@@ -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