From 0d305b9315565f430736276b2c2080839141f25f Mon Sep 17 00:00:00 2001
From: Chaoting Liu <brli@chakraos.org>
Date: Fri, 5 Aug 2016 10:46:13 +0100
Subject: [PATCH] firefox-kde: reenable PGO, e10s on by default, skia flag

---
 firefox-kde/PKGBUILD  | 16 ++++++++--------
 firefox-kde/mozconfig |  8 ++++++--
 firefox-kde/vendor.js |  3 +++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/firefox-kde/PKGBUILD b/firefox-kde/PKGBUILD
index 3379dee..76e9b0e 100644
--- a/firefox-kde/PKGBUILD
+++ b/firefox-kde/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=firefox-kde
 pkgver=48.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 _kmozillahelper_commit=83cd08e0c917fda16b30d91f929779304c46d273
 arch=('x86_64')
@@ -16,7 +16,6 @@ makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake'
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'upower: Battery API'
             'firefox-i18n: for multilanguage support')
-options=('!emptydirs' '!makeflags')
 screenshot="http://img864.imageshack.us/img864/5116/firefoxm.png"
 provides=("firefox=${pkgver}" "kmozillahelper")
 conflicts=('kmozillahelper')
@@ -75,10 +74,10 @@ source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgve
 )
 sha1sums=('2b73cfc996861fe895ad7564d485bf9e35190767'
           'SKIP'
-          '476d9ab20fe03bab2ee802b6f72a705ed2c300d0'
+          '7f4d6c9f715abf945c37328dedda728de5327220'
           '86d6c2fe4ec2b3072a132e2afbc0ac798fd51e8f'
           '693b54b9206ad854e4d75cbbf393029b77e82153'
-          'ca77a08b296f8673828898d91b20cc6dd8742c2f'
+          'b871102748f98865c4cf6a757e267419ab0e44b1'
           'be89e0c01fecb4c2dd429659e6ab549be4c32628'
           'ce48f8e5065319e191a7389539ec663dc8a919d7'
           'e480985ad1c4277e48a7d69c07258f0d7e97a977'
@@ -104,7 +103,7 @@ prepare() {
   patch -Np1 -i ../firefox-install-dir.patch
 
   # https://bugs.archlinux.org/task/41689
-  patch -Np1 -i ../rhbz-966424.patch
+  #patch -Np1 -i ../rhbz-966424.patch
 
   echo -n "$_google_api_key" > google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
@@ -133,6 +132,7 @@ prepare() {
   patch -Np1 -i "$srcdir/firefox-branded-icons.patch"
   patch -Np1 -i "$srcdir/ddg-branding.patch"
   patch -Np1 -i "$srcdir"/pgo-fix-missing-kdejs.patch
+  patch -Np1 -i "$srcdir"/firefox-gtk3-20.patch
 
   mkdir -vp "$srcdir/path"
 
@@ -181,9 +181,9 @@ build_firefox() {
   export SHELL=/bin/bash
 
   # Do PGO
-  #xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
-  #  make -f client.mk build MOZ_PGO=1
-  make -f client.mk build
+  xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+    make -f client.mk build MOZ_PGO=1
+  #make -f client.mk build
 }
 
 package() {
diff --git a/firefox-kde/mozconfig b/firefox-kde/mozconfig
index 6017d63..2b6f514 100644
--- a/firefox-kde/mozconfig
+++ b/firefox-kde/mozconfig
@@ -4,7 +4,11 @@ ac_add_options --prefix=/usr
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
+
+# Rust
 ac_add_options --enable-rust
+# Skia engine
+ac_add_options --enable-skia
 
 ac_add_options --enable-official-branding
 
@@ -35,8 +39,8 @@ ac_add_options --disable-crashreporter
 
 # PGO
 
-#mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff
+mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff
 STRIP_FLAGS="--strip-debug"
 
 # vim:set ft=sh:
diff --git a/firefox-kde/vendor.js b/firefox-kde/vendor.js
index 7d4a338..0354311 100644
--- a/firefox-kde/vendor.js
+++ b/firefox-kde/vendor.js
@@ -10,3 +10,6 @@ pref("browser.search.selectedEngine", "DuckDuckGo");
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
+
+// Default e10s support to be enabled
+pref("browser.tabs.remote.autostart", true);