Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwidgets/
Date: Wed, 22 Sep 2021 20:01:54
Message-Id: 1632340891.d61dbe9fbbf29ba91958496ff6f5aa1a547d609e.asturm@gentoo
1 commit: d61dbe9fbbf29ba91958496ff6f5aa1a547d609e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 22 14:04:20 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 20:01:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61dbe9f
7
8 dev-qt/qtwidgets: Add IUSE=dbus to enable xdgdesktopportal build
9
10 New use flag builds Qt5 plugin for integration with flatpak and snap.
11
12 Add missing IUSE=gtk dependencies. No additional dependencies with
13 IUSE=dbus means the added REQUIRED_USE is cheap, and sys-apps/dbus is
14 already pulled in by x11-libs/gtk+3 (via dev-libs/glib) unconditionally.
15
16 Switch from ~PV to =QT5_PV* version dependencies.
17
18 Package-Manager: Portage-3.0.23, Repoman-3.0.3
19 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
20
21 ...dgets-5.15.2-r10.ebuild => qtwidgets-5.15.2-r11.ebuild} | 14 ++++++++++----
22 1 file changed, 10 insertions(+), 4 deletions(-)
23
24 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
25 similarity index 77%
26 rename from dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild
27 rename to dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
28 index ebc81a5c757..4c5ad74f9d8 100644
29 --- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r10.ebuild
30 +++ b/dev-qt/qtwidgets/qtwidgets-5.15.2-r11.ebuild
31 @@ -14,13 +14,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
32 fi
33
34 # keep IUSE defaults in sync with qtgui
35 -IUSE="gles2-only gtk +png +X"
36 +IUSE="dbus gles2-only gtk +png +X"
37 +
38 +REQUIRED_USE="gtk? ( dbus )"
39
40 DEPEND="
41 - ~dev-qt/qtcore-${PV}:5=
42 - ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
43 + =dev-qt/qtcore-${QT5_PV}*:5=
44 + =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
45 + dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
46 gtk? (
47 - ~dev-qt/qtgui-${PV}[dbus]
48 + dev-libs/glib:2
49 + =dev-qt/qtgui-${QT5_PV}*:5=[dbus]
50 x11-libs/gtk+:3
51 x11-libs/libX11
52 x11-libs/pango
53 @@ -35,6 +39,7 @@ QT5_TARGET_SUBDIRS=(
54 )
55
56 QT5_GENTOO_CONFIG=(
57 + dbus:xdgdesktopportal:
58 gtk:gtk3:
59 ::widgets
60 !:no-widgets:
61 @@ -47,6 +52,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
62 src_configure() {
63 local myconf=(
64 -opengl $(usex gles2-only es2 desktop)
65 + $(qt_use dbus)
66 $(qt_use gtk)
67 -gui
68 $(qt_use png libpng system)