diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2019-09-18 16:54:21 +0300 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-19 15:27:31 +0100 |
| commit | dd3f364b5eac37e71f1645b19b816b4b9d72dc08 (patch) | |
| tree | 1fdbd89f68f494be7271d01f956557d4d50b6d45 /eclass | |
| parent | dev-qt: Drop Qt 5.12.3 (diff) | |
| download | gentoo-dd3f364b5eac37e71f1645b19b816b4b9d72dc08.tar.gz gentoo-dd3f364b5eac37e71f1645b19b816b4b9d72dc08.tar.bz2 gentoo-dd3f364b5eac37e71f1645b19b816b4b9d72dc08.zip | |
qt5-build.eclass: adjust configure options for >=5.15
Upstream has removed the -qt-xcb, -system-xcb, -xkb, -xcb-xinput
switches [1] in 5.15 and 6.0.
1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index e1b32e71ab4f..3f6e76ec2fb7 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -569,7 +569,11 @@ qt5_base_configure() { -no-freetype -no-harfbuzz -no-openssl -no-libproxy -no-xcb-xlib - -no-xcb-xinput -no-xkbcommon # bug 672340 + + # bug 672340 + -no-xkbcommon + $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput) + $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput) # cannot use -no-gif because there is no way to override it later #-no-gif @@ -617,7 +621,7 @@ qt5_base_configure() { # disable undocumented X11-related flags, override in qtgui # (not shown in ./configure -help output) - -no-xkb + $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262 |