56.2.2

56.2.2

6 files changed, 158 insertions, 257 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bed676d951c9..8e28ce10bbcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jun 17 18:15:50 UTC 2018
+# Sun Jul 15 20:03:20 UTC 2018
 pkgbase = waterfox-kde
 	pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
-	pkgver = 56.2.1
+	pkgver = 56.2.2
 	pkgrel = 1
 	url = https://www.waterfoxproject.org/
 	arch = x86_64
@@ -45,16 +45,15 @@ pkgbase = waterfox-kde
 	optdepends = alsa-lib: Audio support
 	optdepends = jack: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = waterfox=56.2.1
+	provides = waterfox=56.2.2
 	conflicts = waterfox
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#commit=04c6debaf8d1391ea48b3872019a3aa38a1f211e
+	source = git+https://github.com/MrAlex94/Waterfox.git#commit=f874dbfaac9344f25e2f363dd3064fbac25d1bbf
 	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
-	source = wifi-fix-interface.patch
+	source = wifi-disentangle_fix-interface.patch
 	source = waterfoxproject-kde-56.2.0.patch
 	source = firefox-kde-7339b115a221.patch::http://www.rosenauer.org/hg/mozilla/raw-file/7339b115a221/firefox-kde.patch
 	source = fix_waterfox_browser-kde_xul.patch
@@ -64,15 +63,13 @@ pkgbase = waterfox-kde
 	source = waterfox.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.1
 	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 = no-plt.diff
-	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 = unity-menubar-56.2.2.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
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
-	sha256sums = fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb
-	sha256sums = e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1
+	sha256sums = 23a0abc2bb28d03cf4e85be2a2ca0ce2c78677e07fd0428c5aa52650784482d7
 	sha256sums = 911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43
 	sha256sums = f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f
 	sha256sums = 33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce
@@ -82,7 +79,6 @@ pkgbase = waterfox-kde
 	sha256sums = 3c45f43bc9517f149ffdcf4dd3d8bf2a88835b74003cc46d8f4f606dc0ecea12
 	sha256sums = be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c
 	sha256sums = 73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794
-	sha256sums = f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed
 	sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
 	sha256sums = 5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d
 	sha256sums = e7ae75f0d1305066a5ba7b60a513d812c769beadaf890a13d1433c9f93242166
