commit: aedf3c8fa0f6c7d4443c1e3d1bc1d730193c7aa9
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 20:23:42 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 20:23:42 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aedf3c8f
dev-qt/qt{gui,widgets}: gtkstyle has been removed from qtbase for 5.7
See qtbase commit 899a815414e95da8d9429a4a4f4d7094e49cfc55
Gentoo-Bug: 558976
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qtgui/metadata.xml | 3 ++-
dev-qt/qtgui/qtgui-5.9999.ebuild | 10 +++++-----
dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 5 ++---
eclass/qt5-build.eclass | 5 +----
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index b2868d4..7437fb3 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -10,7 +10,8 @@
inside the event loop (recommended by upstream)</flag>
<flag name="gles2">Use GLES 2.0 or later instead of full
OpenGL</flag>
<flag name="glib">Enable integration with the
<pkg>dev-libs/glib</pkg> event loop</flag>
- <flag name="gtkstyle">Build a Qt style called GTK+ that mimics
the active GTK+ theme</flag>
+ <flag name="gtk">Build the GTK platform theme plugin</flag>
+ <flag name="gtkstyle">Build a widgets style that mimics the
active GTK+ theme</flag>
<flag name="ibus">Build the IBus input method plugin</flag>
<flag name="libinput">Enable support for input devices via
<pkg>dev-libs/libinput</pkg></flag>
<flag name="qt3support">Enable the Qt3Support libraries for
Qt4. Note that
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index 507b6d3..3c23bec 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -14,7 +14,7 @@ fi
# TODO: directfb, linuxfb, kms integration in eglfs
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
ibus jpeg libinput +png tslib tuio +udev +xcb"
REQUIRED_USE="
|| ( eglfs xcb )
@@ -35,8 +35,9 @@ RDEPEND="
dbus? ( ~dev-qt/qtdbus-${PV} )
egl? ( media-libs/mesa[egl] )
evdev? ( sys-libs/mtdev )
- gtkstyle? (
+ gtk? (
x11-libs/gtk+:2
+ x11-libs/libX11
x11-libs/pango
!!x11-libs/cairo[qt4]
)
@@ -96,8 +97,7 @@ QT5_GENTOO_CONFIG=(
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
- gtkstyle:gtkstyle:
- gtkstyle:gtk2:STYLE_GTK
+ gtk:gtk2:
!:no-gui:
:system-harfbuzz:HARFBUZZ
!:no-harfbuzz:
@@ -149,7 +149,7 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
- $(qt_use gtkstyle)
+ $(qt_use gtk)
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
index 83886f4..fb5942b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
# keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +png +xcb"
+IUSE="gles2 +png +xcb"
DEPEND="
~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
+ ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
"
RDEPEND="${DEPEND}"
@@ -32,7 +32,6 @@ QT5_GENTOO_CONFIG=(
src_configure() {
local myconf=(
- $(qt_use gtkstyle)
-opengl $(usex gles2 es2 desktop)
$(qt_use png libpng system)
$(qt_use xcb xcb system)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0359315..07780cb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -562,10 +562,7 @@ qt5_base_configure() {
# disable everything to prevent automagic deps (part 2)
-no-pulseaudio -no-alsa
-
- # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is
blocked
- # to avoid adding qt4 include paths (bug 433826)
- -no-gtkstyle
+ $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo
-no-gtkstyle)
# exclude examples and tests from default build
-nomake examples
