diff options
| -rw-r--r-- | firefox.spec | 2 | ||||
| -rw-r--r-- | mozilla-1522780.patch | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec index f9cda33..9df6a1b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -130,6 +130,7 @@ Patch417: bug1375074-save-restore-x28.patch # Wayland specific upstream patches Patch574: firefox-pipewire.patch +Patch575: mozilla-1522780.patch # PGO/LTO patches Patch600: pgo.patch @@ -334,6 +335,7 @@ This package contains results of tests executed during build. # TODO %patch574 -p1 -b .firefox-pipewire %endif +%patch575 -p1 -b .1522780 # PGO patches %patch600 -p1 -b .pgo diff --git a/mozilla-1522780.patch b/mozilla-1522780.patch new file mode 100644 index 0000000..9b771b0 --- /dev/null +++ b/mozilla-1522780.patch @@ -0,0 +1,25 @@ +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3622,12 +3622,15 @@ + + bool disableWayland = true; + # if defined(MOZ_WAYLAND) +- // Make X11 backend the default one. +- // Enable Wayland backend only when GDK_BACKEND is set and +- // Gtk+ >= 3.22 where we can expect recent enough ++ // Enable Wayland on Gtk+ >= 3.22 where we can expect recent enough + // compositor & libwayland interface. +- disableWayland = (PR_GetEnv("GDK_BACKEND") == nullptr) || +- (gtk_check_version(3, 22, 0) != nullptr); ++ disableWayland = (gtk_check_version(3, 22, 0) != nullptr); ++ if (!disableWayland) { ++ // Make X11 backend the default one unless MOZ_ENABLE_WAYLAND or ++ // GDK_BACKEND are specified. ++ disableWayland = (PR_GetEnv("GDK_BACKEND") == nullptr) && ++ (PR_GetEnv("MOZ_ENABLE_WAYLAND") == nullptr); ++ } + # endif + // On Wayland disabled builds read X11 DISPLAY env exclusively + // and don't care about different displays. + |