Commit 9dc11959 authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Fix crash when DISPLAY is unset

parent c6e7266b
webkit2gtk (2.28.2-2) UNRELEASED; urgency=medium
* debian/patches/dont-fallback-to-libwpe.patch:
+ Fix crash when DISPLAY is unset (Closes: #956219).
-- Alberto Garcia <berto@igalia.com> Mon, 27 Apr 2020 14:55:16 +0200
webkit2gtk (2.28.2-1) unstable; urgency=high
* New upstream release (Closes: #956837).
......
From: Alberto Garcia <berto@igalia.com>
Subject: Don't create a PlatformDisplayLibWPE as a fallback when using Wayland or X11
Origin: https://trac.webkit.org/changeset/260750
Bug: https://bugs.webkit.org/show_bug.cgi?id=209431
Bug-Debian: https://bugs.debian.org/956219
Index: webkitgtk/Source/WebCore/platform/graphics/PlatformDisplay.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/platform/graphics/PlatformDisplay.cpp
+++ webkitgtk/Source/WebCore/platform/graphics/PlatformDisplay.cpp
@@ -90,12 +90,6 @@ std::unique_ptr<PlatformDisplay> Platfor
}
#endif // PLATFORM(GTK)
-#if USE(WPE_RENDERER)
- return PlatformDisplayLibWPE::create();
-#elif PLATFORM(WIN)
- return PlatformDisplayWin::create();
-#endif
-
#if PLATFORM(WAYLAND)
if (auto platformDisplay = PlatformDisplayWayland::create())
return platformDisplay;
@@ -113,6 +107,12 @@ std::unique_ptr<PlatformDisplay> Platfor
return PlatformDisplayX11::create(nullptr);
#endif
+#if USE(WPE_RENDERER)
+ return PlatformDisplayLibWPE::create();
+#elif PLATFORM(WIN)
+ return PlatformDisplayWin::create();
+#endif
+
RELEASE_ASSERT_NOT_REACHED();
}
......@@ -8,3 +8,4 @@ user-agent-branding.patch
prefer-pthread.patch
dont-detect-sse2.patch
reduce-memory-overheads.patch
dont-fallback-to-libwpe.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment