| 1 |
commit: 89f342721be920c796ac7323454746fd4f661c8f |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 24 08:05:47 2014 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 24 08:05:47 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=89f34272 |
| 7 |
|
| 8 |
[dev-qt/qtwebkit] Remove widgets USE flag wrt bug #448178. |
| 9 |
|
| 10 |
It can cause build failure and it's not currently possible to easily make |
| 11 |
it properly optional. |
| 12 |
|
| 13 |
--- |
| 14 |
dev-qt/assistant/assistant-5.3.9999.ebuild | 2 +- |
| 15 |
dev-qt/assistant/assistant-5.4.0_alpha.ebuild | 2 +- |
| 16 |
dev-qt/assistant/assistant-5.4.9999.ebuild | 2 +- |
| 17 |
dev-qt/assistant/assistant-5.9999.ebuild | 2 +- |
| 18 |
dev-qt/designer/designer-5.3.9999.ebuild | 2 +- |
| 19 |
dev-qt/designer/designer-5.4.0_alpha.ebuild | 2 +- |
| 20 |
dev-qt/designer/designer-5.4.9999.ebuild | 2 +- |
| 21 |
dev-qt/designer/designer-5.9999.ebuild | 2 +- |
| 22 |
dev-qt/qtquick1/qtquick1-5.3.9999.ebuild | 2 +- |
| 23 |
dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild | 2 +- |
| 24 |
dev-qt/qtquick1/qtquick1-5.4.9999.ebuild | 2 +- |
| 25 |
dev-qt/qtquick1/qtquick1-5.9999.ebuild | 2 +- |
| 26 |
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 6 ++---- |
| 27 |
dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild | 6 ++---- |
| 28 |
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 6 ++---- |
| 29 |
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 6 ++---- |
| 30 |
16 files changed, 20 insertions(+), 28 deletions(-) |
| 31 |
|
| 32 |
diff --git a/dev-qt/assistant/assistant-5.3.9999.ebuild b/dev-qt/assistant/assistant-5.3.9999.ebuild |
| 33 |
index b26acbc..43473b7 100644 |
| 34 |
--- a/dev-qt/assistant/assistant-5.3.9999.ebuild |
| 35 |
+++ b/dev-qt/assistant/assistant-5.3.9999.ebuild |
| 36 |
@@ -26,7 +26,7 @@ DEPEND=" |
| 37 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 38 |
>=dev-qt/qtsql-${PV}:5[debug=,sqlite] |
| 39 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 40 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 41 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 42 |
" |
| 43 |
RDEPEND="${DEPEND}" |
| 44 |
|
| 45 |
|
| 46 |
diff --git a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild |
| 47 |
index b26acbc..43473b7 100644 |
| 48 |
--- a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild |
| 49 |
+++ b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild |
| 50 |
@@ -26,7 +26,7 @@ DEPEND=" |
| 51 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 52 |
>=dev-qt/qtsql-${PV}:5[debug=,sqlite] |
| 53 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 54 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 55 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 56 |
" |
| 57 |
RDEPEND="${DEPEND}" |
| 58 |
|
| 59 |
|
| 60 |
diff --git a/dev-qt/assistant/assistant-5.4.9999.ebuild b/dev-qt/assistant/assistant-5.4.9999.ebuild |
| 61 |
index b26acbc..43473b7 100644 |
| 62 |
--- a/dev-qt/assistant/assistant-5.4.9999.ebuild |
| 63 |
+++ b/dev-qt/assistant/assistant-5.4.9999.ebuild |
| 64 |
@@ -26,7 +26,7 @@ DEPEND=" |
| 65 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 66 |
>=dev-qt/qtsql-${PV}:5[debug=,sqlite] |
| 67 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 68 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 69 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 70 |
" |
| 71 |
RDEPEND="${DEPEND}" |
| 72 |
|
| 73 |
|
| 74 |
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild b/dev-qt/assistant/assistant-5.9999.ebuild |
| 75 |
index b26acbc..43473b7 100644 |
| 76 |
--- a/dev-qt/assistant/assistant-5.9999.ebuild |
| 77 |
+++ b/dev-qt/assistant/assistant-5.9999.ebuild |
| 78 |
@@ -26,7 +26,7 @@ DEPEND=" |
| 79 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 80 |
>=dev-qt/qtsql-${PV}:5[debug=,sqlite] |
| 81 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 82 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 83 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 84 |
" |
| 85 |
RDEPEND="${DEPEND}" |
| 86 |
|
| 87 |
|
| 88 |
diff --git a/dev-qt/designer/designer-5.3.9999.ebuild b/dev-qt/designer/designer-5.3.9999.ebuild |
| 89 |
index 06dfb0e..02fbb0e 100644 |
| 90 |
--- a/dev-qt/designer/designer-5.3.9999.ebuild |
| 91 |
+++ b/dev-qt/designer/designer-5.3.9999.ebuild |
| 92 |
@@ -25,7 +25,7 @@ DEPEND=" |
| 93 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 94 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 95 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 96 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 97 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 98 |
" |
| 99 |
RDEPEND="${DEPEND}" |
| 100 |
|
| 101 |
|
| 102 |
diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild b/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 103 |
index 06dfb0e..02fbb0e 100644 |
| 104 |
--- a/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 105 |
+++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild |
| 106 |
@@ -25,7 +25,7 @@ DEPEND=" |
| 107 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 108 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 109 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 110 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 111 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 112 |
" |
| 113 |
RDEPEND="${DEPEND}" |
| 114 |
|
| 115 |
|
| 116 |
diff --git a/dev-qt/designer/designer-5.4.9999.ebuild b/dev-qt/designer/designer-5.4.9999.ebuild |
| 117 |
index 06dfb0e..02fbb0e 100644 |
| 118 |
--- a/dev-qt/designer/designer-5.4.9999.ebuild |
| 119 |
+++ b/dev-qt/designer/designer-5.4.9999.ebuild |
| 120 |
@@ -25,7 +25,7 @@ DEPEND=" |
| 121 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 122 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 123 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 124 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 125 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 126 |
" |
| 127 |
RDEPEND="${DEPEND}" |
| 128 |
|
| 129 |
|
| 130 |
diff --git a/dev-qt/designer/designer-5.9999.ebuild b/dev-qt/designer/designer-5.9999.ebuild |
| 131 |
index 06dfb0e..02fbb0e 100644 |
| 132 |
--- a/dev-qt/designer/designer-5.9999.ebuild |
| 133 |
+++ b/dev-qt/designer/designer-5.9999.ebuild |
| 134 |
@@ -25,7 +25,7 @@ DEPEND=" |
| 135 |
>=dev-qt/qtprintsupport-${PV}:5[debug=] |
| 136 |
>=dev-qt/qtwidgets-${PV}:5[debug=] |
| 137 |
>=dev-qt/qtxml-${PV}:5[debug=] |
| 138 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 139 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 140 |
" |
| 141 |
RDEPEND="${DEPEND}" |
| 142 |
|
| 143 |
|
| 144 |
diff --git a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild |
| 145 |
index 36b0bcf..7ad38fc 100644 |
| 146 |
--- a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild |
| 147 |
+++ b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild |
| 148 |
@@ -28,7 +28,7 @@ DEPEND=" |
| 149 |
>=dev-qt/qtdeclarative-${PV}:5[debug=] |
| 150 |
) |
| 151 |
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) |
| 152 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 153 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 154 |
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 155 |
" |
| 156 |
RDEPEND="${DEPEND}" |
| 157 |
|
| 158 |
diff --git a/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild b/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild |
| 159 |
index 36b0bcf..7ad38fc 100644 |
| 160 |
--- a/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild |
| 161 |
+++ b/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild |
| 162 |
@@ -28,7 +28,7 @@ DEPEND=" |
| 163 |
>=dev-qt/qtdeclarative-${PV}:5[debug=] |
| 164 |
) |
| 165 |
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) |
| 166 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 167 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 168 |
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 169 |
" |
| 170 |
RDEPEND="${DEPEND}" |
| 171 |
|
| 172 |
diff --git a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild |
| 173 |
index 36b0bcf..7ad38fc 100644 |
| 174 |
--- a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild |
| 175 |
+++ b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild |
| 176 |
@@ -28,7 +28,7 @@ DEPEND=" |
| 177 |
>=dev-qt/qtdeclarative-${PV}:5[debug=] |
| 178 |
) |
| 179 |
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) |
| 180 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 181 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 182 |
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 183 |
" |
| 184 |
RDEPEND="${DEPEND}" |
| 185 |
|
| 186 |
diff --git a/dev-qt/qtquick1/qtquick1-5.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.9999.ebuild |
| 187 |
index 36b0bcf..7ad38fc 100644 |
| 188 |
--- a/dev-qt/qtquick1/qtquick1-5.9999.ebuild |
| 189 |
+++ b/dev-qt/qtquick1/qtquick1-5.9999.ebuild |
| 190 |
@@ -28,7 +28,7 @@ DEPEND=" |
| 191 |
>=dev-qt/qtdeclarative-${PV}:5[debug=] |
| 192 |
) |
| 193 |
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) |
| 194 |
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] ) |
| 195 |
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) |
| 196 |
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 197 |
" |
| 198 |
RDEPEND="${DEPEND}" |
| 199 |
|
| 200 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild |
| 201 |
index 49d482e..0238091 100644 |
| 202 |
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild |
| 203 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild |
| 204 |
@@ -18,7 +18,7 @@ fi |
| 205 |
|
| 206 |
# TODO: qttestlib, geolocation, orientation/sensors |
| 207 |
|
| 208 |
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" |
| 209 |
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt" |
| 210 |
|
| 211 |
RDEPEND=" |
| 212 |
dev-db/sqlite:3 |
| 213 |
@@ -27,6 +27,7 @@ RDEPEND=" |
| 214 |
>=dev-qt/qtgui-${PV}:5[debug=] |
| 215 |
>=dev-qt/qtnetwork-${PV}:5[debug=] |
| 216 |
>=dev-qt/qtsql-${PV}:5[debug=] |
| 217 |
+ >=dev-qt/qtwidgets-${PV}:5[debug=] |
| 218 |
media-libs/fontconfig:1.0 |
| 219 |
media-libs/libpng:0= |
| 220 |
sys-libs/zlib |
| 221 |
@@ -47,7 +48,6 @@ RDEPEND=" |
| 222 |
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) |
| 223 |
udev? ( virtual/udev ) |
| 224 |
webp? ( media-libs/libwebp:0= ) |
| 225 |
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) |
| 226 |
xslt? ( |
| 227 |
libxml2? ( dev-libs/libxslt ) |
| 228 |
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 229 |
@@ -76,8 +76,6 @@ src_prepare() { |
| 230 |
Tools/qmake/mkspecs/features/features.prf || die |
| 231 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 232 |
Tools/qmake/mkspecs/features/features.prf || die |
| 233 |
- use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ |
| 234 |
- Source/QtWebKit.pro || die |
| 235 |
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ |
| 236 |
Tools/qmake/mkspecs/features/features.prf || die |
| 237 |
|
| 238 |
|
| 239 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild |
| 240 |
index 49d482e..0238091 100644 |
| 241 |
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild |
| 242 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild |
| 243 |
@@ -18,7 +18,7 @@ fi |
| 244 |
|
| 245 |
# TODO: qttestlib, geolocation, orientation/sensors |
| 246 |
|
| 247 |
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" |
| 248 |
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt" |
| 249 |
|
| 250 |
RDEPEND=" |
| 251 |
dev-db/sqlite:3 |
| 252 |
@@ -27,6 +27,7 @@ RDEPEND=" |
| 253 |
>=dev-qt/qtgui-${PV}:5[debug=] |
| 254 |
>=dev-qt/qtnetwork-${PV}:5[debug=] |
| 255 |
>=dev-qt/qtsql-${PV}:5[debug=] |
| 256 |
+ >=dev-qt/qtwidgets-${PV}:5[debug=] |
| 257 |
media-libs/fontconfig:1.0 |
| 258 |
media-libs/libpng:0= |
| 259 |
sys-libs/zlib |
| 260 |
@@ -47,7 +48,6 @@ RDEPEND=" |
| 261 |
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) |
| 262 |
udev? ( virtual/udev ) |
| 263 |
webp? ( media-libs/libwebp:0= ) |
| 264 |
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) |
| 265 |
xslt? ( |
| 266 |
libxml2? ( dev-libs/libxslt ) |
| 267 |
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 268 |
@@ -76,8 +76,6 @@ src_prepare() { |
| 269 |
Tools/qmake/mkspecs/features/features.prf || die |
| 270 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 271 |
Tools/qmake/mkspecs/features/features.prf || die |
| 272 |
- use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ |
| 273 |
- Source/QtWebKit.pro || die |
| 274 |
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ |
| 275 |
Tools/qmake/mkspecs/features/features.prf || die |
| 276 |
|
| 277 |
|
| 278 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 279 |
index 49d482e..0238091 100644 |
| 280 |
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 281 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild |
| 282 |
@@ -18,7 +18,7 @@ fi |
| 283 |
|
| 284 |
# TODO: qttestlib, geolocation, orientation/sensors |
| 285 |
|
| 286 |
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" |
| 287 |
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt" |
| 288 |
|
| 289 |
RDEPEND=" |
| 290 |
dev-db/sqlite:3 |
| 291 |
@@ -27,6 +27,7 @@ RDEPEND=" |
| 292 |
>=dev-qt/qtgui-${PV}:5[debug=] |
| 293 |
>=dev-qt/qtnetwork-${PV}:5[debug=] |
| 294 |
>=dev-qt/qtsql-${PV}:5[debug=] |
| 295 |
+ >=dev-qt/qtwidgets-${PV}:5[debug=] |
| 296 |
media-libs/fontconfig:1.0 |
| 297 |
media-libs/libpng:0= |
| 298 |
sys-libs/zlib |
| 299 |
@@ -47,7 +48,6 @@ RDEPEND=" |
| 300 |
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) |
| 301 |
udev? ( virtual/udev ) |
| 302 |
webp? ( media-libs/libwebp:0= ) |
| 303 |
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) |
| 304 |
xslt? ( |
| 305 |
libxml2? ( dev-libs/libxslt ) |
| 306 |
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 307 |
@@ -76,8 +76,6 @@ src_prepare() { |
| 308 |
Tools/qmake/mkspecs/features/features.prf || die |
| 309 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 310 |
Tools/qmake/mkspecs/features/features.prf || die |
| 311 |
- use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ |
| 312 |
- Source/QtWebKit.pro || die |
| 313 |
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ |
| 314 |
Tools/qmake/mkspecs/features/features.prf || die |
| 315 |
|
| 316 |
|
| 317 |
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 318 |
index 49d482e..0238091 100644 |
| 319 |
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 320 |
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild |
| 321 |
@@ -18,7 +18,7 @@ fi |
| 322 |
|
| 323 |
# TODO: qttestlib, geolocation, orientation/sensors |
| 324 |
|
| 325 |
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets xslt" |
| 326 |
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt" |
| 327 |
|
| 328 |
RDEPEND=" |
| 329 |
dev-db/sqlite:3 |
| 330 |
@@ -27,6 +27,7 @@ RDEPEND=" |
| 331 |
>=dev-qt/qtgui-${PV}:5[debug=] |
| 332 |
>=dev-qt/qtnetwork-${PV}:5[debug=] |
| 333 |
>=dev-qt/qtsql-${PV}:5[debug=] |
| 334 |
+ >=dev-qt/qtwidgets-${PV}:5[debug=] |
| 335 |
media-libs/fontconfig:1.0 |
| 336 |
media-libs/libpng:0= |
| 337 |
sys-libs/zlib |
| 338 |
@@ -47,7 +48,6 @@ RDEPEND=" |
| 339 |
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) |
| 340 |
udev? ( virtual/udev ) |
| 341 |
webp? ( media-libs/libwebp:0= ) |
| 342 |
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) |
| 343 |
xslt? ( |
| 344 |
libxml2? ( dev-libs/libxslt ) |
| 345 |
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) |
| 346 |
@@ -76,8 +76,6 @@ src_prepare() { |
| 347 |
Tools/qmake/mkspecs/features/features.prf || die |
| 348 |
use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ |
| 349 |
Tools/qmake/mkspecs/features/features.prf || die |
| 350 |
- use widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \ |
| 351 |
- Source/QtWebKit.pro || die |
| 352 |
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \ |
| 353 |
Tools/qmake/mkspecs/features/features.prf || die |
Archives