tune firefox a little

firefox-kde/PKGBUILD

@@ -1,20 +1,22 @@
 pkgname=firefox-kde
 pkgver=52.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('x86_64')
 license=('MPL' 'GPL' 'LGPL')
 url="https://www.mozilla.org/firefox/"
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
-         'dbus-glib' 'alsa-lib' 'ffmpeg' 'libvpx' 'libevent' 'nss>=3.28.3' 'hunspell'
-         'sqlite3>=3.17.0' # 'icu>=58.1'
-         'kio' 'knotifications' 'nspr>=4.13.1' 'libffi>=3.0.9' 'kwindowsystem' 'ki18n')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'ffmpeg' 'flac'
-             'libpulse' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13' 'rust'
-             'cmake' 'extra-cmake-modules' 'cargo')
+depends=(gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
+         libvpx libevent nss hunspell
+         "sqlite3>=3.17.0" # icu>=58.1
+         kio knotifications kwindowsystem ki18n)
+makedepends=(unzip zip diffutils python2 yasm mesa imake libpulse inetutils xorg-server-xvfb
+             autoconf2.13 cargo
+             cmake extra-cmake-modules)
 optdepends=('networkmanager: Location detection via available WiFi networks'
+            'libnotify: Notification integration'
             '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')
@@ -71,10 +73,10 @@ source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgve
 )
 sha1sums=('991aea082084438e08f2da59bbebf47b8e9b1741'
           'SKIP'
-          'a1657d677eca90eeef4c7384c1375b8279845254'
+          '5570de14d3146c152c8d29ebf0d540eafe0a08f6'
           '1a8ecc6d2cfd97791d8182882a74929f2a7289e9'
           '693b54b9206ad854e4d75cbbf393029b77e82153'
-          '6e11169300c266d7058725697e241fc021e81a1b'
+          '05b3a893e422ff579663c351f275f71010fa9dca'
           'ce48f8e5065319e191a7389539ec663dc8a919d7'
           'e480985ad1c4277e48a7d69c07258f0d7e97a977'
           '9ed341bb7b147da7ebba420110dcf5a5a8e8d887'
@@ -101,6 +103,7 @@ _google_api_key=AIzaSyDjyg8EmaRUIsewzdjZXFZ0O8N5ARDUDGU
 # more information.
 _mozilla_api_key=bf05f841-e0bd-4644-81f5-3c132755f2e9
 
+
 prepare() {
   cd ${srcdir}/firefox-${pkgver}/
 
@@ -182,7 +185,7 @@ build_firefox() {
   export SHELL=/bin/bash
 
   # Do PGO
-  #xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+  #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
   #  make -f client.mk build MOZ_PGO=1
   make -f client.mk build
 }
@@ -202,8 +205,8 @@ package() {
   install -Dm644 ../kde.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/kde.js"
 
   for i in 16 22 24 32 48 256; do
-      install -Dm644 browser/branding/official/default$i.png \
-        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
+    install -Dm644 browser/branding/official/default$i.png \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
   done
   install -Dm644 browser/branding/official/content/icon64.png \
     "$pkgdir/usr/share/icons/hicolor/64x64/apps/firefox.png"
@@ -217,15 +220,20 @@ package() {
   install -Dm644 ../firefox.desktop \
     "$pkgdir/usr/share/applications/firefox.desktop"
 
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/firefox/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
-
-  # We don't want the development stuff
   rm -r "$pkgdir"/usr/{include,lib/firefox-devel,share/idl}
+  # Use system-provided dictionaries
+  rm -r "$pkgdir"/usr/lib/firefox/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
 
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
+  # Install a wrapper to avoid confusion about binary path
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/firefox" <<END
+#!/bin/sh
+exec /usr/lib/firefox/firefox "\$@"
+END
+
+  # Replace duplicate binary with wrapper
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  ln -srf "$pkgdir/usr/bin/firefox" \
+    "$pkgdir/usr/lib/firefox/firefox-bin"
 }

firefox-kde/mozconfig

@@ -11,18 +11,13 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
+ac_add_options --enable-gold
 ac_add_options --enable-pie
-ac_add_options --enable-jemalloc
-ac_add_options --disable-maintenance-service
-
-# Backported features
 ac_add_options --enable-rust
-ac_add_options --enable-skia
 
 # Release branding
-ac_add_options --enable-application=browser
 ac_add_options --enable-official-branding
-ac_add_options --enable-verify-mar
+ac_add_options --enable-update-channel=release
 # gtk2 avoid crash on select file to open
 ac_add_options --enable-default-toolkit=cairo-gtk2
 MOZ_ADDON_SIGNING=1
@@ -47,6 +42,7 @@ ac_add_options --disable-libproxy
 
 # Features
 ac_add_options --enable-startup-notification
+ac_add_options --enable-alsa
 ac_add_options --disable-gconf
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter

firefox-kde/vendor.js

@@ -13,6 +13,3 @@ pref("extensions.shownSelectionUI", true);
 
 // Default e10s support to be enabled
 pref("browser.tabs.remote.autostart", true);
-
-// Skip builtinCert check for addon update request
-pref("extensions.update.requireBuiltInCerts", false);