diff --git a/0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch b/0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
deleted file mode 100644
index 58d029bde35a..000000000000
--- a/0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 2874ecd82e9671f774bdfda41fe0857fcb916c13 Mon Sep 17 00:00:00 2001
-Message-Id: <2874ecd82e9671f774bdfda41fe0857fcb916c13.1506634385.git.jan.steffens@gmail.com>
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Wed, 16 Aug 2017 13:16:16 +0900
-Subject: [PATCH] Bug 1384062 - Make SystemResourceMonitor.stop more resilient
- to errors. r=ahal,gps
-
-The poll() call in SystemResourceMonitor.stop might fail even though
-there is something to read from the pipe, in some corner cases, and
-python won't let us know about it. In that case, an exception is thrown,
-leaving the SystemResourceMonitor (and its callers) in a weird state. In
-practice, this leads BuildMonitor.__exit__ to recall stop, which then
-fails.
-
-So when poll() throws an exception, we pretend there's still something
-to read, and we try to read anyways. If there is something to read,
-recv() will return it, otherwise, it will throw an exception of its own,
-which we catch, pretending we're done.
-
-Furthermore, when there is nothing to read from the pipe, poll() simply
-returns False, and our loop never sets `done` to True, and we then hit
-an assert, which doesn't have its place here, so we remove it.
-
-Finally, the other end of the pipe might have died at any time, making
-sending over the pipe fail, so we also protect against that.
-
-With all these changes, it feels like the reason to backout bug 1239939
-in bug 1272782 should have been dealt with, and we can drop the timeout
-again.
-
---HG--
-extra : rebase_source : ac72dd5b2602cf3ffddfb429f95e02380f939893
----
- .../mozsystemmonitor/resourcemonitor.py            | 38 +++++++++++++++-------
- 1 file changed, 26 insertions(+), 12 deletions(-)
-
-diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-index 8f2ac95cbe505540..38f9bc986ac2a120 100644
---- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-+++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
-@@ -289,47 +289,61 @@ class SystemResourceMonitor(object):
-         assert self._running
-         assert not self._stopped
- 
--        self._pipe.send(('terminate',))
-+        try:
-+            self._pipe.send(('terminate',))
-+        except Exception:
-+            pass
-         self._running = False
-         self._stopped = True
- 
-         self.measurements = []
- 
--        done = False
--
-         # The child process will send each data sample over the pipe
-         # as a separate data structure. When it has finished sending
-         # samples, it sends a special "done" message to indicate it
-         # is finished.
--        while self._pipe.poll(1.0):
--            start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
--                swap_mem = self._pipe.recv()
-+
-+        # multiprocessing.Pipe is not actually a pipe on at least Linux.  that
-+        # has an effect on the expected outcome of reading from it when the
-+        # other end of the pipe dies, leading to possibly hanging on revc()
-+        # below. So we must poll().
-+        def poll():
-+            try:
-+                return self._pipe.poll(0.1)
-+            except Exception:
-+                # Poll might throw an exception even though there's still
-+                # data to read. That happens when the underlying system call
-+                # returns both POLLERR and POLLIN, but python doesn't tell us
-+                # about it. So assume there is something to read, and we'll
-+                # get an exception when trying to read the data.
-+                return True
-+        while poll():
-+            try:
-+                start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
-+                    swap_mem = self._pipe.recv()
-+            except Exception:
-+                # Let's assume we're done here
-+                break
- 
-             # There should be nothing after the "done" message so
-             # terminate.
-             if start_time == 'done':
--                done = True
-                 break
- 
-             io = self._io_type(*io_diff)
-             virt = self._virt_type(*virt_mem)
-             swap = self._swap_type(*swap_mem)
-             cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
- 
-             self.measurements.append(SystemResourceUsage(start_time, end_time,
-                                                          cpu_times, cpu_percent, io, virt, swap))
- 
-         # We establish a timeout so we don't hang forever if the child
-         # process has crashed.
-         self._process.join(10)
-         if self._process.is_alive():
-             self._process.terminate()
-             self._process.join(10)
--        else:
--            # We should have received a "done" message from the
--            # child indicating it shut down properly. This only
--            # happens if the child shuts down cleanly.
--            assert done
- 
-         if len(self.measurements):
-             self.start_time = self.measurements[0].start
--- 
-2.14.2
-
diff --git a/PKGBUILD b/PKGBUILD
index c871f3c304e4..7dbb1eb97aa2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on firefox-kde Manjaro's PKGBUILD
 
 pkgname=waterfox-kde
-pkgver=56.2.1
+pkgver=56.2.2
 pkgrel=1
 pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
 arch=('x86_64')
@@ -24,12 +24,11 @@ conflicts=('waterfox')
 options=('!emptydirs' '!makeflags' 'zipman')
 _patchrev=7339b115a221
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
-_commit=04c6debaf8d1391ea48b3872019a3aa38a1f211e
+_commit=f874dbfaac9344f25e2f363dd3064fbac25d1bbf
 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
-        wifi-fix-interface.patch
+        waterfox-install-dir.patch
+        wifi-disentangle_fix-interface.patch
         waterfoxproject-kde-56.2.0.patch
         "firefox-kde-$_patchrev.patch::$_patchurl/firefox-kde.patch"
         fix_waterfox_browser-kde_xul.patch
