| 1 |
commit: 8f09798b3c427b6c40fc8747aa47e407381713ee |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 15 13:10:29 2018 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 15 13:14:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8f09798b |
| 7 |
|
| 8 |
dev-qt/qtgui: update 5.12 configure and dependencies |
| 9 |
|
| 10 |
With the 'xinput2' feature replaced by 'xcb-xinput', bump |
| 11 |
the minimum required 'x11-libs/libxcb' version, and remove |
| 12 |
'x11-libs/libXi'. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.46, Repoman-2.3.10 |
| 15 |
|
| 16 |
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 7 +++---- |
| 17 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 7 +++---- |
| 18 |
2 files changed, 6 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 21 |
index c8309dc2..6f6d4286 100644 |
| 22 |
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 23 |
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 24 |
@@ -54,8 +54,7 @@ RDEPEND=" |
| 25 |
x11-libs/libICE |
| 26 |
x11-libs/libSM |
| 27 |
x11-libs/libX11 |
| 28 |
- >=x11-libs/libXi-1.7.5 |
| 29 |
- >=x11-libs/libxcb-1.10:=[xkb] |
| 30 |
+ >=x11-libs/libxcb-1.12:=[xkb] |
| 31 |
>=x11-libs/libxkbcommon-0.4.1[X] |
| 32 |
x11-libs/xcb-util-image |
| 33 |
x11-libs/xcb-util-keysyms |
| 34 |
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=( |
| 35 |
xcb:xcb-render: |
| 36 |
xcb:xcb-sm: |
| 37 |
xcb:xcb-xlib: |
| 38 |
- xcb:xinput2: |
| 39 |
+ xcb:xcb-xinput: |
| 40 |
xcb::XKB |
| 41 |
) |
| 42 |
|
| 43 |
@@ -164,7 +163,7 @@ src_configure() { |
| 44 |
$(qt_use udev libudev) |
| 45 |
$(qt_use xcb xcb system) |
| 46 |
$(qt_use xcb xkbcommon-x11 system) |
| 47 |
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '') |
| 48 |
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
| 49 |
) |
| 50 |
qt5-build_src_configure |
| 51 |
} |
| 52 |
|
| 53 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 54 |
index c8309dc2..6f6d4286 100644 |
| 55 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 56 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 57 |
@@ -54,8 +54,7 @@ RDEPEND=" |
| 58 |
x11-libs/libICE |
| 59 |
x11-libs/libSM |
| 60 |
x11-libs/libX11 |
| 61 |
- >=x11-libs/libXi-1.7.5 |
| 62 |
- >=x11-libs/libxcb-1.10:=[xkb] |
| 63 |
+ >=x11-libs/libxcb-1.12:=[xkb] |
| 64 |
>=x11-libs/libxkbcommon-0.4.1[X] |
| 65 |
x11-libs/xcb-util-image |
| 66 |
x11-libs/xcb-util-keysyms |
| 67 |
@@ -116,7 +115,7 @@ QT5_GENTOO_CONFIG=( |
| 68 |
xcb:xcb-render: |
| 69 |
xcb:xcb-sm: |
| 70 |
xcb:xcb-xlib: |
| 71 |
- xcb:xinput2: |
| 72 |
+ xcb:xcb-xinput: |
| 73 |
xcb::XKB |
| 74 |
) |
| 75 |
|
| 76 |
@@ -164,7 +163,7 @@ src_configure() { |
| 77 |
$(qt_use udev libudev) |
| 78 |
$(qt_use xcb xcb system) |
| 79 |
$(qt_use xcb xkbcommon-x11 system) |
| 80 |
- $(usex xcb '-xcb-xlib -xinput2 -xkb' '') |
| 81 |
+ $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
| 82 |
) |
| 83 |
qt5-build_src_configure |
| 84 |
} |
Archives