# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1415391494 -3600
# Node ID f5f6f5547c2baaadcff2e64f6064871ed0f549f8
# Parent  3b2d52457c91cdde737c209e71653d255daa93ff
merge changes from OBS Factory submissions

diff -r 3b2d52457c91 -r f5f6f5547c2b MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Nov 02 10:16:32 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Nov 07 21:18:14 2014 +0100
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Sun Nov  2 09:14:12 UTC 2014 - wr@rosenauer.org
+Fri Nov  7 20:14:32 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 33.1
   * DuckDuckGo is now included upstream (bmo#1061736)
@@ -9,6 +9,27 @@
 - fix typo in GStreamer Recommends
 
 -------------------------------------------------------------------
+Tue Nov  4 18:00:35 UTC 2014 - guillaume@opensuse.org
+
+- Disable elf-hack for aarch64
+- Enable EGL for aarch64
+- Limit RAM usage during link for %arm
+- Fix _constraints for ARM
+
+-------------------------------------------------------------------
+Mon Nov  3 11:36:04 UTC 2014 - dmueller@suse.com
+
+- use proper macros for ARM
+
+-------------------------------------------------------------------
+Mon Nov  3 11:26:23 UTC 2014 - josua.mayer97@gmail.com
+
+- use '--disable-optimize' not only on 32-bit x86, but on 32-bit arm too
+  to fix compiling.
+- pass '-Wl,--no-keep-memory' to linker to reduce required memory during
+  linking on arm.
+
+-------------------------------------------------------------------
 Thu Oct 30 11:31:05 UTC 2014 - wr@rosenauer.org
 
 - update to Firefox 33.0.2
diff -r 3b2d52457c91 -r f5f6f5547c2b MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Nov 02 10:16:32 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Nov 07 21:18:14 2014 +0100
@@ -21,7 +21,7 @@
 %define major 33
 %define mainver %major.1
 %define update_channel release
-%define releasedate 2014103000
+%define releasedate 2014110600
 
 # general build definitions
 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -300,6 +300,8 @@
 %endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
+# Limit RAM usage during link
++export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %ifarch ppc64 ppc64le
 export CFLAGS="$CFLAGS -mminimal-toc"
@@ -319,12 +321,12 @@
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
 ac_add_options --enable-stdcxx-compat
-%ifarch %ix86
+%ifarch %ix86 %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
 %endif
 %endif
-%ifnarch ppc ppc64 ppc64le
+%ifnarch ppc ppc64 ppc64le aarch64
 ac_add_options --enable-elf-hack
 %endif
 ac_add_options --with-system-nspr
@@ -369,7 +371,7 @@
 ac_add_options --disable-webrtc
 %endif
 # try to use OpenGL-ES on ARM
-%ifarch %arm
+%ifarch %arm aarch64
 ac_add_options --with-gl-provider=EGL
 %endif
 EOF
diff -r 3b2d52457c91 -r f5f6f5547c2b MozillaFirefox/_constraints
--- a/MozillaFirefox/_constraints	Sun Nov 02 10:16:32 2014 +0100
+++ b/MozillaFirefox/_constraints	Fri Nov 07 21:18:14 2014 +0100
@@ -15,7 +15,7 @@
     </conditions>
     <hardware>
       <memory>
-        <size unit="M">768</size>
+        <size unit="M">2600</size>
       </memory>
     </hardware>
   </overwrite>