| 1 |
commit: cc7af6de212bf63a2cf4d51a0e2ad00c4255da1e |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 23 20:56:01 2015 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 23 20:56:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cc7af6de |
| 7 |
|
| 8 |
[dev-qt/qtgui:5] Rework how we enable/disable certain plugins. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20 |
| 11 |
|
| 12 |
dev-qt/qtgui/qtgui-5.5.0_rc.ebuild | 13 ++++++------- |
| 13 |
dev-qt/qtgui/qtgui-5.5.9999.ebuild | 13 ++++++------- |
| 14 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 13 ++++++------- |
| 15 |
3 files changed, 18 insertions(+), 21 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild |
| 18 |
index dc1a65f..2ec9eca 100644 |
| 19 |
--- a/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild |
| 20 |
+++ b/dev-qt/qtgui/qtgui-5.5.0_rc.ebuild |
| 21 |
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( |
| 22 |
src/plugins/generic |
| 23 |
src/plugins/imageformats |
| 24 |
src/plugins/platforms |
| 25 |
+ src/plugins/platforminputcontexts |
| 26 |
+ src/plugins/platformthemes |
| 27 |
) |
| 28 |
|
| 29 |
QT5_GENTOO_CONFIG=( |
| 30 |
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( |
| 31 |
xcb::XKB |
| 32 |
) |
| 33 |
|
| 34 |
-pkg_setup() { |
| 35 |
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) |
| 36 |
- use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) |
| 37 |
- use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) |
| 38 |
- |
| 39 |
+src_prepare() { |
| 40 |
# egl_x11 is activated when both egl and xcb are enabled |
| 41 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 42 |
-} |
| 43 |
|
| 44 |
-src_prepare() { |
| 45 |
# avoid automagic dep on qtdbus |
| 46 |
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 47 |
src/platformsupport/platformsupport.pro || die |
| 48 |
|
| 49 |
+ qt_use_disable_mod ibus dbus \ |
| 50 |
+ src/plugins/platforminputcontexts/platforminputcontexts.pro |
| 51 |
+ |
| 52 |
# avoid automagic dep on qtnetwork |
| 53 |
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ |
| 54 |
src/plugins/generic/generic.pro || die |
| 55 |
|
| 56 |
diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild |
| 57 |
index dc1a65f..2ec9eca 100644 |
| 58 |
--- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild |
| 59 |
+++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild |
| 60 |
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( |
| 61 |
src/plugins/generic |
| 62 |
src/plugins/imageformats |
| 63 |
src/plugins/platforms |
| 64 |
+ src/plugins/platforminputcontexts |
| 65 |
+ src/plugins/platformthemes |
| 66 |
) |
| 67 |
|
| 68 |
QT5_GENTOO_CONFIG=( |
| 69 |
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( |
| 70 |
xcb::XKB |
| 71 |
) |
| 72 |
|
| 73 |
-pkg_setup() { |
| 74 |
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) |
| 75 |
- use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) |
| 76 |
- use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) |
| 77 |
- |
| 78 |
+src_prepare() { |
| 79 |
# egl_x11 is activated when both egl and xcb are enabled |
| 80 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 81 |
-} |
| 82 |
|
| 83 |
-src_prepare() { |
| 84 |
# avoid automagic dep on qtdbus |
| 85 |
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 86 |
src/platformsupport/platformsupport.pro || die |
| 87 |
|
| 88 |
+ qt_use_disable_mod ibus dbus \ |
| 89 |
+ src/plugins/platforminputcontexts/platforminputcontexts.pro |
| 90 |
+ |
| 91 |
# avoid automagic dep on qtnetwork |
| 92 |
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ |
| 93 |
src/plugins/generic/generic.pro || die |
| 94 |
|
| 95 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 96 |
index dc1a65f..2ec9eca 100644 |
| 97 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 98 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 99 |
@@ -81,6 +81,8 @@ QT5_TARGET_SUBDIRS=( |
| 100 |
src/plugins/generic |
| 101 |
src/plugins/imageformats |
| 102 |
src/plugins/platforms |
| 103 |
+ src/plugins/platforminputcontexts |
| 104 |
+ src/plugins/platformthemes |
| 105 |
) |
| 106 |
|
| 107 |
QT5_GENTOO_CONFIG=( |
| 108 |
@@ -119,20 +121,17 @@ QT5_GENTOO_CONFIG=( |
| 109 |
xcb::XKB |
| 110 |
) |
| 111 |
|
| 112 |
-pkg_setup() { |
| 113 |
- use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) |
| 114 |
- use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) |
| 115 |
- use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) |
| 116 |
- |
| 117 |
+src_prepare() { |
| 118 |
# egl_x11 is activated when both egl and xcb are enabled |
| 119 |
use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 120 |
-} |
| 121 |
|
| 122 |
-src_prepare() { |
| 123 |
# avoid automagic dep on qtdbus |
| 124 |
use dbus || sed -i -e 's/contains(QT_CONFIG, dbus)/false/' \ |
| 125 |
src/platformsupport/platformsupport.pro || die |
| 126 |
|
| 127 |
+ qt_use_disable_mod ibus dbus \ |
| 128 |
+ src/plugins/platforminputcontexts/platforminputcontexts.pro |
| 129 |
+ |
| 130 |
# avoid automagic dep on qtnetwork |
| 131 |
use tuio || sed -i -e '/SUBDIRS += tuiotouch/d' \ |
| 132 |
src/plugins/generic/generic.pro || die |
Archives