summaryrefslogtreecommitdiff
path: root/dev-qt/qtgui/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-qt/qtgui/files
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-qt/qtgui/files')
-rw-r--r--dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
new file mode 100644
index 000000000000..6f63a6371ad7
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
@@ -0,0 +1,34 @@
+From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Wed, 6 Nov 2019 00:54:57 +0200
+Subject: [PATCH] Fix build with -xcb and -no-libinput
+
+Since a34e81ab [1], 'xkbcommon_support' is under
+'src/platformsupport/input', and will not be defined when building
+with -no-libinput, and as such, 'xkbcommon_support-private' added in
+'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
+
+1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
+
+Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
+Gentoo-bug: https://bugs.gentoo.org/699110
+Suggested-by: Petr Zima <zima@matfyz.cz>
+---
+ src/platformsupport/platformsupport.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
+index 6d4f1b93bd1..877665ff06b 100644
+--- a/src/platformsupport/platformsupport.pro
++++ b/src/platformsupport/platformsupport.pro
+@@ -11,7 +11,7 @@ SUBDIRS = \
+ qtConfig(freetype)|darwin|win32: \
+ SUBDIRS += fontdatabases
+
+-qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
++qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
+ SUBDIRS += input
+ input.depends += devicediscovery
+ }
+--
+2.16.3