bump - no rust, no stylo for now

10 files changed, 12 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae43bf0514ae..7ab54b64b7a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Apr  1 03:59:41 UTC 2019
+# Sun Apr 14 20:48:08 UTC 2019
 pkgbase = waterfox-git
 	pkgdesc = 64-Bit optimized Firefox fork, no data collection, allows unsigned extensions
-	pkgver = 56.2.8+74fd7c3a2b50
+	pkgver = 56.2.8+eeb3b0b1fd0e
 	pkgrel = 1
 	url = https://www.waterfoxproject.org/
 	install = waterfox.install
@@ -20,7 +20,6 @@ pkgbase = waterfox-git
 	makedepends = xorg-server-xvfb
 	makedepends = libpulse
 	makedepends = inetutils
-	makedepends = rust<=1:1.32.0-2
 	makedepends = autoconf2.13
 	makedepends = clang
 	makedepends = llvm
@@ -42,7 +41,7 @@ pkgbase = waterfox-git
 	depends = hunspell
 	depends = sqlite
 	depends = ttf-font
-	provides = waterfox=56.2.8+74fd7c3a2b50
+	provides = waterfox=56.2.8+eeb3b0b1fd0e
 	conflicts = waterfox
 	conflicts = waterfox-bin
 	options = !emptydirs
@@ -54,24 +53,12 @@ pkgbase = waterfox-git
 	source = firefox-install-dir.patch
 	source = clang-profile.patch
 	source = vendor.js
-	source = default16.png
-	source = default22.png
-	source = default24.png
-	source = default256.png
-	source = default32.png
-	source = default48.png
 	sha512sums = SKIP
-	sha512sums = 4b8edfb97146237721a789ef8a58efc7e2e3e107ed507681891bcae6292669186d58c263e5cf7967e933ed42946261cec234d489805f26eb865afd433f3b23e8
+	sha512sums = ab4db1561a7b3c0c036879fdb9497f2d0df7157c92591b6303af05afd9e53dcbc388038ecc8fd647c56cb82772eb56a55f7c66564468e705cde3193e03e5a246
 	sha512sums = 93937770fa66d63f69c6283ed1f19ac83b9c9c4f5cc34e79d11ac31676462be9f7f37bcd35e785ceb8c7d234a09236d1f26b21e551b622854076fb21bcda44d3
 	sha512sums = 266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd
 	sha512sums = 01f3ada0d121bc8c5a698356aae5f8d5374b3bd5a1023f02ebc9ec6600b4652f4ab7d7ef339df268bfe5054d2a58320d91e79af31e6609b74ba924aef62116e0
 	sha512sums = d927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7
-	sha512sums = 625ea754e70793d80da38878e345fefce579416d9daa04439f1c13885aa2a9620307010fe4cf09460677fe2918bd32b62f4ad52b24bab78d82b4e6487cbe5347
-	sha512sums = 02e844d1a97dd756d185f7258a6c18d52cf7433f3366e147e5ef0cc0b6c023d177b3021521403237162782993d2a27d4459fa5d383e7bf8a034e7f5836351f9d
-	sha512sums = a038a805a41e55c89cd601a07e6ae756e7017f4eb9eb65525f6cb9d86e2f94bda559961b6ab1e66a0dfa7436db6f1da166c2fc84bfc6cad5fcaec6a82ffb0a96
-	sha512sums = 33afbb1ec2eb62412965bc698bdf1cc3c177645c51369397e92bdba7a7891709ccf1f3d2f9e234866e7c452a3ae8bfe289e0cbfd6047ec5efa1c7c568b9e7888
-	sha512sums = 64f9e8b812d00d39239f9aa00aa51c937113fa3833652d2da318ae8c9627ac7b0372bffc2c1c0a2c1ea69ec97a3dc11fafee58175cbdab503aef299543f3fd90
-	sha512sums = e5000a4e25bf6a15eae99a1e9b3cc4f9a1712b7aacc783eb0c25b20d04d8bbc9e9e80e95ce8c709aba595f699aa2dc4ba6104ea0f0375b00ff2cc2353d93c8f1
 
 pkgname = waterfox-git
 
diff --git a/PKGBUILD b/PKGBUILD
index eed00b235487..0150a2862e6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: <jnbek1972 at gmail dot com>
 # Contributor: <raku at rakutiki.tv>
 pkgname=waterfox-git
-pkgver=56.2.8+74fd7c3a2b50
+pkgver=56.2.8+eeb3b0b1fd0e
 pkgrel=1
 pkgdesc="64-Bit optimized Firefox fork, no data collection, allows unsigned extensions"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('gtk2' 'gtk3' 'mozilla-common' 'libxt' 'startup-notification'
          'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils' 'hicolor-icon-theme'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
-             'xorg-server-xvfb' 'libpulse' 'inetutils' 'rust<=1:1.32.0-2' 'autoconf2.13' 'clang' 'llvm' 'cargo')
+             'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'clang' 'llvm' 'cargo')
 provides=("waterfox=$pkgver")
 conflicts=('waterfox' 'waterfox-bin')
 install=waterfox.install
