52.0

4 files changed, 9 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 831c240e57e3..16127ba3ccb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb  6 03:46:02 UTC 2017
+# Mon Mar 20 03:08:06 UTC 2017
 pkgbase = waterfox-git
 	pkgdesc = 64-Bit optimized Firefox fork, no data collection, allows unsigned extensions
-	pkgver = 51.0.1+55eacc009b
+	pkgver = 52.0.1+3caa37ba5c
 	pkgrel = 1
 	url = https://www.waterfoxproject.org/
 	install = waterfox.install
@@ -44,7 +44,7 @@ pkgbase = waterfox-git
 	depends = hunspell
 	depends = sqlite
 	depends = ttf-font
-	provides = waterfox=51.0.1+55eacc009b
+	provides = waterfox=52.0.1+3caa37ba5c
 	conflicts = waterfox waterfox-bin
 	options = !emptydirs
 	options = !makeflags
@@ -52,15 +52,13 @@ pkgbase = waterfox-git
 	source = mozconfig
 	source = waterfox.desktop
 	source = firefox-install-dir.patch
-	source = unused_missing.patch
 	source = rhbz-966424.patch
 	source = clang-profile.patch
 	source = vendor.js
 	sha512sums = SKIP
-	sha512sums = 2372bfae48cd7fa6162e94c9cd0689797d305ed159e8e38491022c22519b971a4ffcc8ee23c1f6473f0926b51029ca39e61a315f24f37a7813a5e6d3b55088cc
+	sha512sums = b6b9dc4bc6861de7bd6ecf8b28c6ee1ac096542020a1a0aecefee9761eb8f67e596278696d6f23659347f0acabf08dffaccf829afcaa544bd3447899ec8c549d
 	sha512sums = 93937770fa66d63f69c6283ed1f19ac83b9c9c4f5cc34e79d11ac31676462be9f7f37bcd35e785ceb8c7d234a09236d1f26b21e551b622854076fb21bcda44d3
 	sha512sums = 266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd
-	sha512sums = 87225692ee6e643cd9d291608174c68e25b00818086d641847111924c457414faadf3ed6d10fddafd5bd4bc54eeea2055b7136ffeabadec8644a60e819e9356f
 	sha512sums = 0d69183bbfdceee89b3059c913c95e316c03b14b6b302675e16a03c32b74f30b7058344d8c6f2f5a4cfd33db9c7e6f52bf0f52d1c047a224b75e1745d0711c07
 	sha512sums = c17dceeefd58447917e27a33d6688a28158b919c41867909b11478d8be7f155b61ae8fda2e0381c14210583f1c6ecf678dfb469c4826f34e24b8ee0b96a8aaa5
 	sha512sums = d927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7
diff --git a/PKGBUILD b/PKGBUILD
index 6a64e6065a17..38f2cf5f8fc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: <jnbek1972 at gmail dot com>
 # Contributor: <raku at rakutiki.tv>
 pkgname=waterfox-git
-pkgver=51.0.1+55eacc009b
+pkgver=52.0.1+3caa37ba5c
 _realpkgver=49.0b10
 _rcbuild=1
 pkgrel=1
@@ -24,19 +24,16 @@ source=(git://github.com/MrAlex94/Waterfox
         mozconfig
         waterfox.desktop
         firefox-install-dir.patch
-        unused_missing.patch
         rhbz-966424.patch
         clang-profile.patch
         vendor.js)
 sha512sums=('SKIP'
-            '2372bfae48cd7fa6162e94c9cd0689797d305ed159e8e38491022c22519b971a4ffcc8ee23c1f6473f0926b51029ca39e61a315f24f37a7813a5e6d3b55088cc'
+            'b6b9dc4bc6861de7bd6ecf8b28c6ee1ac096542020a1a0aecefee9761eb8f67e596278696d6f23659347f0acabf08dffaccf829afcaa544bd3447899ec8c549d'
             '93937770fa66d63f69c6283ed1f19ac83b9c9c4f5cc34e79d11ac31676462be9f7f37bcd35e785ceb8c7d234a09236d1f26b21e551b622854076fb21bcda44d3'
             '266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd'
-            '87225692ee6e643cd9d291608174c68e25b00818086d641847111924c457414faadf3ed6d10fddafd5bd4bc54eeea2055b7136ffeabadec8644a60e819e9356f'
             '0d69183bbfdceee89b3059c913c95e316c03b14b6b302675e16a03c32b74f30b7058344d8c6f2f5a4cfd33db9c7e6f52bf0f52d1c047a224b75e1745d0711c07'
             'c17dceeefd58447917e27a33d6688a28158b919c41867909b11478d8be7f155b61ae8fda2e0381c14210583f1c6ecf678dfb469c4826f34e24b8ee0b96a8aaa5'
             'd927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7')
