de0b4fba2f
Qt's configure grabs the path to xkb's data root during configure, but the build changes in 5.8 apparently broke the handling for cross builds. As a result, the string embedded in the binary depends on whether or not some files are present in the builder's filesystem. The "-xkb-config-root" configure setting is intended to allow manual overriding but it is also broken. See: https://bugreports.qt.io/browse/QTBUG-60005 This has since been fixed upstream, so just hard-code the path for now. We can drop this patch when we bump to a fixed Qt. Also, fix the "-qt-xkbcommon-x11" config param which was renamed. This does not appear to affect build results, presumably because auto-detection is working, but it does not hurt to be explicit.
27 lines
749 B
Diff
27 lines
749 B
Diff
--- old/qtbase/src/gui/configure.pri 2018-06-06 17:28:10.000000000 -0400
|
|
+++ new/qtbase/src/gui/configure.pri 2018-08-17 18:43:01.589384567 -0400
|
|
@@ -43,18 +43,11 @@
|
|
}
|
|
|
|
defineTest(qtConfTest_xkbConfigRoot) {
|
|
- qtConfTest_getPkgConfigVariable($${1}): return(true)
|
|
-
|
|
- for (dir, $$list("/usr/share/X11/xkb", "/usr/local/share/X11/xkb")) {
|
|
- exists($$dir) {
|
|
- $${1}.value = $$dir
|
|
- export($${1}.value)
|
|
- $${1}.cache += value
|
|
- export($${1}.cache)
|
|
- return(true)
|
|
- }
|
|
- }
|
|
- return(false)
|
|
+ $${1}.value = "/usr/share/X11/xkb"
|
|
+ export($${1}.value)
|
|
+ $${1}.cache += value
|
|
+ export($${1}.cache)
|
|
+ return(true)
|
|
}
|
|
|
|
defineTest(qtConfTest_qpaDefaultPlatform) {
|