summarylogtreecommitdiffstats
path: root/0002-wayland-proxy.patch
diff options
context:
space:
mode:
Diffstat (limited to '0002-wayland-proxy.patch')
-rw-r--r--0002-wayland-proxy.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/0002-wayland-proxy.patch b/0002-wayland-proxy.patch
index c76bc21924e0..b60531455bb2 100644
--- a/0002-wayland-proxy.patch
+++ b/0002-wayland-proxy.patch
@@ -1,7 +1,7 @@
-diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRunner.cpp firefox-121.0.new/toolkit/xre/nsAppRunner.cpp
---- firefox-121.0.orig/toolkit/xre/nsAppRunner.cpp 2024-01-09 02:00:34.503779191 +0100
-+++ firefox-121.0.new/toolkit/xre/nsAppRunner.cpp 2024-01-09 02:01:28.333190186 +0100
-@@ -340,13 +340,24 @@
+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"
@@ -26,7 +26,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
#ifdef FUZZING
# include "FuzzerRunner.h"
-@@ -2788,6 +2799,9 @@
+@@ -2792,6 +2803,9 @@
gRemoteService = nullptr;
}
#endif
@@ -36,7 +36,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
return LaunchChild(false, true);
}
} else {
-@@ -2902,6 +2916,9 @@
+@@ -2906,6 +2920,9 @@
gRemoteService = nullptr;
}
#endif
@@ -46,7 +46,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
return LaunchChild(false, true);
}
-@@ -4707,6 +4724,23 @@
+@@ -4711,6 +4728,23 @@
const char* display_name = nullptr;
bool saveDisplayArg = false;
@@ -70,7 +70,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
// display_name is owned by gdk.
display_name = gdk_get_display_arg_name();
// if --display argument is given make sure it's
-@@ -4716,7 +4750,6 @@
+@@ -4720,7 +4754,6 @@
saveDisplayArg = true;
}
@@ -78,7 +78,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
// On Wayland disabled builds read X11 DISPLAY env exclusively
// and don't care about different displays.
if (!waylandEnabled && !display_name) {
-@@ -5918,6 +5951,7 @@
+@@ -5954,6 +5987,7 @@
if (!gfxPlatform::IsHeadless()) {
# ifdef MOZ_WAYLAND
WaylandDisplayRelease();