From 20c032f2ed576eac3d30b4ac8851d13921e6cf77 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 2 Sep 2019 17:03:30 +0200
Subject: Added upstream Wayland patches (mozilla-1548475, mozilla-1562827,  
 mozilla-1567434, mozilla-1573813, mozilla-1574036,   mozilla-1576268). -
 Enable multiprocess compilation.

---
 mozilla-1548475.patch | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 mozilla-1548475.patch

(limited to 'mozilla-1548475.patch')

diff --git a/mozilla-1548475.patch b/mozilla-1548475.patch
new file mode 100644
index 0000000..b325683
--- /dev/null
+++ b/mozilla-1548475.patch
@@ -0,0 +1,34 @@
+diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
+--- a/dom/plugins/base/nsPluginHost.cpp
++++ b/dom/plugins/base/nsPluginHost.cpp
+@@ -105,6 +105,10 @@
+ #  include "windows.h"
+ #  include "winbase.h"
+ #endif
++#if (MOZ_WIDGET_GTK)
++#  include <gdk/gdk.h>
++#  include <gdk/gdkx.h>
++#endif
+ 
+ #include "npapi.h"
+ 
+@@ -358,9 +362,15 @@
+   mOverrideInternalTypes =
+       Preferences::GetBool("plugin.override_internal_types", false);
+ 
+-  mPluginsDisabled = Preferences::GetBool("plugin.disable", false);
+-
+-  Preferences::AddStrongObserver(this, "plugin.disable");
++  bool waylandBackend = false;
++#if MOZ_WIDGET_GTK
++  waylandBackend = !GDK_IS_X11_DISPLAY(gdk_display_get_default());
++#endif
++  mPluginsDisabled =
++      Preferences::GetBool("plugin.disable", false) || waylandBackend;
++  if (!waylandBackend) {
++    Preferences::AddStrongObserver(this, "plugin.disable");
++  }
+ 
+   nsCOMPtr<nsIObserverService> obsService =
+       mozilla::services::GetObserverService();
+
-- 
cgit