| 1 |
commit: 5fa116b5b64531687d673a31455ce252180d67d4 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 28 12:55:44 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 28 12:55:44 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5fa116b5 |
| 7 |
|
| 8 |
[dev-qt/qtgui:5] Fix xkb and xkbcommon support. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/qtgui/qtgui-5.3.1.ebuild | 5 ++++- |
| 14 |
dev-qt/qtgui/qtgui-5.3.9999.ebuild | 5 ++++- |
| 15 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 5 ++++- |
| 16 |
3 files changed, 12 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtgui/qtgui-5.3.1.ebuild b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 19 |
index ee936d2..88324f7 100644 |
| 20 |
--- a/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 21 |
+++ b/dev-qt/qtgui/qtgui-5.3.1.ebuild |
| 22 |
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=( |
| 23 |
xcb:xcb-sm:SESSIONMANAGER |
| 24 |
xcb:xcb-xlib: |
| 25 |
xcb:xinput2: |
| 26 |
+ xcb::XKB |
| 27 |
) |
| 28 |
|
| 29 |
pkg_setup() { |
| 30 |
@@ -144,7 +145,9 @@ src_configure() { |
| 31 |
$(qt_use kms) |
| 32 |
$(qt_use png libpng system) |
| 33 |
$(qt_use udev libudev) |
| 34 |
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm) |
| 35 |
+ $(qt_use xcb xcb system) |
| 36 |
+ $(qt_use xcb xkbcommon system) |
| 37 |
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
| 38 |
) |
| 39 |
qt5-build_src_configure |
| 40 |
} |
| 41 |
|
| 42 |
diff --git a/dev-qt/qtgui/qtgui-5.3.9999.ebuild b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 43 |
index ee936d2..88324f7 100644 |
| 44 |
--- a/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 45 |
+++ b/dev-qt/qtgui/qtgui-5.3.9999.ebuild |
| 46 |
@@ -107,6 +107,7 @@ QT5_GENTOO_CONFIG=( |
| 47 |
xcb:xcb-sm:SESSIONMANAGER |
| 48 |
xcb:xcb-xlib: |
| 49 |
xcb:xinput2: |
| 50 |
+ xcb::XKB |
| 51 |
) |
| 52 |
|
| 53 |
pkg_setup() { |
| 54 |
@@ -144,7 +145,9 @@ src_configure() { |
| 55 |
$(qt_use kms) |
| 56 |
$(qt_use png libpng system) |
| 57 |
$(qt_use udev libudev) |
| 58 |
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm) |
| 59 |
+ $(qt_use xcb xcb system) |
| 60 |
+ $(qt_use xcb xkbcommon system) |
| 61 |
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
| 62 |
) |
| 63 |
qt5-build_src_configure |
| 64 |
} |
| 65 |
|
| 66 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 67 |
index a755ca2..8f5e29e 100644 |
| 68 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 69 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 70 |
@@ -108,6 +108,7 @@ QT5_GENTOO_CONFIG=( |
| 71 |
xcb:xcb-sm:SESSIONMANAGER |
| 72 |
xcb:xcb-xlib: |
| 73 |
xcb:xinput2: |
| 74 |
+ xcb::XKB |
| 75 |
) |
| 76 |
|
| 77 |
pkg_setup() { |
| 78 |
@@ -145,7 +146,9 @@ src_configure() { |
| 79 |
$(qt_use kms) |
| 80 |
$(qt_use png libpng system) |
| 81 |
$(qt_use udev libudev) |
| 82 |
- $(use xcb && echo -xcb -xcb-xlib -xinput2 -xrender -sm) |
| 83 |
+ $(qt_use xcb xcb system) |
| 84 |
+ $(qt_use xcb xkbcommon system) |
| 85 |
+ $(use xcb && echo -sm -xcb-xlib -xinput2 -xkb -xrender) |
| 86 |
) |
| 87 |
qt5-build_src_configure |
| 88 |
} |
Archives