diff options
author | D. Can Celasun | 2024-05-10 15:46:52 +0100 |
---|---|---|
committer | D. Can Celasun | 2024-05-10 15:51:22 +0100 |
commit | 1a6aeb99195da9e7bfa979921c3a1f90835bdbd2 (patch) | |
tree | 9e8e9021c5dab5c1a2d18541db51ceeb6fa3d25e /0002-wayland-proxy.patch | |
parent | 4ad4e49ec0507a2277cab6e992b7947c52d2c236 (diff) | |
download | aur-1a6aeb99195da9e7bfa979921c3a1f90835bdbd2.tar.gz |
[firefox-vaapi] Add patch for building with Rust 1.78.0
Diffstat (limited to '0002-wayland-proxy.patch')
-rw-r--r-- | 0002-wayland-proxy.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/0002-wayland-proxy.patch b/0002-wayland-proxy.patch deleted file mode 100644 index b60531455bb2..000000000000 --- a/0002-wayland-proxy.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --color --unified --recursive --text --new-file firefox-122.0.orig/toolkit/xre/nsAppRunner.cpp firefox-122.0.new/toolkit/xre/nsAppRunner.cpp ---- firefox-122.0.orig/toolkit/xre/nsAppRunner.cpp 2024-01-27 16:54:31.509971123 +0100 -+++ firefox-122.0.new/toolkit/xre/nsAppRunner.cpp 2024-01-27 16:56:06.694387771 +0100 -@@ -344,13 +344,24 @@ - # ifdef MOZ_WAYLAND - # include <gdk/gdkwayland.h> - # include "mozilla/widget/nsWaylandDisplay.h" -+# include "wayland-proxy.h" - # endif - # ifdef MOZ_X11 - # include <gdk/gdkx.h> - # endif /* MOZ_X11 */ - #endif -+ -+#if defined(MOZ_WAYLAND) -+std::unique_ptr<WaylandProxy> gWaylandProxy; -+#endif -+ - #include "BinaryPath.h" - -+#ifdef MOZ_LOGGING -+# include "mozilla/Logging.h" -+extern mozilla::LazyLogModule gWidgetWaylandLog; -+#endif /* MOZ_LOGGING */ -+ - #ifdef FUZZING - # include "FuzzerRunner.h" - -@@ -2792,6 +2803,9 @@ - gRemoteService = nullptr; - } - #endif -+#if defined(MOZ_WAYLAND) -+ gWaylandProxy = nullptr; -+#endif - return LaunchChild(false, true); - } - } else { -@@ -2906,6 +2920,9 @@ - gRemoteService = nullptr; - } - #endif -+#if defined(MOZ_WAYLAND) -+ gWaylandProxy = nullptr; -+#endif - return LaunchChild(false, true); - } - -@@ -4711,6 +4728,23 @@ - const char* display_name = nullptr; - bool saveDisplayArg = false; - -+ bool waylandEnabled = IsWaylandEnabled(); -+# ifdef MOZ_WAYLAND -+ auto* proxyEnv = getenv("MOZ_DISABLE_WAYLAND_PROXY"); -+ bool disableWaylandProxy = proxyEnv && *proxyEnv; -+ if (!disableWaylandProxy && XRE_IsParentProcess() && waylandEnabled) { -+# ifdef MOZ_LOGGING -+ if (MOZ_LOG_TEST(gWidgetWaylandLog, mozilla::LogLevel::Debug)) { -+ WaylandProxy::SetVerbose(true); -+ } -+# endif -+ gWaylandProxy = WaylandProxy::Create(); -+ if (gWaylandProxy) { -+ gWaylandProxy->RunThread(); -+ } -+ } -+# endif -+ - // display_name is owned by gdk. - display_name = gdk_get_display_arg_name(); - // if --display argument is given make sure it's -@@ -4720,7 +4754,6 @@ - saveDisplayArg = true; - } - -- bool waylandEnabled = IsWaylandEnabled(); - // On Wayland disabled builds read X11 DISPLAY env exclusively - // and don't care about different displays. - if (!waylandEnabled && !display_name) { -@@ -5954,6 +5987,7 @@ - if (!gfxPlatform::IsHeadless()) { - # ifdef MOZ_WAYLAND - WaylandDisplayRelease(); -+ gWaylandProxy = nullptr; - # endif - } - #endif |