From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/
Date: Sun, 19 Jan 2020 23:54:25 +0000 (UTC) [thread overview]
Message-ID: <1579043166.040f587dc703adc1e0eba504e83430a032ba3c62.asturm@gentoo> (raw)
commit: 040f587dc703adc1e0eba504e83430a032ba3c62
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 23:06:06 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 23:06:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=040f587d
dev-qt/qtgui: Rename USE xcb to X
Closes: https://bugs.gentoo.org/705440
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtgui/metadata.xml | 2 +-
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 37 +++++++++++++++++++------------------
dev-qt/qtgui/qtgui-5.14.9999.ebuild | 37 +++++++++++++++++++------------------
dev-qt/qtgui/qtgui-5.15.9999.ebuild | 37 +++++++++++++++++++------------------
dev-qt/qtgui/qtgui-5.9999.ebuild | 37 +++++++++++++++++++------------------
5 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 74256c16..5fd07056 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -15,7 +15,7 @@
<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
- <flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
+ <flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
index bd23ada7..7e8a5ceb 100644
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ || ( eglfs X )
+ accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- xcb? ( gles2? ( egl ) )
+ X? ( gles2? ( egl ) )
"
RDEPEND="
@@ -51,7 +52,7 @@ RDEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
+ X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -111,13 +112,13 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xcb-xinput:
+ X:xcb:
+ X:xcb-glx:
+ X:xcb-plugin:
+ X:xcb-render:
+ X:xcb-sm:
+ X:xcb-xlib:
+ X:xcb-xinput:
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -130,8 +131,8 @@ src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+ # egl_x11 is activated when both egl and X are enabled
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
@@ -166,10 +167,10 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
- if use libinput || use xcb; then
+ if use libinput || use X; then
myconf+=( -xkbcommon )
fi
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
index 97db51f0..ab7524bb 100644
--- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ || ( eglfs X )
+ accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- xcb? ( gles2? ( egl ) )
+ X? ( gles2? ( egl ) )
"
COMMON_DEPEND="
@@ -51,7 +52,7 @@ COMMON_DEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
+ X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -118,13 +119,13 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xcb-xinput:
+ X:xcb:
+ X:xcb-glx:
+ X:xcb-plugin:
+ X:xcb-render:
+ X:xcb-sm:
+ X:xcb-xlib:
+ X:xcb-xinput:
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -137,8 +138,8 @@ src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+ # egl_x11 is activated when both egl and X are enabled
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
@@ -173,10 +174,10 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
- if use libinput || use xcb; then
+ if use libinput || use X; then
myconf+=( -xkbcommon )
fi
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
index 8a4c7007..3074f4ce 100644
--- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ || ( eglfs X )
+ accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- xcb? ( gles2? ( egl ) )
+ X? ( gles2? ( egl ) )
"
COMMON_DEPEND="
@@ -51,7 +52,7 @@ COMMON_DEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
+ X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -118,13 +119,13 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xcb-xinput:
+ X:xcb:
+ X:xcb-glx:
+ X:xcb-plugin:
+ X:xcb-render:
+ X:xcb-sm:
+ X:xcb-xlib:
+ X:xcb-xinput:
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -137,8 +138,8 @@ src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+ # egl_x11 is activated when both egl and X are enabled
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
@@ -173,10 +174,10 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb)
- $(usex xcb '-xcb-xlib' '')
+ $(qt_use X)
+ $(usex X '-xcb-xlib' '')
)
- if use libinput || use xcb; then
+ if use libinput || use X; then
myconf+=( -xkbcommon )
fi
qt5-build_src_configure
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild
index e8e79ac3..04d52960 100644
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
QT5_MODULE="qtbase"
inherit qt5-build
@@ -14,14 +15,14 @@ fi
# TODO: linuxfb
IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
- jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+ jpeg +libinput +png tslib tuio +udev vnc wayland +X"
REQUIRED_USE="
- || ( eglfs xcb )
- accessibility? ( dbus xcb )
+ || ( eglfs X )
+ accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
libinput? ( udev )
- xcb? ( gles2? ( egl ) )
+ X? ( gles2? ( egl ) )
"
RDEPEND="
@@ -51,7 +52,7 @@ RDEPEND="
tuio? ( ~dev-qt/qtnetwork-${PV} )
udev? ( virtual/libudev:= )
vnc? ( ~dev-qt/qtnetwork-${PV} )
- xcb? (
+ X? (
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -111,13 +112,13 @@ QT5_GENTOO_CONFIG=(
!png:no-png:
tslib:tslib:
udev:libudev:
- xcb:xcb:
- xcb:xcb-glx:
- xcb:xcb-plugin:
- xcb:xcb-render:
- xcb:xcb-sm:
- xcb:xcb-xlib:
- xcb:xcb-xinput:
+ X:xcb:
+ X:xcb-glx:
+ X:xcb-plugin:
+ X:xcb-render:
+ X:xcb-sm:
+ X:xcb-xlib:
+ X:xcb-xinput:
)
QT5_GENTOO_PRIVATE_CONFIG=(
@@ -128,8 +129,8 @@ src_prepare() {
# don't add -O3 to CXXFLAGS, bug 549140
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
- # egl_x11 is activated when both egl and xcb are enabled
- use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+ # egl_x11 is activated when both egl and X are enabled
+ use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
qt_use_disable_config dbus dbus \
src/platformsupport/themes/genericunix/genericunix.pri
@@ -164,10 +165,10 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use tslib)
$(qt_use udev libudev)
- $(qt_use xcb xcb system)
- $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+ $(qt_use X xcb system)
+ $(usex X '-xcb-xlib -xcb-xinput -xkb' '')
)
- if use libinput || use xcb; then
+ if use libinput || use X; then
myconf+=( -xkbcommon )
fi
qt5-build_src_configure
next reply other threads:[~2020-01-19 23:54 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 23:54 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-11-11 20:24 [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ Andreas Sturmlechner
2023-09-23 15:56 Ionen Wolkens
2023-02-28 20:53 Jimi Huotari
2022-10-08 10:21 Andreas Sturmlechner
2022-09-07 18:08 Andreas Sturmlechner
2022-06-18 14:27 Andreas Sturmlechner
2022-05-20 19:38 Andreas Sturmlechner
2021-12-24 23:08 Andreas Sturmlechner
2021-10-16 23:24 Andreas Sturmlechner
2021-10-16 23:21 Davide Pesavento
2021-10-16 22:25 Davide Pesavento
2021-10-16 15:36 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-22 7:19 Andreas Sturmlechner
2021-09-15 20:01 Davide Pesavento
2021-08-27 11:41 Andreas Sturmlechner
2021-08-23 1:15 Andreas Sturmlechner
2020-09-10 17:49 Andreas Sturmlechner
2020-04-09 17:36 Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2020-03-18 21:51 Andreas Sturmlechner
2020-02-28 10:15 Andreas Sturmlechner
2020-02-05 19:29 Andreas Sturmlechner
2020-01-22 13:27 Jimi Huotari
2019-09-18 16:46 Jimi Huotari
2019-08-08 22:21 Andreas Sturmlechner
2019-05-18 2:38 Michael Palimaka
2019-03-03 20:01 Davide Pesavento
2019-01-07 1:04 Davide Pesavento
2018-12-06 3:47 Andreas Sturmlechner
2018-08-15 13:21 Jimi Huotari
2018-07-25 23:20 Jimi Huotari
2018-03-15 23:18 Jimi Huotari
2018-02-22 22:19 Andreas Sturmlechner
2018-02-03 3:57 Michael Palimaka
2018-02-02 11:54 Michael Palimaka
2018-01-26 13:27 Michael Palimaka
2018-01-01 3:10 Michael Palimaka
2017-10-10 11:47 Michael Palimaka
2017-08-27 5:50 Michael Palimaka
2017-06-04 13:32 Michael Palimaka
2017-04-15 4:46 Davide Pesavento
2016-12-01 14:21 Michael Palimaka
2016-12-01 13:49 Michael Palimaka
2016-06-13 0:11 Davide Pesavento
2016-05-24 20:53 Davide Pesavento
2016-04-23 16:11 Davide Pesavento
2016-01-19 19:14 Davide Pesavento
2015-12-03 16:40 Davide Pesavento
2015-12-03 16:32 Davide Pesavento
2015-10-29 12:50 Michael Palimaka
2015-06-24 18:46 Davide Pesavento
2015-06-24 18:22 Davide Pesavento
2015-06-24 17:34 Davide Pesavento
2015-06-24 17:34 Davide Pesavento
2015-06-24 16:48 Davide Pesavento
2015-06-24 16:38 Davide Pesavento
2015-06-24 16:38 Davide Pesavento
2015-06-23 20:57 Davide Pesavento
2015-06-23 20:57 Davide Pesavento
2015-06-23 20:57 Davide Pesavento
2015-06-23 20:57 Davide Pesavento
2015-06-23 16:19 Davide Pesavento
2015-05-10 1:18 Davide Pesavento
2015-04-19 18:10 Davide Pesavento
2015-04-19 17:18 Davide Pesavento
2015-04-19 17:18 Davide Pesavento
2015-04-19 16:55 Michael Palimaka
2015-04-01 0:35 Davide Pesavento
2015-03-26 2:59 Davide Pesavento
2015-03-26 2:13 Davide Pesavento
2015-03-26 1:49 Davide Pesavento
2015-03-26 1:08 Davide Pesavento
2014-10-16 18:51 Davide Pesavento
2014-09-02 3:14 Davide Pesavento
2014-09-01 23:37 Davide Pesavento
2014-08-21 13:57 Davide Pesavento
2014-08-21 10:39 Davide Pesavento
2014-07-28 23:48 Davide Pesavento
2014-07-28 12:55 Davide Pesavento
2014-07-27 13:36 Davide Pesavento
2014-07-27 1:39 Davide Pesavento
2014-07-26 10:46 Davide Pesavento
2014-07-26 10:46 Davide Pesavento
2014-07-24 1:05 Davide Pesavento
2014-07-10 19:31 Davide Pesavento
2014-06-28 2:37 Davide Pesavento
2014-05-28 0:45 Davide Pesavento
2014-05-28 0:31 Davide Pesavento
2014-05-28 0:31 Davide Pesavento
2014-05-27 22:59 Davide Pesavento
2014-05-23 18:21 Davide Pesavento
2014-05-14 2:35 Davide Pesavento
2014-05-12 13:34 Michael Palimaka
2014-05-08 16:02 Michael Palimaka
2014-03-11 19:05 Davide Pesavento
2014-01-27 2:23 Davide Pesavento
2014-01-18 10:46 Dennis Schridde
2013-11-16 15:57 Davide Pesavento
2013-11-12 23:25 Davide Pesavento
2013-10-01 0:54 Davide Pesavento
2013-10-01 0:01 Davide Pesavento
2013-10-01 0:01 Davide Pesavento
2013-09-29 10:49 Davide Pesavento
2013-08-06 8:04 Michael Palimaka
2013-07-08 9:06 Davide Pesavento
2013-07-08 9:06 Davide Pesavento
2013-07-08 9:06 Davide Pesavento
2013-06-12 7:46 Michael Palimaka
2013-06-11 11:56 Michael Palimaka
2013-06-10 9:30 Davide Pesavento
2013-06-10 8:22 Davide Pesavento
2013-04-22 0:49 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579043166.040f587dc703adc1e0eba504e83430a032ba3c62.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox