aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-03 20:25:56 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-05 23:16:55 +0100
commitf9544410874f4ce26fcd140e1da08c7c1be2073a (patch)
treee70b37547ed6994b32e5f791dc1ff460aa743078
parentdev-qt/qtwayland: Cover new sightings of xkbcommon-evdev (diff)
downloadqt-f9544410874f4ce26fcd140e1da08c7c1be2073a.tar.gz
qt-f9544410874f4ce26fcd140e1da08c7c1be2073a.tar.bz2
qt-f9544410874f4ce26fcd140e1da08c7c1be2073a.zip
dev-qt/qtgui: bundled xkbcommon is gone, option renamed to xkbcommon
See also: https://bugreports.qt.io/browse/QTBUG-65503 Closes: https://bugs.gentoo.org/672340 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qtgui/qtgui-5.12.9999.ebuild11
-rw-r--r--dev-qt/qtgui/qtgui-5.9999.ebuild11
2 files changed, 12 insertions, 10 deletions
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
index 6f6d4286..e8a19fd9 100644
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
+ >=x11-libs/libxkbcommon-0.5.0[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
@@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
libinput
- libinput:xkbcommon-evdev:
+ libinput:xkbcommon:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -156,14 +156,15 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon-x11 system)
$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
+ if use libinput || use xcb; then
+ myconf+=( -xkbcommon )
+ fi
qt5-build_src_configure
}
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 6f6d4286..e8a19fd9 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -55,7 +55,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
>=x11-libs/libxcb-1.12:=[xkb]
- >=x11-libs/libxkbcommon-0.4.1[X]
+ >=x11-libs/libxkbcommon-0.5.0[X]
x11-libs/xcb-util-image
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-renderutil
@@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=(
jpeg:system-jpeg:IMAGEFORMAT_JPEG
!jpeg:no-jpeg:
libinput
- libinput:xkbcommon-evdev:
+ libinput:xkbcommon:
:opengl
png:png:
png:system-png:IMAGEFORMAT_PNG
@@ -156,14 +156,15 @@ src_configure() {
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
- $(qt_use libinput xkbcommon-evdev)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
$(qt_use xcb xcb system)
- $(qt_use xcb xkbcommon-x11 system)
$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
+ if use libinput || use xcb; then
+ myconf+=( -xkbcommon )
+ fi
qt5-build_src_configure
}