@@ -39,15 +38,13 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "waterfox.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.1"
         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
         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)
 sha256sums=('SKIP'
             '2a17f68e86c2c871a1ff32f0a012c7ad20ac542b935044e5ffd9716874641f4d'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
-            'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1'
+            '23a0abc2bb28d03cf4e85be2a2ca0ce2c78677e07fd0428c5aa52650784482d7'
             '911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43'
             'f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f'
             '33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce'
@@ -57,7 +54,6 @@ sha256sums=('SKIP'
             '3c45f43bc9517f149ffdcf4dd3d8bf2a88835b74003cc46d8f4f606dc0ecea12'
             'be19426cd658ea0ff0dedbdd80da6bf84580c80d92f9b3753da107011dfdd85c'
             '73e13bf689838e4b27cdb08f040fbafb308aaf2990f5e1bf193a69a9dd736794'
-            'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed'
             'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa'
             '5903f99dce010279e2a2f0e56d98e756c5abf9a57e27df5e2239076038868d3d'
             'e7ae75f0d1305066a5ba7b60a513d812c769beadaf890a13d1433c9f93242166')
@@ -65,27 +61,23 @@ sha256sums=('SKIP'
 prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
-  
+
   # Fix openSUSE's patches for Waterfox
   #sed -i 's/Firefox/Waterfox/g' $srcdir/mozilla-kde-$_patchrev.patch
   #sed -i 's/KMOZILLAHELPER/KWATERFOXHELPER/g' $srcdir/mozilla-kde-$_patchrev.patch
   #sed -i 's|/usr/lib/mozilla/kmozillahelper|/opt/waterfox/kwaterfoxhelper|g' $srcdir/mozilla-kde-$_patchrev.patch
   #sed -i 's/kmozillahelper/kwaterfoxhelper/g' $srcdir/mozilla-kde-$_patchrev.patch
   sed -i 's/firefox/waterfox/g' $srcdir/firefox-kde-$_patchrev.patch
-  
+
   cd Waterfox
   patch -Np1 -i ../waterfox-install-dir.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i ../no-crmf.diff
-  
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -Np1 -i ../wifi-disentangle.patch
-  patch -Np1 -i ../wifi-fix-interface.patch
-  
+  patch -Np1 -i ../wifi-disentangle_fix-interface.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
   patch -Np1 -i ../no-plt.diff
-  
+
   cat >.mozconfig <<END
 export CC=clang
 export CXX=clang++
@@ -150,7 +142,7 @@ ac_add_options --disable-accessibility
 ac_add_options --disable-webspeech
 
 # If you want to have geolocation support, comment this line:
-ac_add_options --disable-necko-wifi 
+ac_add_options --disable-necko-wifi
 
 # If you have some problems with Skype Web or other web chat, comment this line:
 ac_add_options --disable-webrtc
@@ -177,22 +169,22 @@ END
   patch -Np1 -i "../firefox-kde-$_patchrev.patch"
   patch -Np1 -i "../fix_waterfox_browser-kde_xul.patch"
   patch -Np1 -i "../fix_crash_e10s_upload_cancel.patch"
-  
+
   # Global Menu support
   patch -Np1 -i "../unity-menubar-$pkgver.patch"
 
   msg "Add missing file in Makefile for pgo builds"
   patch -Np1 -i "../pgo_fix_missing_kdejs.patch"
-  
+
   # https://bugs.archlinux.org/task/52183
   msg "Patching for Jack"
   patch -Np1 -i ../jack-system-ports.patch
-  
+
 }
 
 build() {
   cd Waterfox
-  
+
   export PATH="$srcdir/path:$PATH"
   ./mach build
 }
@@ -242,10 +234,10 @@ END
 
   install -Dm644 $srcdir/waterfox.desktop \
     "$pkgdir/usr/share/applications/waterfox.desktop"
-    
+
   install -Dm644 $srcdir/waterfox.1 \
     "$pkgdir/usr/share/man/man1/waterfox.1"
-    
+
   install -Dm644 $srcdir/distribution.ini \
     "$pkgdir/opt/waterfox/distribution/distribution.ini"
 
diff --git a/no-crmf.diff b/no-crmf.diff
deleted file mode 100644
index 242304eb4182..000000000000
--- a/no-crmf.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
---- i/old-configure.in
-+++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
- 
--if test -n "$MOZ_SYSTEM_NSS"; then
--   NSS_LIBS="$NSS_LIBS -lcrmf"
--else
-+if test -z "$MOZ_SYSTEM_NSS"; then
-    NSS_CFLAGS="-I${DIST}/include/nss"
-    case "${OS_ARCH}" in
-         # Only few platforms have been tested with GYP
diff --git a/wifi-disentangle.patch b/wifi-disentangle_fix-interface.patch
index 8f474b9c0fec..87776cdd9281 100644
--- a/wifi-disentangle.patch
+++ b/wifi-disentangle_fix-interface.patch
@@ -1,11 +1,48 @@
-# HG changeset patch
-# Parent  2edd69b245fbc493c3a1cf17c40c63b0280ead12
-Bug 1314968 - Disentangle nsWifiScannerDBus::SendMessage. r?kanru
+From 042322e671ab5dce915b3ab83d4488f5e29c5632 Mon Sep 17 00:00:00 2001
+From: Peacock365 <37863161+Peacock365@users.noreply.github.com>
+Date: Sun, 17 Jun 2018 14:03:17 +0200
+Subject: [PATCH 1/3] Revert "Bug 1314968 - Explicitly specify the AccessPoint
+ interface name. r=kanru"
+
+This reverts commit 7482e1892f9a8b26cbef98de0de6ab62bb0e76eb.
+---
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
+index f6c696e666ed..ceb349e58f2d 100644
+--- a/netwerk/wifi/nsWifiScannerDBus.cpp
++++ b/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -67,7 +67,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
++    const char* param = "";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }
+-- 
+2.18.0
+
+
+From 4445485a1557c802f43fd90d9c0379822e41cc6c Mon Sep 17 00:00:00 2001
+From: Jan Steffens <jan.steffens@gmail.com>
+Date: Sat, 16 Sep 2017 18:35:18 +0200
+Subject: [PATCH 2/3] Bug 1314968 - Disentangle nsWifiScannerDBus::SendMessage.
+ r=kanru
 
 Make a copy of the function and specialize it for each message sent.
 Avoids the mess of comparing the method name to figure out what to do.
 
+MozReview-Commit-ID: 1KlZyc8Pc9I
+---
+ netwerk/wifi/nsWifiScannerDBus.cpp | 151 ++++++++++++++++++++---------
+ netwerk/wifi/nsWifiScannerDBus.h   |   7 +-
+ 2 files changed, 110 insertions(+), 48 deletions(-)
+
 diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
+index ceb349e58f2d..6b04a35d3b5d 100644
 --- a/netwerk/wifi/nsWifiScannerDBus.cpp
 +++ b/netwerk/wifi/nsWifiScannerDBus.cpp
 @@ -34,19 +34,47 @@ nsWifiScannerDBus::Scan()
@@ -26,14 +63,11 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
 -nsWifiScannerDBus::SendMessage(const char* aInterface,
 -                               const char* aPath,
 -                               const char* aFuncCall)
--{
--  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
--    dbus_message_new_method_call("org.freedesktop.NetworkManager",
--                                 aPath, aInterface, aFuncCall));
 +nsWifiScannerDBus::SendGetDevices()
-+{
-+  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
-+    dbus_message_new_method_call("org.freedesktop.NetworkManager",
+ {
+   RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
+     dbus_message_new_method_call("org.freedesktop.NetworkManager",
+-                                 aPath, aInterface, aFuncCall));
 +                                 "/org/freedesktop/NetworkManager",
 +                                 "org.freedesktop.NetworkManager",
 +                                 "GetDevices"));
@@ -66,7 +100,7 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
    if (!msg) {
      return NS_ERROR_FAILURE;
    }
-@@ -54,58 +82,92 @@ nsWifiScannerDBus::SendMessage(const cha
+@@ -54,58 +82,92 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
    DBusMessageIter argsIter;
    dbus_message_iter_init_append(msg, &argsIter);
  
@@ -76,7 +110,12 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
 -                                        &paramInterface)) {
 -      return NS_ERROR_FAILURE;
 -    }
--
++  const char* paramInterface = "org.freedesktop.NetworkManager.Device";
++  if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
++                                      &paramInterface)) {
++    return NS_ERROR_FAILURE;
++  }
+ 
 -    const char* paramDeviceType = "DeviceType";
 -    if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
 -                                        &paramDeviceType)) {
@@ -87,27 +126,23 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
 -    if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
 -      return NS_ERROR_FAILURE;
 -    }
--  }
-+  const char* paramInterface = "org.freedesktop.NetworkManager.Device";
-+  if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
-+                                      &paramInterface)) {
-+    return NS_ERROR_FAILURE;
-+  }
-+
 +  const char* paramDeviceType = "DeviceType";
 +  if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
 +                                      &paramDeviceType)) {
 +    return NS_ERROR_FAILURE;
-+  }
-+
-+  DBusError err;
-+  dbus_error_init(&err);
-+
-+  RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
-+    dbus_connection_send_with_reply_and_block(mConnection, msg,
-+                                              DBUS_DEFAULT_TIMEOUT, &err));
-+  if (dbus_error_is_set(&err)) {
-+    dbus_error_free(&err);
+   }
+ 
+   DBusError err;
+   dbus_error_init(&err);
+ 
+-  // http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html
+-  // Refer to function dbus_connection_send_with_reply_and_block.
+-  const uint32_t DBUS_DEFAULT_TIMEOUT = -1;
+   RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
+     dbus_connection_send_with_reply_and_block(mConnection, msg,
+                                               DBUS_DEFAULT_TIMEOUT, &err));
+   if (dbus_error_is_set(&err)) {
+     dbus_error_free(&err);
 +    return NS_ERROR_FAILURE;
 +  }
 +
@@ -125,26 +160,36 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
 +  if (!msg) {
 +    return NS_ERROR_FAILURE;
 +  }
++
++  DBusError err;
++  dbus_error_init(&err);
  
-   DBusError err;
-   dbus_error_init(&err);
- 
--  // http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html
--  // Refer to function dbus_connection_send_with_reply_and_block.
--  const uint32_t DBUS_DEFAULT_TIMEOUT = -1;
-   RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
-     dbus_connection_send_with_reply_and_block(mConnection, msg,
-                                               DBUS_DEFAULT_TIMEOUT, &err));
-   if (dbus_error_is_set(&err)) {
-     dbus_error_free(&err);
--
++  RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
++    dbus_connection_send_with_reply_and_block(mConnection, msg,
++                                              DBUS_DEFAULT_TIMEOUT, &err));
++  if (dbus_error_is_set(&err)) {
++    dbus_error_free(&err);
      // In the GetAccessPoints case, if there are no access points, error is set.
      // We don't want to error out here.
 -    if (!strcmp(aFuncCall, "GetAccessPoints")) {
 -      return NS_OK;
 -    }
--    return NS_ERROR_FAILURE;
 +    return NS_OK;
++  }
++
++  return IdentifyAccessPoints(reply);
++}
++
++nsresult
++nsWifiScannerDBus::SendGetAPProperties(const char* aPath)
++{
++  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
++    dbus_message_new_method_call("org.freedesktop.NetworkManager",
++                                 aPath,
++                                 "org.freedesktop.DBus.Properties",
++                                 "GetAll"));
++  if (!msg) {
+     return NS_ERROR_FAILURE;
    }
  
 -  nsresult rv;
@@ -158,30 +203,14 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
 -    rv = IdentifyAPProperties(reply);
 -  } else {
 -    rv = NS_ERROR_FAILURE;
--  }
--  return rv;
-+  return IdentifyAccessPoints(reply);
-+}
-+
-+nsresult
-+nsWifiScannerDBus::SendGetAPProperties(const char* aPath)
-+{
-+  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
-+    dbus_message_new_method_call("org.freedesktop.NetworkManager",
-+                                 aPath,
-+                                 "org.freedesktop.DBus.Properties",
-+                                 "GetAll"));
-+  if (!msg) {
-+    return NS_ERROR_FAILURE;
-+  }
-+
 +  DBusMessageIter argsIter;
 +  dbus_message_iter_init_append(msg, &argsIter);
 +
 +  const char* param = "";
 +  if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
 +    return NS_ERROR_FAILURE;
-+  }
+   }
+-  return rv;
 +
 +  DBusError err;
 +  dbus_error_init(&err);
@@ -198,7 +227,7 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
  }
  
  nsresult
-@@ -126,7 +188,7 @@ nsWifiScannerDBus::IdentifyDevices(DBusM
+@@ -126,7 +188,7 @@ nsWifiScannerDBus::IdentifyDevices(DBusMessage* aMsg)
        return NS_ERROR_FAILURE;
      }
  
@@ -207,7 +236,7 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
      NS_ENSURE_SUCCESS(rv, rv);
    } while (dbus_message_iter_next(&iter));
  
-@@ -159,8 +221,7 @@ nsWifiScannerDBus::IdentifyDeviceType(DB
+@@ -159,8 +221,7 @@ nsWifiScannerDBus::IdentifyDeviceType(DBusMessage* aMsg, const char* aDevicePath
    const uint32_t NM_DEVICE_TYPE_WIFI = 2;
    nsresult rv = NS_OK;
    if (deviceType == NM_DEVICE_TYPE_WIFI) {
@@ -217,7 +246,7 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
    }
  
    return rv;
-@@ -183,7 +244,7 @@ nsWifiScannerDBus::IdentifyAccessPoints(
+@@ -183,7 +244,7 @@ nsWifiScannerDBus::IdentifyAccessPoints(DBusMessage* aMsg)
        return NS_ERROR_FAILURE;
      }
  
@@ -227,6 +256,7 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus
    } while (dbus_message_iter_next(&iter));
  
 diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h
+index 516eb5ff2ffb..7c874c04af87 100644
 --- a/netwerk/wifi/nsWifiScannerDBus.h
 +++ b/netwerk/wifi/nsWifiScannerDBus.h
 @@ -25,9 +25,10 @@ public:
@@ -243,3 +273,44 @@ diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h
    nsresult IdentifyDevices(DBusMessage* aMsg);
    nsresult IdentifyDeviceType(DBusMessage* aMsg, const char* aDevicePath);
    nsresult IdentifyAccessPoints(DBusMessage* aMsg);
+-- 
+2.18.0
+
+
+From cc6abba87dbc67d199725d88b9fbd94c4b8449b2 Mon Sep 17 00:00:00 2001
+From: Jan Steffens <jan.steffens@gmail.com>
+Date: Sat, 16 Sep 2017 18:35:20 +0200
+Subject: [PATCH 3/3] Bug 1314968 - Explicitly specify the AccessPoint
+ interface name. r=kanru
+
+The DBus specification allows passing an empty string as the interface to the
+org.freedesktop.DBus.Properties.GetAll call to get all properties, throwing away the namespace
+(interface) information.
+
+However, GDBus does not allow this. When NetworkManager moved to using GDBus, Firefox lost the
+ability to retrieve access points from NetworkManager.
+
+Since we're only interested in properties from the org.freedesktop.NetworkManager.AccessPoint
+interface, name it explicitly. This works with both the old and the new NetworkManager.
+
+MozReview-Commit-ID: Kc5HaYvwfRZ
+---
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
+index 6b04a35d3b5d..60c01a50a501 100644
+--- a/netwerk/wifi/nsWifiScannerDBus.cpp
++++ b/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -151,7 +151,7 @@ nsWifiScannerDBus::SendGetAPProperties(const char* aPath)
+   DBusMessageIter argsIter;
+   dbus_message_iter_init_append(msg, &argsIter);
+ 
+-  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;
+   }
+-- 
+2.18.0
+
diff --git a/wifi-fix-interface.patch b/wifi-fix-interface.patch
deleted file mode 100644
index 1980db1837e7..000000000000
--- a/wifi-fix-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# Parent  7a6d836b62779aa61988981c6ca646495574a505
-Bug 1314968 - Explicitly specify the AccessPoint interface name. r?kanru
-
-The DBus specification allows passing an empty string as the interface to the
-org.freedesktop.DBus.Properties.GetAll call to get all properties, throwing away the namespace
-(interface) information.
-
-However, GDBus does not allow this. When NetworkManager moved to using GDBus, Firefox lost the
-ability to retrieve access points from NetworkManager.
-
-Since we're only interested in properties from the org.freedesktop.NetworkManager.AccessPoint
-interface, name it explicitly. This works with both the old and the new NetworkManager.
-
-diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
---- a/netwerk/wifi/nsWifiScannerDBus.cpp
-+++ b/netwerk/wifi/nsWifiScannerDBus.cpp
-@@ -151,7 +151,7 @@ nsWifiScannerDBus::SendGetAll(const char
-   DBusMessageIter argsIter;
-   dbus_message_iter_init_append(msg, &argsIter);
- 
--  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;
-   }