summaryrefslogtreecommitdiffstats
path: root/deps/qt5/patches/qt5.qtbug-55583.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-02-15 17:50:19 +0100
committer Eric Hameleers <alien@slackware.com>2020-02-15 17:50:19 +0100
commitd54fbdec265cf449cdb4910268b2d242e4f1f997 (patch)
tree2d701d0ea243ac94276620c171c98ca63b3b0e3c /deps/qt5/patches/qt5.qtbug-55583.patch
parenta850a9990982e8fba1b5f008c18b9567d767e6e7 (diff)
downloadktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.gz
ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.xz
Remove deps that are now part of Slackware
OpenAL got added to Slackware as 'openal-soft'; SDL_sound is now part of the Slackware 'sdl' package; libxkbcommon and qt5 were added to Slackware in the 'L' series.
Diffstat (limited to 'deps/qt5/patches/qt5.qtbug-55583.patch')
-rw-r--r--deps/qt5/patches/qt5.qtbug-55583.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/deps/qt5/patches/qt5.qtbug-55583.patch b/deps/qt5/patches/qt5.qtbug-55583.patch
deleted file mode 100644
index 804f538..0000000
--- a/deps/qt5/patches/qt5.qtbug-55583.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# https://github.com/qt/qtbase/commit/84ea00d4.patch
-#
-From 84ea00d47049d882f2fabf1446ec6c6eb5fe3038 Mon Sep 17 00:00:00 2001
-From: J-P Nurmi <jpnurmi@qt.io>
-Date: Tue, 6 Dec 2016 16:30:31 +0100
-Subject: [PATCH] QGtk3Dialog: don't crash on Wayland
-
-Check if it's an X11 window before calling XSetTransientForHint().
-No transient parent will be set for GTK+ dialogs on Wayland. That
-has to be implemented separately.
-
-Task-number: QTBUG-55583
-Change-Id: Iabc2a72681c8157bb2f2fe500892853aa397106b
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
-index ba5089a..699b058 100644
---- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
-+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
-@@ -135,10 +135,12 @@ bool QGtk3Dialog::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWind
-
- GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget);
- if (parent) {
-- GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
-- XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
-- gdk_x11_window_get_xid(gdkWindow),
-- parent->winId());
-+ if (GDK_IS_X11_WINDOW(gdkWindow)) {
-+ GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
-+ XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
-+ gdk_x11_window_get_xid(gdkWindow),
-+ parent->winId());
-+ }
- }
-
- if (modality != Qt::NonModal) {