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..6cbc82b 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -102,6 +102,8 @@ 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 @@ -238,6 +240,7 @@ 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 new file mode 100644 index 0000000..05783fb --- /dev/null +++ b/fix-arm-build.patch @@ -0,0 +1,11 @@ +--- 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