updates

4 files changed, 102 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c39f11d7ee2..6d892b4a875b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Feb 26 02:10:15 UTC 2017
+# Mon Mar  6 18:16:54 UTC 2017
 pkgbase = thunderbird-beta-gtk3
 	pkgdesc = Standalone Mail/News reader - Bleeding edge version with optional PGO
-	pkgver = 52.0b3
+	pkgver = 52.0b4
 	pkgrel = 1
 	url = https://www.mozilla.org/thunderbird
 	install = thunderbird-beta-gtk3.install
@@ -35,13 +35,18 @@ pkgbase = thunderbird-beta-gtk3
 	depends = ttf-font
 	depends = icu
 	optdepends = libcanberra: for sound support
-	provides = thunderbird=52.0b3
+	provides = thunderbird=52.0b4
+	conflicts = thunderbird-beta
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/thunderbird/releases/52.0b3/source/thunderbird-52.0b3.source.tar.xz
+	source = https://launchpadlibrarian.net/308724185/thunderbird_52.0~b4+build1.orig.tar.bz2
+	source = fix-wifi-scanner.diff
+	source = firefox-gcc-6.0.patch
 	source = thunderbird-beta-gtk3.desktop
 	source = thunderbird-beta-gtk3-safe.desktop
-	sha512sums = f0c81e769c9de7d61d5f5a0e4cc7cf2187ac82a98defc8213a737afeb607996399a9da94caff89b73df60deaaebe8d62ea88736376c21eeacfa7b735354504fb
+	sha512sums = 5003e4f79bba891b7ad30ce30ca592289703ee174b8c5322975ef2078b48e4c4148454246649e98825f3d75d14dcd154ea467aec062590e8c82172a4e06b0e5e
+	sha512sums = 1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a
+	sha512sums = 1bb8887cfc12457a83045db559bbd13954a177100309b4f6c82a5f733675e83751bfecf501f505345f81fd2688fc5b02e113962cf0a0df27b29790f40cb9406b
 	sha512sums = fc83c23f67cc5d399bc655d2486936db3ab500bafe399a905a17a0b0f63ad9befb782fc9c07d467a65a80a00e3ce984700ec3cf60e4cb3e1b29b20954c6fa775
 	sha512sums = 3cf4194575041bbe344d6cd17e473eb78caf7e2e1aa8b1309151f7e4677c33571014ba6d7aba267398c3ba69c825c64363272b82b15f7dbb8ae5e3e825f439b7
 
diff --git a/PKGBUILD b/PKGBUILD
index cff183776955..c3b0bfe1d46d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Det <nimetonmaili g-mail>
 # Based on [extra]'s thunderbird
 
-# NOTE: Enable PGO on x86_64?: http://en.wikipedia.org/wiki/Profile-guided_optimization
-_pgo=0  # "1" to enable
-
 pkgname=thunderbird-beta-gtk3
