| 1 |
commit: aedf3c8fa0f6c7d4443c1e3d1bc1d730193c7aa9 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 20:23:42 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 20:23:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=aedf3c8f |
| 7 |
|
| 8 |
dev-qt/qt{gui,widgets}: gtkstyle has been removed from qtbase for 5.7 |
| 9 |
|
| 10 |
See qtbase commit 899a815414e95da8d9429a4a4f4d7094e49cfc55 |
| 11 |
|
| 12 |
Gentoo-Bug: 558976 |
| 13 |
|
| 14 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-qt/qtgui/metadata.xml | 3 ++- |
| 17 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 10 +++++----- |
| 18 |
dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 5 ++--- |
| 19 |
eclass/qt5-build.eclass | 5 +---- |
| 20 |
4 files changed, 10 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml |
| 23 |
index b2868d4..7437fb3 100644 |
| 24 |
--- a/dev-qt/qtgui/metadata.xml |
| 25 |
+++ b/dev-qt/qtgui/metadata.xml |
| 26 |
@@ -10,7 +10,8 @@ |
| 27 |
inside the event loop (recommended by upstream)</flag> |
| 28 |
<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag> |
| 29 |
<flag name="glib">Enable integration with the <pkg>dev-libs/glib</pkg> event loop</flag> |
| 30 |
- <flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active GTK+ theme</flag> |
| 31 |
+ <flag name="gtk">Build the GTK platform theme plugin</flag> |
| 32 |
+ <flag name="gtkstyle">Build a widgets style that mimics the active GTK+ theme</flag> |
| 33 |
<flag name="ibus">Build the IBus input method plugin</flag> |
| 34 |
<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> |
| 35 |
<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that |
| 36 |
|
| 37 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 38 |
index 507b6d3..3c23bec 100644 |
| 39 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 40 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 41 |
@@ -14,7 +14,7 @@ fi |
| 42 |
|
| 43 |
# TODO: directfb, linuxfb, kms integration in eglfs |
| 44 |
|
| 45 |
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtkstyle |
| 46 |
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk |
| 47 |
ibus jpeg libinput +png tslib tuio +udev +xcb" |
| 48 |
REQUIRED_USE=" |
| 49 |
|| ( eglfs xcb ) |
| 50 |
@@ -35,8 +35,9 @@ RDEPEND=" |
| 51 |
dbus? ( ~dev-qt/qtdbus-${PV} ) |
| 52 |
egl? ( media-libs/mesa[egl] ) |
| 53 |
evdev? ( sys-libs/mtdev ) |
| 54 |
- gtkstyle? ( |
| 55 |
+ gtk? ( |
| 56 |
x11-libs/gtk+:2 |
| 57 |
+ x11-libs/libX11 |
| 58 |
x11-libs/pango |
| 59 |
!!x11-libs/cairo[qt4] |
| 60 |
) |
| 61 |
@@ -96,8 +97,7 @@ QT5_GENTOO_CONFIG=( |
| 62 |
!gif:no-gif: |
| 63 |
gles2::OPENGL_ES |
| 64 |
gles2:opengles2:OPENGL_ES_2 |
| 65 |
- gtkstyle:gtkstyle: |
| 66 |
- gtkstyle:gtk2:STYLE_GTK |
| 67 |
+ gtk:gtk2: |
| 68 |
!:no-gui: |
| 69 |
:system-harfbuzz:HARFBUZZ |
| 70 |
!:no-harfbuzz: |
| 71 |
@@ -149,7 +149,7 @@ src_configure() { |
| 72 |
-fontconfig |
| 73 |
-system-freetype |
| 74 |
$(usex gif '' -no-gif) |
| 75 |
- $(qt_use gtkstyle) |
| 76 |
+ $(qt_use gtk) |
| 77 |
-system-harfbuzz |
| 78 |
$(qt_use jpeg libjpeg system) |
| 79 |
$(qt_use libinput) |
| 80 |
|
| 81 |
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild |
| 82 |
index 83886f4..fb5942b 100644 |
| 83 |
--- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild |
| 84 |
+++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild |
| 85 |
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
| 86 |
fi |
| 87 |
|
| 88 |
# keep IUSE defaults in sync with qtgui |
| 89 |
-IUSE="gles2 gtkstyle +png +xcb" |
| 90 |
+IUSE="gles2 +png +xcb" |
| 91 |
|
| 92 |
DEPEND=" |
| 93 |
~dev-qt/qtcore-${PV} |
| 94 |
- ~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?] |
| 95 |
+ ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?] |
| 96 |
" |
| 97 |
RDEPEND="${DEPEND}" |
| 98 |
|
| 99 |
@@ -32,7 +32,6 @@ QT5_GENTOO_CONFIG=( |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
local myconf=( |
| 103 |
- $(qt_use gtkstyle) |
| 104 |
-opengl $(usex gles2 es2 desktop) |
| 105 |
$(qt_use png libpng system) |
| 106 |
$(qt_use xcb xcb system) |
| 107 |
|
| 108 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 109 |
index 0359315..07780cb 100644 |
| 110 |
--- a/eclass/qt5-build.eclass |
| 111 |
+++ b/eclass/qt5-build.eclass |
| 112 |
@@ -562,10 +562,7 @@ qt5_base_configure() { |
| 113 |
|
| 114 |
# disable everything to prevent automagic deps (part 2) |
| 115 |
-no-pulseaudio -no-alsa |
| 116 |
- |
| 117 |
- # override in qtgui and qtwidgets where x11-libs/cairo[qt4] is blocked |
| 118 |
- # to avoid adding qt4 include paths (bug 433826) |
| 119 |
- -no-gtkstyle |
| 120 |
+ $([[ ${QT5_MINOR_VERSION} -ge 7 ]] && echo -no-gtk || echo -no-gtkstyle) |
| 121 |
|
| 122 |
# exclude examples and tests from default build |
| 123 |
-nomake examples |
Archives