@@ -23,25 +23,13 @@ source=(git://github.com/MrAlex94/Waterfox
         waterfox.desktop
         firefox-install-dir.patch
         clang-profile.patch
-        vendor.js
-        default16.png
-		default22.png
-		default24.png
-		default256.png
-		default32.png
-		default48.png)
+        vendor.js)
 sha512sums=('SKIP'
-            '4b8edfb97146237721a789ef8a58efc7e2e3e107ed507681891bcae6292669186d58c263e5cf7967e933ed42946261cec234d489805f26eb865afd433f3b23e8'
+            'ab4db1561a7b3c0c036879fdb9497f2d0df7157c92591b6303af05afd9e53dcbc388038ecc8fd647c56cb82772eb56a55f7c66564468e705cde3193e03e5a246'
             '93937770fa66d63f69c6283ed1f19ac83b9c9c4f5cc34e79d11ac31676462be9f7f37bcd35e785ceb8c7d234a09236d1f26b21e551b622854076fb21bcda44d3'
             '266989b0c4a37254a40836a6193284a186230b48716907e4d249d73616f58382b258c41baa8c1ffc98d405f77bfafcd3438f749edcf391c7bd22185399adf4bd'
             '01f3ada0d121bc8c5a698356aae5f8d5374b3bd5a1023f02ebc9ec6600b4652f4ab7d7ef339df268bfe5054d2a58320d91e79af31e6609b74ba924aef62116e0'
-            'd927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7'
-            '625ea754e70793d80da38878e345fefce579416d9daa04439f1c13885aa2a9620307010fe4cf09460677fe2918bd32b62f4ad52b24bab78d82b4e6487cbe5347'
-            '02e844d1a97dd756d185f7258a6c18d52cf7433f3366e147e5ef0cc0b6c023d177b3021521403237162782993d2a27d4459fa5d383e7bf8a034e7f5836351f9d'
-            'a038a805a41e55c89cd601a07e6ae756e7017f4eb9eb65525f6cb9d86e2f94bda559961b6ab1e66a0dfa7436db6f1da166c2fc84bfc6cad5fcaec6a82ffb0a96'
-            '33afbb1ec2eb62412965bc698bdf1cc3c177645c51369397e92bdba7a7891709ccf1f3d2f9e234866e7c452a3ae8bfe289e0cbfd6047ec5efa1c7c568b9e7888'
-            '64f9e8b812d00d39239f9aa00aa51c937113fa3833652d2da318ae8c9627ac7b0372bffc2c1c0a2c1ea69ec97a3dc11fafee58175cbdab503aef299543f3fd90'
-            'e5000a4e25bf6a15eae99a1e9b3cc4f9a1712b7aacc783eb0c25b20d04d8bbc9e9e80e95ce8c709aba595f699aa2dc4ba6104ea0f0375b00ff2cc2353d93c8f1')
+            'd927e5e882115c780aa0d45034cb1652eaa191d95c15013639f9172ae734245caae070018465d73fdf86a01601d08c9e65f28468621422d799fe8451e6175cb7')
             
 # don't compress the package - we're just going to uncompress during install in a moment
 PKGEXT='.pkg.tar'   
@@ -75,19 +63,10 @@ prepare() {
 	sed -i 's/disable-tests/enable-tests/g' .mozconfig
   fi
   
-  # fix missing icons
-  for i in 16 22 24 32 48 256; do
-	  if [ ! -f "${srcdir}/Waterfox/browser/branding/unofficial/default$i.png" ]; then
-		cp "${srcdir}/default$i.png" "${srcdir}/Waterfox/browser/branding/unofficial/default$i.png"
-	  fi
-  done
-  
   mkdir -p "$srcdir/path"
 }
 
 build() {
-  msg2 'If you do not wish to use rust 1.32 or lower, disable it in your mozconfig first!'
-	
   cd Waterfox
 
   export PATH="$srcdir/path:$PATH"
diff --git a/default16.png b/default16.png
deleted file mode 100644
index 5a20756e462e..000000000000
--- a/default16.png
+++ /dev/null
diff --git a/default22.png b/default22.png
deleted file mode 100644
index 352b54379a71..000000000000
--- a/default22.png
+++ /dev/null
diff --git a/default24.png b/default24.png
deleted file mode 100644
index c72287bc5fa5..000000000000
--- a/default24.png
+++ /dev/null
diff --git a/default256.png b/default256.png
deleted file mode 100644
index 638f01bc81a2..000000000000
--- a/default256.png
+++ /dev/null
diff --git a/default32.png b/default32.png
deleted file mode 100644
index df195b9c2485..000000000000
--- a/default32.png
+++ /dev/null
diff --git a/default48.png b/default48.png
deleted file mode 100644
index bccd2786787d..000000000000
--- a/default48.png
+++ /dev/null
diff --git a/mozconfig b/mozconfig
index 9d95f2a25ed5..1c82d6daa98e 100644
--- a/mozconfig
+++ b/mozconfig
@@ -23,7 +23,8 @@ ac_add_options --enable-hardening
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/opt
 
-ac_add_options --enable-rust-simd # on x86 requires SSE2
+# currently broken in rust 1.33
+ac_add_options --disable-rust-simd # on x86 requires SSE2
 
 ac_add_options --enable-release
 ac_add_options --enable-application=browser
@@ -62,6 +63,7 @@ ac_add_options --enable-system-pixman
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
 # Features
+ac_add_options --disable-stylo
 ac_add_options --disable-libproxy
 ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
@@ -80,6 +82,5 @@ ac_add_options --disable-debug
 ac_add_options --disable-debug-symbols
 ac_add_options --disable-profiling
 ac_add_options --disable-signmar
-ac_add_options --disable-stylo
 
 # vim:set ft=sh:
diff --git a/no-libnotify.patch b/no-libnotify.patch
deleted file mode 100644
index a01ccb429442..000000000000
--- a/no-libnotify.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 }
- };