| 1 |
commit: 040f587dc703adc1e0eba504e83430a032ba3c62 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 14 23:06:06 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 14 23:06:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=040f587d |
| 7 |
|
| 8 |
dev-qt/qtgui: Rename USE xcb to X |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/705440 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-qt/qtgui/metadata.xml | 2 +- |
| 15 |
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 37 +++++++++++++++++++------------------ |
| 16 |
dev-qt/qtgui/qtgui-5.14.9999.ebuild | 37 +++++++++++++++++++------------------ |
| 17 |
dev-qt/qtgui/qtgui-5.15.9999.ebuild | 37 +++++++++++++++++++------------------ |
| 18 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 37 +++++++++++++++++++------------------ |
| 19 |
5 files changed, 77 insertions(+), 73 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml |
| 22 |
index 74256c16..5fd07056 100644 |
| 23 |
--- a/dev-qt/qtgui/metadata.xml |
| 24 |
+++ b/dev-qt/qtgui/metadata.xml |
| 25 |
@@ -15,7 +15,7 @@ |
| 26 |
<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> |
| 27 |
<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> |
| 28 |
<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag> |
| 29 |
- <flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag> |
| 30 |
+ <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> |
| 31 |
</use> |
| 32 |
<upstream> |
| 33 |
<bugs-to>https://bugreports.qt.io/</bugs-to> |
| 34 |
|
| 35 |
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 36 |
index bd23ada7..7e8a5ceb 100644 |
| 37 |
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 38 |
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 39 |
@@ -1,7 +1,8 @@ |
| 40 |
-# Copyright 1999-2019 Gentoo Authors |
| 41 |
+# Copyright 1999-2020 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
EAPI=7 |
| 45 |
+ |
| 46 |
QT5_MODULE="qtbase" |
| 47 |
inherit qt5-build |
| 48 |
|
| 49 |
@@ -14,14 +15,14 @@ fi |
| 50 |
# TODO: linuxfb |
| 51 |
|
| 52 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus |
| 53 |
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" |
| 54 |
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X" |
| 55 |
REQUIRED_USE=" |
| 56 |
- || ( eglfs xcb ) |
| 57 |
- accessibility? ( dbus xcb ) |
| 58 |
+ || ( eglfs X ) |
| 59 |
+ accessibility? ( dbus X ) |
| 60 |
eglfs? ( egl ) |
| 61 |
ibus? ( dbus ) |
| 62 |
libinput? ( udev ) |
| 63 |
- xcb? ( gles2? ( egl ) ) |
| 64 |
+ X? ( gles2? ( egl ) ) |
| 65 |
" |
| 66 |
|
| 67 |
RDEPEND=" |
| 68 |
@@ -51,7 +52,7 @@ RDEPEND=" |
| 69 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 70 |
udev? ( virtual/libudev:= ) |
| 71 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 72 |
- xcb? ( |
| 73 |
+ X? ( |
| 74 |
x11-libs/libICE |
| 75 |
x11-libs/libSM |
| 76 |
x11-libs/libX11 |
| 77 |
@@ -111,13 +112,13 @@ QT5_GENTOO_CONFIG=( |
| 78 |
!png:no-png: |
| 79 |
tslib:tslib: |
| 80 |
udev:libudev: |
| 81 |
- xcb:xcb: |
| 82 |
- xcb:xcb-glx: |
| 83 |
- xcb:xcb-plugin: |
| 84 |
- xcb:xcb-render: |
| 85 |
- xcb:xcb-sm: |
| 86 |
- xcb:xcb-xlib: |
| 87 |
- xcb:xcb-xinput: |
| 88 |
+ X:xcb: |
| 89 |
+ X:xcb-glx: |
| 90 |
+ X:xcb-plugin: |
| 91 |
+ X:xcb-render: |
| 92 |
+ X:xcb-sm: |
| 93 |
+ X:xcb-xlib: |
| 94 |
+ X:xcb-xinput: |
| 95 |
) |
| 96 |
|
| 97 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 98 |
@@ -130,8 +131,8 @@ src_prepare() { |
| 99 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 100 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 101 |
|
| 102 |
- # egl_x11 is activated when both egl and xcb are enabled |
| 103 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 104 |
+ # egl_x11 is activated when both egl and X are enabled |
| 105 |
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 106 |
|
| 107 |
qt_use_disable_config dbus dbus \ |
| 108 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 109 |
@@ -166,10 +167,10 @@ src_configure() { |
| 110 |
$(qt_use png libpng system) |
| 111 |
$(qt_use tslib) |
| 112 |
$(qt_use udev libudev) |
| 113 |
- $(qt_use xcb xcb system) |
| 114 |
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
| 115 |
+ $(qt_use X xcb system) |
| 116 |
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '') |
| 117 |
) |
| 118 |
- if use libinput || use xcb; then |
| 119 |
+ if use libinput || use X; then |
| 120 |
myconf+=( -xkbcommon ) |
| 121 |
fi |
| 122 |
qt5-build_src_configure |
| 123 |
|
| 124 |
diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild b/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 125 |
index 97db51f0..ab7524bb 100644 |
| 126 |
--- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 127 |
+++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 128 |
@@ -1,7 +1,8 @@ |
| 129 |
-# Copyright 1999-2019 Gentoo Authors |
| 130 |
+# Copyright 1999-2020 Gentoo Authors |
| 131 |
# Distributed under the terms of the GNU General Public License v2 |
| 132 |
|
| 133 |
EAPI=7 |
| 134 |
+ |
| 135 |
QT5_MODULE="qtbase" |
| 136 |
inherit qt5-build |
| 137 |
|
| 138 |
@@ -14,14 +15,14 @@ fi |
| 139 |
# TODO: linuxfb |
| 140 |
|
| 141 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus |
| 142 |
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" |
| 143 |
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X" |
| 144 |
REQUIRED_USE=" |
| 145 |
- || ( eglfs xcb ) |
| 146 |
- accessibility? ( dbus xcb ) |
| 147 |
+ || ( eglfs X ) |
| 148 |
+ accessibility? ( dbus X ) |
| 149 |
eglfs? ( egl ) |
| 150 |
ibus? ( dbus ) |
| 151 |
libinput? ( udev ) |
| 152 |
- xcb? ( gles2? ( egl ) ) |
| 153 |
+ X? ( gles2? ( egl ) ) |
| 154 |
" |
| 155 |
|
| 156 |
COMMON_DEPEND=" |
| 157 |
@@ -51,7 +52,7 @@ COMMON_DEPEND=" |
| 158 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 159 |
udev? ( virtual/libudev:= ) |
| 160 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 161 |
- xcb? ( |
| 162 |
+ X? ( |
| 163 |
x11-libs/libICE |
| 164 |
x11-libs/libSM |
| 165 |
x11-libs/libX11 |
| 166 |
@@ -118,13 +119,13 @@ QT5_GENTOO_CONFIG=( |
| 167 |
!png:no-png: |
| 168 |
tslib:tslib: |
| 169 |
udev:libudev: |
| 170 |
- xcb:xcb: |
| 171 |
- xcb:xcb-glx: |
| 172 |
- xcb:xcb-plugin: |
| 173 |
- xcb:xcb-render: |
| 174 |
- xcb:xcb-sm: |
| 175 |
- xcb:xcb-xlib: |
| 176 |
- xcb:xcb-xinput: |
| 177 |
+ X:xcb: |
| 178 |
+ X:xcb-glx: |
| 179 |
+ X:xcb-plugin: |
| 180 |
+ X:xcb-render: |
| 181 |
+ X:xcb-sm: |
| 182 |
+ X:xcb-xlib: |
| 183 |
+ X:xcb-xinput: |
| 184 |
) |
| 185 |
|
| 186 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 187 |
@@ -137,8 +138,8 @@ src_prepare() { |
| 188 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 189 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 190 |
|
| 191 |
- # egl_x11 is activated when both egl and xcb are enabled |
| 192 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 193 |
+ # egl_x11 is activated when both egl and X are enabled |
| 194 |
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 195 |
|
| 196 |
qt_use_disable_config dbus dbus \ |
| 197 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 198 |
@@ -173,10 +174,10 @@ src_configure() { |
| 199 |
$(qt_use png libpng system) |
| 200 |
$(qt_use tslib) |
| 201 |
$(qt_use udev libudev) |
| 202 |
- $(qt_use xcb xcb system) |
| 203 |
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
| 204 |
+ $(qt_use X xcb system) |
| 205 |
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '') |
| 206 |
) |
| 207 |
- if use libinput || use xcb; then |
| 208 |
+ if use libinput || use X; then |
| 209 |
myconf+=( -xkbcommon ) |
| 210 |
fi |
| 211 |
qt5-build_src_configure |
| 212 |
|
| 213 |
diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 214 |
index 8a4c7007..3074f4ce 100644 |
| 215 |
--- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 216 |
+++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 217 |
@@ -1,7 +1,8 @@ |
| 218 |
-# Copyright 1999-2019 Gentoo Authors |
| 219 |
+# Copyright 1999-2020 Gentoo Authors |
| 220 |
# Distributed under the terms of the GNU General Public License v2 |
| 221 |
|
| 222 |
EAPI=7 |
| 223 |
+ |
| 224 |
QT5_MODULE="qtbase" |
| 225 |
inherit qt5-build |
| 226 |
|
| 227 |
@@ -14,14 +15,14 @@ fi |
| 228 |
# TODO: linuxfb |
| 229 |
|
| 230 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus |
| 231 |
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" |
| 232 |
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X" |
| 233 |
REQUIRED_USE=" |
| 234 |
- || ( eglfs xcb ) |
| 235 |
- accessibility? ( dbus xcb ) |
| 236 |
+ || ( eglfs X ) |
| 237 |
+ accessibility? ( dbus X ) |
| 238 |
eglfs? ( egl ) |
| 239 |
ibus? ( dbus ) |
| 240 |
libinput? ( udev ) |
| 241 |
- xcb? ( gles2? ( egl ) ) |
| 242 |
+ X? ( gles2? ( egl ) ) |
| 243 |
" |
| 244 |
|
| 245 |
COMMON_DEPEND=" |
| 246 |
@@ -51,7 +52,7 @@ COMMON_DEPEND=" |
| 247 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 248 |
udev? ( virtual/libudev:= ) |
| 249 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 250 |
- xcb? ( |
| 251 |
+ X? ( |
| 252 |
x11-libs/libICE |
| 253 |
x11-libs/libSM |
| 254 |
x11-libs/libX11 |
| 255 |
@@ -118,13 +119,13 @@ QT5_GENTOO_CONFIG=( |
| 256 |
!png:no-png: |
| 257 |
tslib:tslib: |
| 258 |
udev:libudev: |
| 259 |
- xcb:xcb: |
| 260 |
- xcb:xcb-glx: |
| 261 |
- xcb:xcb-plugin: |
| 262 |
- xcb:xcb-render: |
| 263 |
- xcb:xcb-sm: |
| 264 |
- xcb:xcb-xlib: |
| 265 |
- xcb:xcb-xinput: |
| 266 |
+ X:xcb: |
| 267 |
+ X:xcb-glx: |
| 268 |
+ X:xcb-plugin: |
| 269 |
+ X:xcb-render: |
| 270 |
+ X:xcb-sm: |
| 271 |
+ X:xcb-xlib: |
| 272 |
+ X:xcb-xinput: |
| 273 |
) |
| 274 |
|
| 275 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 276 |
@@ -137,8 +138,8 @@ src_prepare() { |
| 277 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 278 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 279 |
|
| 280 |
- # egl_x11 is activated when both egl and xcb are enabled |
| 281 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 282 |
+ # egl_x11 is activated when both egl and X are enabled |
| 283 |
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 284 |
|
| 285 |
qt_use_disable_config dbus dbus \ |
| 286 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 287 |
@@ -173,10 +174,10 @@ src_configure() { |
| 288 |
$(qt_use png libpng system) |
| 289 |
$(qt_use tslib) |
| 290 |
$(qt_use udev libudev) |
| 291 |
- $(qt_use xcb) |
| 292 |
- $(usex xcb '-xcb-xlib' '') |
| 293 |
+ $(qt_use X) |
| 294 |
+ $(usex X '-xcb-xlib' '') |
| 295 |
) |
| 296 |
- if use libinput || use xcb; then |
| 297 |
+ if use libinput || use X; then |
| 298 |
myconf+=( -xkbcommon ) |
| 299 |
fi |
| 300 |
qt5-build_src_configure |
| 301 |
|
| 302 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 303 |
index e8e79ac3..04d52960 100644 |
| 304 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 305 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 306 |
@@ -1,7 +1,8 @@ |
| 307 |
-# Copyright 1999-2019 Gentoo Authors |
| 308 |
+# Copyright 1999-2020 Gentoo Authors |
| 309 |
# Distributed under the terms of the GNU General Public License v2 |
| 310 |
|
| 311 |
EAPI=7 |
| 312 |
+ |
| 313 |
QT5_MODULE="qtbase" |
| 314 |
inherit qt5-build |
| 315 |
|
| 316 |
@@ -14,14 +15,14 @@ fi |
| 317 |
# TODO: linuxfb |
| 318 |
|
| 319 |
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus |
| 320 |
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" |
| 321 |
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X" |
| 322 |
REQUIRED_USE=" |
| 323 |
- || ( eglfs xcb ) |
| 324 |
- accessibility? ( dbus xcb ) |
| 325 |
+ || ( eglfs X ) |
| 326 |
+ accessibility? ( dbus X ) |
| 327 |
eglfs? ( egl ) |
| 328 |
ibus? ( dbus ) |
| 329 |
libinput? ( udev ) |
| 330 |
- xcb? ( gles2? ( egl ) ) |
| 331 |
+ X? ( gles2? ( egl ) ) |
| 332 |
" |
| 333 |
|
| 334 |
RDEPEND=" |
| 335 |
@@ -51,7 +52,7 @@ RDEPEND=" |
| 336 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 337 |
udev? ( virtual/libudev:= ) |
| 338 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 339 |
- xcb? ( |
| 340 |
+ X? ( |
| 341 |
x11-libs/libICE |
| 342 |
x11-libs/libSM |
| 343 |
x11-libs/libX11 |
| 344 |
@@ -111,13 +112,13 @@ QT5_GENTOO_CONFIG=( |
| 345 |
!png:no-png: |
| 346 |
tslib:tslib: |
| 347 |
udev:libudev: |
| 348 |
- xcb:xcb: |
| 349 |
- xcb:xcb-glx: |
| 350 |
- xcb:xcb-plugin: |
| 351 |
- xcb:xcb-render: |
| 352 |
- xcb:xcb-sm: |
| 353 |
- xcb:xcb-xlib: |
| 354 |
- xcb:xcb-xinput: |
| 355 |
+ X:xcb: |
| 356 |
+ X:xcb-glx: |
| 357 |
+ X:xcb-plugin: |
| 358 |
+ X:xcb-render: |
| 359 |
+ X:xcb-sm: |
| 360 |
+ X:xcb-xlib: |
| 361 |
+ X:xcb-xinput: |
| 362 |
) |
| 363 |
|
| 364 |
QT5_GENTOO_PRIVATE_CONFIG=( |
| 365 |
@@ -128,8 +129,8 @@ src_prepare() { |
| 366 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 367 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 368 |
|
| 369 |
- # egl_x11 is activated when both egl and xcb are enabled |
| 370 |
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 371 |
+ # egl_x11 is activated when both egl and X are enabled |
| 372 |
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) |
| 373 |
|
| 374 |
qt_use_disable_config dbus dbus \ |
| 375 |
src/platformsupport/themes/genericunix/genericunix.pri |
| 376 |
@@ -164,10 +165,10 @@ src_configure() { |
| 377 |
$(qt_use png libpng system) |
| 378 |
$(qt_use tslib) |
| 379 |
$(qt_use udev libudev) |
| 380 |
- $(qt_use xcb xcb system) |
| 381 |
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') |
| 382 |
+ $(qt_use X xcb system) |
| 383 |
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '') |
| 384 |
) |
| 385 |
- if use libinput || use xcb; then |
| 386 |
+ if use libinput || use X; then |
| 387 |
myconf+=( -xkbcommon ) |
| 388 |
fi |
| 389 |
qt5-build_src_configure |
Archives