56.2.1

2 files changed, 8 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1279da218fea..bed676d951c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon May 28 18:06:51 UTC 2018
+# Sun Jun 17 18:15:50 UTC 2018
 pkgbase = waterfox-kde
 	pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
-	pkgver = 56.2.0
+	pkgver = 56.2.1
 	pkgrel = 1
 	url = https://www.waterfoxproject.org/
 	arch = x86_64
@@ -45,12 +45,12 @@ pkgbase = waterfox-kde
 	optdepends = alsa-lib: Audio support
 	optdepends = jack: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = waterfox=56.2.0
+	provides = waterfox=56.2.1
 	conflicts = waterfox
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#tag=56.2.0
+	source = git+https://github.com/MrAlex94/Waterfox.git#commit=04c6debaf8d1391ea48b3872019a3aa38a1f211e
 	source = waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.desktop
 	source = waterfox-install-dir.patch
 	source = no-crmf.diff
@@ -65,10 +65,8 @@ pkgbase = waterfox-kde
 	source = jack-system-ports.patch
 	source = fix_crash_e10s_upload_cancel.patch::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/fix_crash_e10s_upload_cancel.patch
 	source = wifi-disentangle.patch
-	source = 0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
-	source = mozilla-ucontext-7339b115a221.patch::http://www.rosenauer.org/hg/mozilla/raw-file/7339b115a221/mozilla-ucontext.patch
 	source = no-plt.diff
-	source = unity-menubar-56.2.0.patch::https://bazaar.launchpad.net/~mozillateam/firefox/firefox.xenial/download/1222/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch
+	source = unity-menubar-56.2.1.patch::https://bazaar.launchpad.net/~mozillateam/firefox/firefox.xenial/download/1222/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch
 	source = .gitignore
 	sha256sums = SKIP
 	sha256sums = 2a17f68e86c2c871a1ff32f0a012c7ad20ac542b935044e5ffd9716874641f4d
@@ -85,8 +83,6 @@ pkgbase = waterfox-kde
 	sha256sums = be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c
 	sha256sums = 73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794
 	sha256sums = f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed
-	sha256sums = aba767995ffb1a55345e30aaba667f43d469e23bd9b1b68263cf71b8118acc96
-	sha256sums = 96d9accb74e19f640e356572b3c0914c6be867cbdf351392b0cb5c00161ee012
 	sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
 	sha256sums = 5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d
 	sha256sums = e7ae75f0d1305066a5ba7b60a513d812c769beadaf890a13d1433c9f93242166
diff --git a/PKGBUILD b/PKGBUILD
index eb83f14ae478..c871f3c304e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on firefox-kde Manjaro's PKGBUILD
 
 pkgname=waterfox-kde
-pkgver=56.2.0
+pkgver=56.2.1
 pkgrel=1
 pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
 arch=('x86_64')
@@ -24,8 +24,8 @@ conflicts=('waterfox')
 options=('!emptydirs' '!makeflags' 'zipman')
 _patchrev=7339b115a221
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=d27e63b27954615324864f3f9f7088a84ad60ebd
-source=("git+https://github.com/MrAlex94/Waterfox.git#tag=$pkgver"
+_commit=04c6debaf8d1391ea48b3872019a3aa38a1f211e
+source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.desktop"
         waterfox-install-dir.patch 
         no-crmf.diff
@@ -40,8 +40,6 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#tag=$pkgver"
         jack-system-ports.patch
         "fix_crash_e10s_upload_cancel.patch::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/fix_crash_e10s_upload_cancel.patch"
         wifi-disentangle.patch
-        0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
-        "mozilla-ucontext-$_patchrev.patch::$_patchurl/mozilla-ucontext.patch"
         no-plt.diff
         "unity-menubar-$pkgver.patch::https://bazaar.launchpad.net/~mozillateam/firefox/firefox.xenial/download/1222/unitymenubar.patch-20130215095938-1n6mqqau8tdfqwhg-1/unity-menubar.patch"
         .gitignore)
@@ -60,8 +58,6 @@ sha256sums=('SKIP'
             'be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c'
             '73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794'
             'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed'
-            'aba767995ffb1a55345e30aaba667f43d469e23bd9b1b68263cf71b8118acc96'
-            '96d9accb74e19f640e356572b3c0914c6be867cbdf351392b0cb5c00161ee012'
             'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
             '5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d'
             'e7ae75f0d1305066a5ba7b60a513d812c769beadaf890a13d1433c9f93242166')
@@ -82,18 +78,11 @@ prepare() {
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i ../no-crmf.diff
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1385667
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1394149
-  patch -Np1 -i ../mozilla-ucontext-$_patchrev.patch
   
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
   patch -Np1 -i ../wifi-disentangle.patch
   patch -Np1 -i ../wifi-fix-interface.patch
   
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1384062
-  patch -Np1 -i ../0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
-  
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
   patch -Np1 -i ../no-plt.diff