summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@anakreon.cz>2016-05-20 11:54:59 +0200
committerMartin Stransky <stransky@anakreon.cz>2016-05-20 11:54:59 +0200
commitc246f4ee64eb8af99830f1d4e2466465d570c986 (patch)
treeff024b1190a436d80181f5da564a10d115a6e763
parentMerge branch 'master' into f24 (diff)
parentBuild fix for arm (diff)
downloadlibrewolf-fedora-ff-c246f4ee64eb8af99830f1d4e2466465d570c986.tar.gz
librewolf-fedora-ff-c246f4ee64eb8af99830f1d4e2466465d570c986.tar.bz2
librewolf-fedora-ff-c246f4ee64eb8af99830f1d4e2466465d570c986.zip
Merge branch 'master' into f24
-rw-r--r--firefox.spec2
-rw-r--r--mozilla-1245783.patch2
2 files changed, 4 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec
index 2c7ddca..d296c1d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -131,6 +131,7 @@ Patch400: mozilla-1255590.patch
Patch402: mozilla-1196777.patch
Patch403: mozilla-1216658.patch
Patch404: mozilla-1270046.patch
+# Remove when mozbz#1269319 lands
Patch405: mozilla-1245783.patch
# Debian patches
@@ -349,6 +350,7 @@ echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
echo "ac_add_options --with-float-abi=hard" >> .mozconfig
echo "ac_add_options --with-fpu=vfpv3-d16" >> .mozconfig
echo "ac_add_options --disable-elf-hack" >> .mozconfig
+echo "ac_add_options --disable-ion" >> .mozconfig
%endif
%ifarch armv7hnl
echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
diff --git a/mozilla-1245783.patch b/mozilla-1245783.patch
index 2405fef..3452616 100644
--- a/mozilla-1245783.patch
+++ b/mozilla-1245783.patch
@@ -1,3 +1,5 @@
+# Remove when mozbz#1269319 lands
+
--- firefox-45.0.1-orig/js/src/Makefile.in 2016-05-17 14:53:58.753178403 +0200
+++ firefox-45.0.1/js/src/Makefile.in 2016-05-17 14:53:28.432817862 +0200
@@ -144,6 +144,11 @@ distclean::
bgstack15