-            
 _CORES=1
 
 # don't compress the package - we're just going to uncompress during install in a moment
@@ -64,9 +61,6 @@ prepare() {
   # alter the install dir
   patch -Np1 -i ../firefox-install-dir.patch
   
-  # missing files
-  patch -Np1 -i ../unused_missing.patch
-  
   # fix addon update issue - happens in arch and redhat, at the least
   patch -Np0 -i ../rhbz-966424.patch
   
diff --git a/mozconfig b/mozconfig
index df57029e6d42..40d499a89b14 100644
--- a/mozconfig
+++ b/mozconfig
@@ -24,7 +24,7 @@ ac_add_options --enable-release
 ac_add_options --enable-application=browser
 ac_add_options --with-app-name=waterfox
 ac_add_options --with-app-basename=Waterfox
-ac_add_options --with-branding=browser/branding/waterfox
+ac_add_options --with-branding=browser/branding/official
 ac_add_options --with-distribution-id=org.Waterfoxproject
 
 ac_add_options --enable-startup-notification
@@ -61,11 +61,12 @@ ac_add_options --disable-js-shell
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-updater
 ac_add_options --disable-verify-mar
-ac_add_options --disable-websms-backend
 ac_add_options --disable-webspeech
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-webrtc
+ac_add_options --disable-tests
 ac_add_options --disable-gamepad
+ac_add_options --disable-elf-hack
 ac_add_options --disable-mobile-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
diff --git a/unused_missing.patch b/unused_missing.patch
deleted file mode 100644
index 06cae3a7627c..000000000000
--- a/unused_missing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/mfbt/Unused.cpp b/mfbt/Unused.cpp
-new file mode 100644
-index 0000000000..053a0c3d47
---- /dev/null
-+++ b/mfbt/Unused.cpp
-@@ -0,0 +1,13 @@
-+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "mozilla/Unused.h"
-+
-+namespace mozilla {
-+
-+const unused_t Unused = unused_t();
-+
-+} // namespace mozilla
-diff --git a/mfbt/Unused.h b/mfbt/Unused.h
-new file mode 100644
-index 0000000000..e693e32ac7
---- /dev/null
-+++ b/mfbt/Unused.h
-@@ -0,0 +1,38 @@
-+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef mozilla_unused_h
-+#define mozilla_unused_h
-+
-+#include "mozilla/Types.h"
-+
-+#ifdef __cplusplus
-+
-+namespace mozilla {
-+
-+//
-+// Suppress GCC warnings about unused return values with
-+//   Unused << SomeFuncDeclaredWarnUnusedReturnValue();
-+//
-+struct unused_t
-+{
-+  template<typename T>
-+  inline void
-+  operator<<(const T& /*unused*/) const {}
-+};
-+
-+extern MFBT_DATA const unused_t Unused;
-+
-+} // namespace mozilla
-+
-+#endif // __cplusplus
-+
-+// An alternative to mozilla::Unused for use in (a) C code and (b) code where
-+// linking with unused.o is difficult.
-+#define MOZ_UNUSED(expr) \
-+  do { if (expr) { (void)0; } } while (0)
-+
-+#endif // mozilla_unused_h