Update to 46.0b6

3 files changed, 73 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e00159a8ab21..37e672cdd724 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Mar  6 19:30:35 UTC 2016
+# Fri Apr  1 10:43:41 UTC 2016
 pkgbase = firefox-beta
 	pkgdesc = Standalone web browser from mozilla.org - Beta (build from source)
-	pkgver = 45.0rc2
+	pkgver = 46.0b6
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	install = firefox-beta.install
@@ -43,22 +43,24 @@ pkgbase = firefox-beta
 	depends = ttf-font
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = upower: Battery API
-	provides = firefox=45.0rc2
+	provides = firefox=46.0b6
 	conflicts = firefox-beta-bin
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/45.0-candidates/build2/source/firefox-45.0.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/46.0b6-candidates/build1/source/firefox-46.0b6.source.tar.xz
 	source = mozconfig
 	source = firefox-beta.desktop
 	source = firefox-install-dir.patch
 	source = vendor.js
 	source = firefox-fixed-loading-icon.png
-	sha512sums = d75c7bf1f70183b7237b77b99845a6b7daa41014ee75a7977575af345b343a8053dbb993337d24933df23f9600db7c0e936543e57f3f039430ca5c252fe3c4b5
+	source = no-libnotify.patch
+	sha512sums = b4f53fd59014f85f8c2ff0d115873a4ee4d75df0511168fe8489ed2ce20c178f218cd91f9d0b50d06b32eb482b4b9ef4a6e13996ea401646b626a22b0d190dc4
 	sha512sums = c72792b505031431282a3777bce6d3ee98fe68cc0faf8cadd84afe2b42921da52b9d8ad94e3324f0d0a09e8e298e3bcd2b527b08e92e2a0140434d7767efc422
 	sha512sums = dd9a563d6ad772ba440a45bbd0ee27943b319edcb785951e62cd4aefe0d33ded2acf9b63a2b15cec89ee184687c68a8d3a1cc06ec98f9a9251602f063fbaef14
 	sha512sums = 266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd
 	sha512sums = d927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7
 	sha512sums = d51119170cc8fb99c50610a8e5e94f38a31722c1c1a2260ca32d8e376732e30c8e1deac7d8c599348892e783fb4c75ce8c38bbd238282b0c9da21608d902ba28
+	sha512sums = 702dd8875c4782719e549a217695b42e77319f48e62579ffb691a7c012a55e0bbd450146a454c85b4df5d1ea59e2794674abe12a21824b51eff9c06d37fc1a12
 
 pkgname = firefox-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 3fd00580f861..84be91f8b62c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
-# Maintainer: argymeg <argymeg at gmail dot com>
+# Maintainer: The_Loko <juliolokooo at gmail dot com>
+# Contributor: argymeg <argymeg at gmail dot com>
 
 pkgname=firefox-beta
-pkgver=45.0rc2
-_realpkgver=45.0
-_rcbuild=2
+pkgver=46.0b6
+_realpkgver=46.0b6
+_rcbuild=1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org - Beta (build from source)"
 arch=('i686' 'x86_64')
@@ -17,7 +18,7 @@ makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'upower: Battery API')
 provides=("firefox=$pkgver")
-conflicts=("firefox-beta-bin")            
+conflicts=("firefox-beta-bin")
 install=firefox-beta.install
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/$_realpkgver-candidates/build$_rcbuild/source/firefox-$_realpkgver.source.tar.xz
@@ -25,13 +26,15 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/$_realpkgver-
         firefox-beta.desktop
         firefox-install-dir.patch
         vendor.js
-        firefox-fixed-loading-icon.png)
-sha512sums=('d75c7bf1f70183b7237b77b99845a6b7daa41014ee75a7977575af345b343a8053dbb993337d24933df23f9600db7c0e936543e57f3f039430ca5c252fe3c4b5'
+        firefox-fixed-loading-icon.png
+        no-libnotify.patch)
+sha512sums=('b4f53fd59014f85f8c2ff0d115873a4ee4d75df0511168fe8489ed2ce20c178f218cd91f9d0b50d06b32eb482b4b9ef4a6e13996ea401646b626a22b0d190dc4'
             'c72792b505031431282a3777bce6d3ee98fe68cc0faf8cadd84afe2b42921da52b9d8ad94e3324f0d0a09e8e298e3bcd2b527b08e92e2a0140434d7767efc422'
             'dd9a563d6ad772ba440a45bbd0ee27943b319edcb785951e62cd4aefe0d33ded2acf9b63a2b15cec89ee184687c68a8d3a1cc06ec98f9a9251602f063fbaef14'
             '266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd'
             'd927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7'
-            'd51119170cc8fb99c50610a8e5e94f38a31722c1c1a2260ca32d8e376732e30c8e1deac7d8c599348892e783fb4c75ce8c38bbd238282b0c9da21608d902ba28')
+            'd51119170cc8fb99c50610a8e5e94f38a31722c1c1a2260ca32d8e376732e30c8e1deac7d8c599348892e783fb4c75ce8c38bbd238282b0c9da21608d902ba28'
+            '702dd8875c4782719e549a217695b42e77319f48e62579ffb691a7c012a55e0bbd450146a454c85b4df5d1ea59e2794674abe12a21824b51eff9c06d37fc1a12')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -53,7 +56,11 @@ prepare() {
 
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
-  
+
+  # Notifications with libnotify are broken
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1236150
+  patch -Np1 -i ../no-libnotify.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
diff --git a/no-libnotify.patch b/no-libnotify.patch
new file mode 100644
index 000000000000..a01ccb429442
--- /dev/null
+++ b/no-libnotify.patch
@@ -0,0 +1,50 @@
+diff --git i/toolkit/system/gnome/moz.build w/toolkit/system/gnome/moz.build
+index 0ecde07..206d6eb 100644
+--- i/toolkit/system/gnome/moz.build
++++ w/toolkit/system/gnome/moz.build
+@@ -5,9 +5,7 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ SOURCES += [
+-    'nsAlertsIconListener.cpp',
+     'nsGnomeModule.cpp',
+-    'nsSystemAlertsService.cpp',
+ ]
+
+ if CONFIG['MOZ_ENABLE_GCONF']:
+diff --git i/toolkit/system/gnome/nsGnomeModule.cpp w/toolkit/system/gnome/nsGnomeModule.cpp
+index 6ecebcc..2f193a3 100644
+--- i/toolkit/system/gnome/nsGnomeModule.cpp
++++ w/toolkit/system/gnome/nsGnomeModule.cpp
+@@ -20,8 +20,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
+ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
+ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPackageKitService, Init)
+ #endif
+-#include "nsSystemAlertsService.h"
+-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
+
+ #ifdef MOZ_ENABLE_GCONF
+ NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
+@@ -31,7 +29,6 @@ NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
+ NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
+ NS_DEFINE_NAMED_CID(NS_PACKAGEKITSERVICE_CID);
+ #endif
+-NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
+
+ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
+ #ifdef MOZ_ENABLE_GCONF
+@@ -42,7 +39,6 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
+   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
+   { &kNS_PACKAGEKITSERVICE_CID, false, nullptr, nsPackageKitServiceConstructor },
+ #endif
+-  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
+   { nullptr }
+ };
+
+@@ -55,7 +51,6 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
+   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
+   { NS_PACKAGEKITSERVICE_CONTRACTID, &kNS_PACKAGEKITSERVICE_CID },
+ #endif
+-  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
+   { nullptr }
+ };