| 1 |
commit: f0192a8ad25133375026974e056861058015abbd |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 7 00:16:20 2019 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 7 00:58:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f0192a8a |
| 7 |
|
| 8 |
dev-qt/qt{core,gui,network}: drop several obsolete flags from qconfig.h |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
| 11 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-qt/qtcore/qtcore-5.12.0.ebuild | 6 ++---- |
| 14 |
dev-qt/qtcore/qtcore-5.12.9999.ebuild | 6 ++---- |
| 15 |
dev-qt/qtcore/qtcore-5.9999.ebuild | 6 ++---- |
| 16 |
dev-qt/qtgui/qtgui-5.12.0.ebuild | 17 ++++++++--------- |
| 17 |
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 17 ++++++++--------- |
| 18 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 17 ++++++++--------- |
| 19 |
dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild | 2 +- |
| 20 |
dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild | 2 +- |
| 21 |
dev-qt/qtnetwork/qtnetwork-5.9999.ebuild | 2 +- |
| 22 |
9 files changed, 33 insertions(+), 42 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-qt/qtcore/qtcore-5.12.0.ebuild b/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 25 |
index 290fc94e..f6a45867 100644 |
| 26 |
--- a/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 27 |
+++ b/dev-qt/qtcore/qtcore-5.12.0.ebuild |
| 28 |
@@ -56,10 +56,8 @@ src_install() { |
| 29 |
qt5-build_src_install |
| 30 |
|
| 31 |
local flags=( |
| 32 |
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
| 33 |
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
| 34 |
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS |
| 35 |
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB |
| 36 |
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG |
| 37 |
+ OPENGL OPENSSL SSL WIDGETS |
| 38 |
) |
| 39 |
|
| 40 |
for flag in ${flags[@]}; do |
| 41 |
|
| 42 |
diff --git a/dev-qt/qtcore/qtcore-5.12.9999.ebuild b/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 43 |
index 290fc94e..f6a45867 100644 |
| 44 |
--- a/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 45 |
+++ b/dev-qt/qtcore/qtcore-5.12.9999.ebuild |
| 46 |
@@ -56,10 +56,8 @@ src_install() { |
| 47 |
qt5-build_src_install |
| 48 |
|
| 49 |
local flags=( |
| 50 |
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
| 51 |
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
| 52 |
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS |
| 53 |
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB |
| 54 |
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG |
| 55 |
+ OPENGL OPENSSL SSL WIDGETS |
| 56 |
) |
| 57 |
|
| 58 |
for flag in ${flags[@]}; do |
| 59 |
|
| 60 |
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 61 |
index 290fc94e..f6a45867 100644 |
| 62 |
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 63 |
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild |
| 64 |
@@ -56,10 +56,8 @@ src_install() { |
| 65 |
qt5-build_src_install |
| 66 |
|
| 67 |
local flags=( |
| 68 |
- ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
| 69 |
- HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
| 70 |
- OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS |
| 71 |
- XCURSOR XFIXES XKB XRANDR XSYNC ZLIB |
| 72 |
+ DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG |
| 73 |
+ OPENGL OPENSSL SSL WIDGETS |
| 74 |
) |
| 75 |
|
| 76 |
for flag in ${flags[@]}; do |
| 77 |
|
| 78 |
diff --git a/dev-qt/qtgui/qtgui-5.12.0.ebuild b/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 79 |
index b1ec9e40..03ab3544 100644 |
| 80 |
--- a/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 81 |
+++ b/dev-qt/qtgui/qtgui-5.12.0.ebuild |
| 82 |
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=( |
| 83 |
|
| 84 |
QT5_GENTOO_CONFIG=( |
| 85 |
accessibility:accessibility-atspi-bridge |
| 86 |
- egl |
| 87 |
- eglfs |
| 88 |
+ egl:egl: |
| 89 |
+ eglfs:eglfs: |
| 90 |
eglfs:eglfs_egldevice: |
| 91 |
eglfs:eglfs_gbm: |
| 92 |
- evdev |
| 93 |
+ evdev:evdev: |
| 94 |
evdev:mtdev: |
| 95 |
- :fontconfig |
| 96 |
- :system-freetype:FREETYPE |
| 97 |
+ :fontconfig: |
| 98 |
+ :system-freetype: |
| 99 |
!:no-freetype: |
| 100 |
!gif:no-gif: |
| 101 |
gles2::OPENGL_ES |
| 102 |
gles2:opengles2:OPENGL_ES_2 |
| 103 |
!:no-gui: |
| 104 |
- :system-harfbuzz:HARFBUZZ |
| 105 |
+ :system-harfbuzz: |
| 106 |
!:no-harfbuzz: |
| 107 |
jpeg:system-jpeg:IMAGEFORMAT_JPEG |
| 108 |
!jpeg:no-jpeg: |
| 109 |
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=( |
| 110 |
png:png: |
| 111 |
png:system-png:IMAGEFORMAT_PNG |
| 112 |
!png:no-png: |
| 113 |
- tslib |
| 114 |
+ tslib:tslib: |
| 115 |
udev:libudev: |
| 116 |
xcb:xcb: |
| 117 |
xcb:xcb-glx: |
| 118 |
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=( |
| 119 |
xcb:xcb-sm: |
| 120 |
xcb:xcb-xlib: |
| 121 |
xcb:xcb-xinput: |
| 122 |
- xcb::XKB |
| 123 |
) |
| 124 |
|
| 125 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 126 |
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 127 |
|
| 128 |
src_prepare() { |
| 129 |
# egl_x11 is activated when both egl and xcb are enabled |
| 130 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 131 |
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 132 |
|
| 133 |
qt_use_disable_config dbus dbus \ |
| 134 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 135 |
|
| 136 |
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 137 |
index 4a416148..b2f05a81 100644 |
| 138 |
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 139 |
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 140 |
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=( |
| 141 |
|
| 142 |
QT5_GENTOO_CONFIG=( |
| 143 |
accessibility:accessibility-atspi-bridge |
| 144 |
- egl |
| 145 |
- eglfs |
| 146 |
+ egl:egl: |
| 147 |
+ eglfs:eglfs: |
| 148 |
eglfs:eglfs_egldevice: |
| 149 |
eglfs:eglfs_gbm: |
| 150 |
- evdev |
| 151 |
+ evdev:evdev: |
| 152 |
evdev:mtdev: |
| 153 |
- :fontconfig |
| 154 |
- :system-freetype:FREETYPE |
| 155 |
+ :fontconfig: |
| 156 |
+ :system-freetype: |
| 157 |
!:no-freetype: |
| 158 |
!gif:no-gif: |
| 159 |
gles2::OPENGL_ES |
| 160 |
gles2:opengles2:OPENGL_ES_2 |
| 161 |
!:no-gui: |
| 162 |
- :system-harfbuzz:HARFBUZZ |
| 163 |
+ :system-harfbuzz: |
| 164 |
!:no-harfbuzz: |
| 165 |
jpeg:system-jpeg:IMAGEFORMAT_JPEG |
| 166 |
!jpeg:no-jpeg: |
| 167 |
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=( |
| 168 |
png:png: |
| 169 |
png:system-png:IMAGEFORMAT_PNG |
| 170 |
!png:no-png: |
| 171 |
- tslib |
| 172 |
+ tslib:tslib: |
| 173 |
udev:libudev: |
| 174 |
xcb:xcb: |
| 175 |
xcb:xcb-glx: |
| 176 |
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=( |
| 177 |
xcb:xcb-sm: |
| 178 |
xcb:xcb-xlib: |
| 179 |
xcb:xcb-xinput: |
| 180 |
- xcb::XKB |
| 181 |
) |
| 182 |
|
| 183 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 184 |
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 185 |
|
| 186 |
src_prepare() { |
| 187 |
# egl_x11 is activated when both egl and xcb are enabled |
| 188 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 189 |
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 190 |
|
| 191 |
qt_use_disable_config dbus dbus \ |
| 192 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 193 |
|
| 194 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 195 |
index 4a416148..b2f05a81 100644 |
| 196 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 197 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 198 |
@@ -84,20 +84,20 @@ QT5_TARGET_SUBDIRS=( |
| 199 |
|
| 200 |
QT5_GENTOO_CONFIG=( |
| 201 |
accessibility:accessibility-atspi-bridge |
| 202 |
- egl |
| 203 |
- eglfs |
| 204 |
+ egl:egl: |
| 205 |
+ eglfs:eglfs: |
| 206 |
eglfs:eglfs_egldevice: |
| 207 |
eglfs:eglfs_gbm: |
| 208 |
- evdev |
| 209 |
+ evdev:evdev: |
| 210 |
evdev:mtdev: |
| 211 |
- :fontconfig |
| 212 |
- :system-freetype:FREETYPE |
| 213 |
+ :fontconfig: |
| 214 |
+ :system-freetype: |
| 215 |
!:no-freetype: |
| 216 |
!gif:no-gif: |
| 217 |
gles2::OPENGL_ES |
| 218 |
gles2:opengles2:OPENGL_ES_2 |
| 219 |
!:no-gui: |
| 220 |
- :system-harfbuzz:HARFBUZZ |
| 221 |
+ :system-harfbuzz: |
| 222 |
!:no-harfbuzz: |
| 223 |
jpeg:system-jpeg:IMAGEFORMAT_JPEG |
| 224 |
!jpeg:no-jpeg: |
| 225 |
@@ -107,7 +107,7 @@ QT5_GENTOO_CONFIG=( |
| 226 |
png:png: |
| 227 |
png:system-png:IMAGEFORMAT_PNG |
| 228 |
!png:no-png: |
| 229 |
- tslib |
| 230 |
+ tslib:tslib: |
| 231 |
udev:libudev: |
| 232 |
xcb:xcb: |
| 233 |
xcb:xcb-glx: |
| 234 |
@@ -116,7 +116,6 @@ QT5_GENTOO_CONFIG=( |
| 235 |
xcb:xcb-sm: |
| 236 |
xcb:xcb-xlib: |
| 237 |
xcb:xcb-xinput: |
| 238 |
- xcb::XKB |
| 239 |
) |
| 240 |
|
| 241 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 242 |
@@ -125,7 +124,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 243 |
|
| 244 |
src_prepare() { |
| 245 |
# egl_x11 is activated when both egl and xcb are enabled |
| 246 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11) || QT5_GENTOO_CONFIG+=(egl:egl_x11) |
| 247 |
+ use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 248 |
|
| 249 |
qt_use_disable_config dbus dbus \ |
| 250 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 251 |
|
| 252 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild |
| 253 |
index 25f63002..b7da112b 100644 |
| 254 |
--- a/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild |
| 255 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.0.ebuild |
| 256 |
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=( |
| 257 |
) |
| 258 |
|
| 259 |
QT5_GENTOO_CONFIG=( |
| 260 |
- libproxy |
| 261 |
+ libproxy:libproxy: |
| 262 |
ssl::SSL |
| 263 |
ssl::OPENSSL |
| 264 |
ssl:openssl-linked:LINKED_OPENSSL |
| 265 |
|
| 266 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild |
| 267 |
index 25f63002..b7da112b 100644 |
| 268 |
--- a/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild |
| 269 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.9999.ebuild |
| 270 |
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=( |
| 271 |
) |
| 272 |
|
| 273 |
QT5_GENTOO_CONFIG=( |
| 274 |
- libproxy |
| 275 |
+ libproxy:libproxy: |
| 276 |
ssl::SSL |
| 277 |
ssl::OPENSSL |
| 278 |
ssl:openssl-linked:LINKED_OPENSSL |
| 279 |
|
| 280 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild |
| 281 |
index 25f63002..b7da112b 100644 |
| 282 |
--- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild |
| 283 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild |
| 284 |
@@ -32,7 +32,7 @@ QT5_TARGET_SUBDIRS=( |
| 285 |
) |
| 286 |
|
| 287 |
QT5_GENTOO_CONFIG=( |
| 288 |
- libproxy |
| 289 |
+ libproxy:libproxy: |
| 290 |
ssl::SSL |
| 291 |
ssl::OPENSSL |
| 292 |
ssl:openssl-linked:LINKED_OPENSSL |
Archives