commit: a606936208398a61e35dd4846926be872ce0b466
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 8 23:23:53 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 8 23:23:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a6069362
[dev-qt/qtwidgets] Introduce USE=xcb to fix bug 522382.
Initial patch by Timo Rothenpieler <timo <AT> rothenpieler.org>
Package-Manager: portage-2.2.12
---
dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild | 9 +++++++--
dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild | 9 +++++++--
dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild | 9 +++++++--
dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 9 +++++++--
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
index 208edc0..44e9340 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
REQUIRED_USE="
gles2? ( opengl )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+ ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
"
RDEPEND="${DEPEND}"
@@ -51,8 +52,12 @@ src_configure() {
fi
local myconf=(
+ # copied from qtgui
${gl}
$(qt_use png libpng system)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
index 208edc0..44e9340 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
REQUIRED_USE="
gles2? ( opengl )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+ ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
"
RDEPEND="${DEPEND}"
@@ -51,8 +52,12 @@ src_configure() {
fi
local myconf=(
+ # copied from qtgui
${gl}
$(qt_use png libpng system)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
index 1aa1cf4..aa70372 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
REQUIRED_USE="
gles2? ( opengl )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+ ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
"
RDEPEND="${DEPEND}"
@@ -45,8 +46,12 @@ src_configure() {
fi
local myconf=(
+ # copied from qtgui
${gl}
$(qt_use png libpng system)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
index 1aa1cf4..aa70372 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
REQUIRED_USE="
gles2? ( opengl )
"
DEPEND="
~dev-qt/qtcore-${PV}[debug=]
- ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+ ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
"
RDEPEND="${DEPEND}"
@@ -45,8 +46,12 @@ src_configure() {
fi
local myconf=(
+ # copied from qtgui
${gl}
$(qt_use png libpng system)
+ $(qt_use xcb xcb system)
+ $(qt_use xcb xkbcommon system)
+ $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
}