-pkgver=52.0b3
-_major=${pkgver/rc*}
+pkgver=52.0b4
+_major=${pkgver/[br]*}
+_pkgver=52.0
+_beta=b4
 _build=${pkgver/*rc}
 pkgrel=1
 pkgdesc="Standalone Mail/News reader - Bleeding edge version with optional PGO"
@@ -19,14 +18,19 @@ depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'gconf'
              'libpulse' 'inetutils')
 optdepends=('libcanberra: for sound support')
-[[ $_pgo = 1 ]] && makedepends+=('imake' 'xorg-server-xvfb')
 provides=("thunderbird=$pkgver")
+conflicts=("thunderbird-beta")
 install=$pkgname.install
 options=('!emptydirs' '!makeflags')
-source=("https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz"
-        "$pkgname.desktop"
-        "$pkgname-safe.desktop")
-sha512sums=('f0c81e769c9de7d61d5f5a0e4cc7cf2187ac82a98defc8213a737afeb607996399a9da94caff89b73df60deaaebe8d62ea88736376c21eeacfa7b735354504fb'
+source=(https://launchpadlibrarian.net/308724185/thunderbird_${_pkgver}~${_beta}+build1.orig.tar.bz2
+#source=("https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz"
+        fix-wifi-scanner.diff
+        firefox-gcc-6.0.patch
+        $pkgname.desktop
+        $pkgname-safe.desktop)
+sha512sums=('5003e4f79bba891b7ad30ce30ca592289703ee174b8c5322975ef2078b48e4c4148454246649e98825f3d75d14dcd154ea467aec062590e8c82172a4e06b0e5e'
+            '1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a'
+            '1bb8887cfc12457a83045db559bbd13954a177100309b4f6c82a5f733675e83751bfecf501f505345f81fd2688fc5b02e113962cf0a0df27b29790f40cb9406b'
             'fc83c23f67cc5d399bc655d2486936db3ab500bafe399a905a17a0b0f63ad9befb782fc9c07d467a65a80a00e3ce984700ec3cf60e4cb3e1b29b20954c6fa775'
             '3cf4194575041bbe344d6cd17e473eb78caf7e2e1aa8b1309151f7e4677c33571014ba6d7aba267398c3ba69c825c64363272b82b15f7dbb8ae5e3e825f439b7')
 # RC
@@ -47,69 +51,27 @@ _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 
 prepare() {
+# Link Python2
+mkdir -p path
+ln -sf /usr/bin/python2 path/python
 
- echo -n "$_google_api_key" >google-api-key
-  echo -n "$_mozilla_api_key" >mozilla-api-key
-  # PGO?
-  if [[ $CARCH = x86_64 ]] && [[ $_pgo = 1 ]]; then
-     cat >.mozconfig <<END
-mk_add_options MOZ_CO_PROJECT=mail
-ac_add_options --enable-application=mail
-ac_add_options --enable-gold
-ac_add_options --enable-pie
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
+cd thunderbird-${_pkgver}~${_beta}+build1
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  msg2 "fix-wifi-scanner.diff"
+  patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
 
-# Keys
-ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key
-ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
+  # Required for GCC 6
+  msg2 "firefox-gcc-6.0.patch"
+  patch -d mozilla -Np1 < ../firefox-gcc-6.0.patch
 
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-icu
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-default-toolkit=cairo-gtk3
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --disable-gstreamer
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug-symbols
+echo -n "$_google_api_key" >google-api-key
+echo -n "$_mozilla_api_key" >mozilla-api-key
 
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
-
-STRIP_FLAGS="--strip-debug"
-END
-  else
-      cat >.mozconfig <<END
+#mozconfig
+cat >.mozconfig <<END
 ac_add_options --enable-application=mail
-
 ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
+ac_add_options --libdir=/opt/
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
@@ -134,7 +96,7 @@ ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
+#ac_add_options --with-pthreads
 
 # Features
 ac_add_options --enable-default-toolkit=cairo-gtk3
@@ -142,50 +104,42 @@ ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --enable-calendar
+ac_add_options --disable-tests ###
+ac_add_options --disable-debug-symbols ###
+ac_add_options --enable-rust 
+#export CC=clang
+#export CXX=clang++
 STRIP_FLAGS="--strip-debug"
 END
-  fi
-
 }
 
 build() {
-  cd thunderbird-$pkgver
-    export PYTHON="/usr/bin/python2"
+  cd thunderbird-${_pkgver}~${_beta}+build1
   # Build flags
    # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
   # Hardening
   LDFLAGS+=" -Wl,-z,now"
+  #CFLAGS+="-std=c11"
 
   # GCC 6
   CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-  cp ../.mozconfig .
-  if [[ $CARCH = x86_64 ]] && [[ $_pgo = 1 ]]; then
-    # Set up PGO
-    msg2 "Running Xvfb.."
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
-    # Build
-    msg2 "Running make.."
-    if ! make -f client.mk build MOZ_PGO=1; then
-      kill $!
-      return 1
-    fi
-
-    # Kill leftovers
-    kill $! || true
-  else
+
+  # Export build path
+  export PATH="$srcdir/path:$PATH"
+  #export PYTHON="/usr/bin/python2"
+  
+  # Build
     msg2 "Running make.."
-    make -f client.mk build 
-  fi
+    make -f client.mk clobber
+    make -f client.mk build
 }
 
 package() {
-  cd thunderbird-$pkgver
+  cd thunderbird-${_pkgver}~${_beta}+build1
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
-  _vendorjs="$pkgdir/usr/lib/thunderbird-52.0/defaults/preferences/vendor.js"
+  _vendorjs="$pkgdir/opt/thunderbird-$_major/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);
@@ -208,9 +162,9 @@ END
   install -Dm644 ../thunderbird-beta-safe.desktop \
     "$pkgdir/usr/share/applications/thunderbird-beta-safe.desktop"
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/usr/lib/thunderbird-52.0/dictionaries
-  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/thunderbird-52.0/dictionaries"
-  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/thunderbird-52.0/hyphenation"
+  rm -r "$pkgdir"/opt/thunderbird-$_major/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/opt/thunderbird-$_major/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/thunderbird-$_major/hyphenation"
 
   # Install a wrapper to avoid confusion about binary path
   install -Dm755 /dev/stdin "$pkgdir/usr/bin/thunderbird-beta" <<END
diff --git a/firefox-gcc-6.0.patch b/firefox-gcc-6.0.patch
new file mode 100644
index 000000000000..0a74d3616e3f
--- /dev/null
+++ b/firefox-gcc-6.0.patch
@@ -0,0 +1,26 @@
+diff -up firefox-44.0/nsprpub/config/make-system-wrappers.pl.back firefox-44.0/nsprpub/config/make-system-wrappers.pl
+--- firefox-44.0/nsprpub/config/make-system-wrappers.pl.back	2016-01-24 00:23:49.000000000 +0100
++++ firefox-44.0/nsprpub/config/make-system-wrappers.pl	2016-02-02 14:58:45.064112655 +0100
+@@ -19,7 +19,9 @@ while (<STDIN>) {
+     open OUT, ">$output_dir/$_";
+     print OUT "#pragma GCC system_header\n";  # suppress include_next warning
+     print OUT "#pragma GCC visibility push(default)\n";
++    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
+     print OUT "#include_next \<$_\>\n";
++    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\n";
+     print OUT "#pragma GCC visibility pop\n";
+     close OUT;
+ }
+diff -up firefox-44.0/mozglue/build/arm.cpp.old firefox-44.0/mozglue/build/arm.cpp
+--- firefox-44.0/mozglue/build/arm.cpp.old	2016-02-03 10:07:29.879526500 +0100
++++ firefox-44.0/mozglue/build/arm.cpp	2016-02-03 10:08:11.062697517 +0100
+@@ -104,7 +104,9 @@ check_neon(void)
+ 
+ #  elif defined(__linux__) || defined(ANDROID)
+ #    include <stdio.h>
++#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ #    include <stdlib.h>
++#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ #    include <string.h>
+ 
+ enum{
diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff
new file mode 100644
index 000000000000..f8fdd6c42142
--- /dev/null
+++ b/fix-wifi-scanner.diff
@@ -0,0 +1,16 @@
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
+index 182553e18fa6e104..6fa0a0b023d3e45f 100644
+--- c/netwerk/wifi/nsWifiScannerDBus.cpp
++++ i/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "";
++    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }