56.2.3

3 files changed, 10 insertions, 331 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e28ce10bbcb..b20bff89f185 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jul 15 20:03:20 UTC 2018
+# Fri Sep 14 13:52:48 UTC 2018
 pkgbase = waterfox-kde
 	pkgdesc = Free, open and private browser with openSUSE's patches for better integration with KDE
-	pkgver = 56.2.2
+	pkgver = 56.2.3
 	pkgrel = 1
 	url = https://www.waterfoxproject.org/
 	arch = x86_64
@@ -45,15 +45,14 @@ pkgbase = waterfox-kde
 	optdepends = alsa-lib: Audio support
 	optdepends = jack: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = waterfox=56.2.2
+	provides = waterfox=56.2.3
 	conflicts = waterfox
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#commit=f874dbfaac9344f25e2f363dd3064fbac25d1bbf
+	source = git+https://github.com/MrAlex94/Waterfox.git#tag=56.2.3
 	source = waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.desktop
 	source = waterfox-install-dir.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,12 +63,11 @@ 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 = no-plt.diff
-	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 = unity-menubar-56.2.3.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 = 23a0abc2bb28d03cf4e85be2a2ca0ce2c78677e07fd0428c5aa52650784482d7
 	sha256sums = 911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43
 	sha256sums = f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f
 	sha256sums = 33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce
diff --git a/PKGBUILD b/PKGBUILD
index 7dbb1eb97aa2..da0856c856ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on firefox-kde Manjaro's PKGBUILD
 
 pkgname=waterfox-kde
-pkgver=56.2.2
+pkgver=56.2.3
 pkgrel=1
 pkgdesc="Free, open and private browser with openSUSE's patches for better integration with KDE"
 arch=('x86_64')
@@ -25,10 +25,9 @@ options=('!emptydirs' '!makeflags' 'zipman')
 _patchrev=7339b115a221
 _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
 _commit=f874dbfaac9344f25e2f363dd3064fbac25d1bbf
-source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
+source=("git+https://github.com/MrAlex94/Waterfox.git#tag=$pkgver"
         "waterfox.desktop::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/BUILD/waterfox-kde/debian/waterfox.desktop"
         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
@@ -44,7 +43,6 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
 sha256sums=('SKIP'
             '2a17f68e86c2c871a1ff32f0a012c7ad20ac542b935044e5ffd9716874641f4d'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            '23a0abc2bb28d03cf4e85be2a2ca0ce2c78677e07fd0428c5aa52650784482d7'
             '911e07ecb0095337c580c94f16b5414c243b26b1080cf0bfd2fac7f76c9a6a43'
             'f672e60e22869381e9c4cdd90353a053a0171778eca40d4664bc733822fd535f'
             '33a8e89e504067914665b7858061f34dc81057961f365024c891aa386afc28ce'
@@ -72,9 +70,6 @@ prepare() {
   cd Waterfox
   patch -Np1 -i ../waterfox-install-dir.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -Np1 -i ../wifi-disentangle_fix-interface.patch
-
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
   patch -Np1 -i ../no-plt.diff
 
@@ -85,7 +80,6 @@ export LDFLAGS="-Wl,-z,norelro,-O3,--sort-common,--as-needed,--relax,-z,combrelo
 
 ac_add_options --enable-optimize="-O3 -msse2 -mfpmath=sse -march=native -mtune=native -fcolor-diagnostics -w"
 ac_add_options --target=x86_64-pc-linux-gnu
-ac_add_options --with-ccache=ccache
 
 ac_add_options --enable-alsa
 ac_add_options --enable-pulseaudio
@@ -161,6 +155,9 @@ ac_add_options --enable-rust-simd # on x86 requires SSE2
 ac_add_options --enable-application=browser
 ac_add_options --enable-eme=widevine
 
+export MOZ_GECKO_PROFILER=
+export MOZ_ENABLE_PROFILER_SPS=
+export MOZ_PROFILING=
 END
 
   msg "Patching for KDE"
diff --git a/wifi-disentangle_fix-interface.patch b/wifi-disentangle_fix-interface.patch
deleted file mode 100644
index 87776cdd9281..000000000000
--- a/wifi-disentangle_fix-interface.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-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()
-   if (!mConnection) {
-     return NS_ERROR_NOT_AVAILABLE;
-   }
--  return SendMessage("org.freedesktop.NetworkManager",
--                     "/org/freedesktop/NetworkManager",
--                     "GetDevices");
-+  return SendGetDevices();
- }
- 
-+// http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html
-+// Refer to function dbus_connection_send_with_reply_and_block.
-+static const uint32_t DBUS_DEFAULT_TIMEOUT = -1;
-+
- nsresult
--nsWifiScannerDBus::SendMessage(const char* aInterface,
--                               const char* aPath,
--                               const char* aFuncCall)
-+nsWifiScannerDBus::SendGetDevices()
- {
-   RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
-     dbus_message_new_method_call("org.freedesktop.NetworkManager",
--                                 aPath, aInterface, aFuncCall));
-+                                 "/org/freedesktop/NetworkManager",
-+                                 "org.freedesktop.NetworkManager",
-+                                 "GetDevices"));
-+  if (!msg) {
-+    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);
-+    return NS_ERROR_FAILURE;
-+  }
-+
-+  return IdentifyDevices(reply);
-+}
-+
-+nsresult
-+nsWifiScannerDBus::SendGetDeviceType(const char* aPath)
-+{
-+  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
-+    dbus_message_new_method_call("org.freedesktop.NetworkManager",
-+                                 aPath,
-+                                 "org.freedesktop.DBus.Properties",
-+                                 "Get"));
-   if (!msg) {
-     return NS_ERROR_FAILURE;
-   }
-@@ -54,58 +82,92 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
-   DBusMessageIter argsIter;
-   dbus_message_iter_init_append(msg, &argsIter);
- 
--  if (!strcmp(aFuncCall, "Get")) {
--    const char* paramInterface = "org.freedesktop.NetworkManager.Device";
--    if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
--                                        &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)) {
--      return NS_ERROR_FAILURE;
--    }
--  } else if (!strcmp(aFuncCall, "GetAll")) {
--    const char* param = "";
--    if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
--      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);
- 
--  // 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;
-+  }
-+
-+  return IdentifyDeviceType(reply, aPath);
-+}
-+
-+nsresult
-+nsWifiScannerDBus::SendGetAccessPoints(const char* aPath)
-+{
-+  RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
-+    dbus_message_new_method_call("org.freedesktop.NetworkManager",
-+                                 aPath,
-+                                 "org.freedesktop.NetworkManager.Device.Wireless",
-+                                 "GetAccessPoints"));
-+  if (!msg) {
-+    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);
-     // 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_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;
--  if (!strcmp(aFuncCall, "GetDevices")) {
--    rv = IdentifyDevices(reply);
--  } else if (!strcmp(aFuncCall, "Get")) {
--    rv = IdentifyDeviceType(reply, aPath);
--  } else if (!strcmp(aFuncCall, "GetAccessPoints")) {
--    rv = IdentifyAccessPoints(reply);
--  } else if (!strcmp(aFuncCall, "GetAll")) {
--    rv = IdentifyAPProperties(reply);
--  } else {
--    rv = 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);
-+
-+  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;
-+  }
-+
-+  return IdentifyAPProperties(reply);
- }
- 
- nsresult
-@@ -126,7 +188,7 @@ nsWifiScannerDBus::IdentifyDevices(DBusMessage* aMsg)
-       return NS_ERROR_FAILURE;
-     }
- 
--    rv = SendMessage("org.freedesktop.DBus.Properties", devicePath, "Get");
-+    rv = SendGetDeviceType(devicePath);
-     NS_ENSURE_SUCCESS(rv, rv);
-   } while (dbus_message_iter_next(&iter));
- 
-@@ -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) {
--    rv = SendMessage("org.freedesktop.NetworkManager.Device.Wireless",
--                     aDevicePath, "GetAccessPoints");
-+    rv = SendGetAccessPoints(aDevicePath);
-   }
- 
-   return rv;
-@@ -183,7 +244,7 @@ nsWifiScannerDBus::IdentifyAccessPoints(DBusMessage* aMsg)
-       return NS_ERROR_FAILURE;
-     }
- 
--    rv = SendMessage("org.freedesktop.DBus.Properties", path, "GetAll");
-+    rv = SendGetAPProperties(path);
-     NS_ENSURE_SUCCESS(rv, rv);
-   } 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:
-   nsresult Scan();
- 
- private:
--  nsresult SendMessage(const char* aInterface,
--                       const char* aPath,
--                       const char* aFuncCall);
-+  nsresult SendGetDevices();
-+  nsresult SendGetDeviceType(const char* aPath);
-+  nsresult SendGetAccessPoints(const char* aPath);
-+  nsresult SendGetAPProperties(const char* aPath);
-   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
-