Merge branch 'master' into i486

2 files changed, 25 insertions, 2 deletions

diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index 81c26086..f886c6af 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -1,12 +1,15 @@
+source+=('mozconfig.patch')
+sha256sums+=('a9f99789801106d82ec48839d25c0b3358f6641a55d20b4d686f10197b14322d')
 eval "$(
   declare -f build | \
     sed '
-      /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk
+      2 a export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+      2 a export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
     '
   declare -f prepare | \
     sed '
       $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
-      $ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+      $ i patch -p1 -i "$srcdir/mozconfig.patch"
     '
 )"
 for ((i=0; i<${#source[@]}; i++)); do
diff --git a/extra/firefox/mozconfig.patch b/extra/firefox/mozconfig.patch
new file mode 100644
index 00000000..d36e5532
--- /dev/null
+++ b/extra/firefox/mozconfig.patch
@@ -0,0 +1,20 @@
+--- a/.mozconfig	2019-01-21 09:21:00.221010326 +0100
++++ b/.mozconfig	2019-01-21 09:22:02.477911431 +0100
+@@ -6,12 +6,11 @@
+ ac_add_options --enable-optimize
+ ac_add_options --enable-rust-simd
+ ac_add_options --enable-lto
+-export MOZ_PGO=1
+-export CC=clang
+-export CXX=clang++
+-export AR=llvm-ar
+-export NM=llvm-nm
+-export RANLIB=llvm-ranlib
++export CC=gcc
++export CXX=g++
++export AR=gcc-ar
++export NM=gcc-nm
++export RANLIB=gcc-ranlib
+ 
+ # Branding
+ ac_add_options --enable-official-branding