[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2023-12-30 Thread Andreas Sturmlechner
commit: eeb63ce4adc8d99437233ce42b516be0398b7a6d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 30 14:02:53 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 30 14:02:53 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=eeb63ce4

dev-qt/qtwidgets: Rebased to 5.15.12 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{qtwidgets-5.15.11..ebuild => qtwidgets-5.15.12..ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.11..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.12..ebuild
similarity index 100%
rename from dev-qt/qtwidgets/qtwidgets-5.15.11..ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.15.12..ebuild



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2023-06-19 Thread Andreas Sturmlechner
commit: 6bb028064b2c4f98de7e4a9b58915bb438d6226d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 19 20:55:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 19 20:55:28 2023 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=6bb02806

dev-qt/qtwidgets: Add missing x11-libs/gtk+[X] USEdep

src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp includes gdk/gdkx.h

Bug: https://bugs.gentoo.org/908291
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15.10..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.10..ebuild
index 43c78a85..a4f8b71a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.10..ebuild
@@ -24,7 +24,7 @@ DEPEND="
gtk? (
dev-libs/glib:2
=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-   x11-libs/gtk+:3
+   x11-libs/gtk+:3[X]
x11-libs/libX11
x11-libs/pango
)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2022-11-21 Thread Andreas Sturmlechner
commit: 82a24252bc90ce97bae984803a8ed3abe4609d0b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Fri Sep 16 00:00:00 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 21 13:01:06 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=82a24252

dev-qt/qtwidgets: Pass flag -dbus-linked to configure

This is consistent with dev-qt/qtdbus, dev-qt/qtgui, dev-qt/qtnetwork.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15.7..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.7..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.7..ebuild
index 8050e865..3642fec4 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.7..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.7..ebuild
@@ -51,7 +51,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 src_configure() {
local myconf=(
-opengl $(usex gles2-only es2 desktop)
-   $(qt_use dbus)
+   $(usev dbus -dbus-linked)
$(qt_use gtk)
-gui
$(qt_use png libpng system)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2022-06-18 Thread Andreas Sturmlechner
commit: 31a41d9958aebd60a12d6b0421411b4ef626c82d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed May 25 11:17:58 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 18 14:22:08 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=31a41d99

dev-qt/qtwidgets: keyword 5.15.5. for ~loong

See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.5..ebuild
index 7b0951c3..7e18bf21 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.5..ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the 
Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2022-05-14 Thread Andreas Sturmlechner
commit: 03727f788e41bef43fded9211959e1feebfb561a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 14 21:08:29 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 14 21:14:27 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=03727f78

dev-qt/qtwidgets: Rebased to 5.15.4 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{qtwidgets-5.15.3..ebuild => qtwidgets-5.15.4..ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.3..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.4..ebuild
similarity index 96%
rename from dev-qt/qtwidgets/qtwidgets-5.15.3..ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.15.4..ebuild
index f4b65bfa..7b0951c3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.3..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.4..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2022-03-04 Thread Andreas Sturmlechner
commit: b8d3c750f3dcbb84fa232318de6ac9bde2f8d5a1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  4 09:39:42 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  4 09:39:42 2022 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=b8d3c750

dev-qt/qtwidgets: Rebased to 5.15.3 branch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{qtwidgets-5.15.2..ebuild => qtwidgets-5.15.3..ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.3..ebuild
similarity index 100%
rename from dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.15.3..ebuild



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2021-09-22 Thread Andreas Sturmlechner
commit: a8958b69b6e0806cc286d82027b83f6f32fe4922
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 22 13:59:15 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 22 19:21:58 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a8958b69

dev-qt/qtwidgets: Add IUSE=dbus to enable xdgdesktopportal build

New use flag builds Qt5 plugin for integration with flatpak and snap.

Add missing IUSE=gtk dependencies. No additional dependencies with
IUSE=dbus means the added REQUIRED_USE is cheap, and sys-apps/dbus is
already pulled in by x11-libs/gtk+3 (via dev-libs/glib) unconditionally.

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild
index 8380129e..f4b65bfa 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.2..ebuild
@@ -13,13 +13,17 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
+IUSE="dbus gles2-only gtk +png +X"
+
+REQUIRED_USE="gtk? ( dbus )"
 
 DEPEND="
=dev-qt/qtcore-${QT5_PV}*:5=
-   =dev-qt/qtgui-${QT5_PV}*[gles2-only=,png=,X?]
+   =dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
+   dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
gtk? (
-   =dev-qt/qtgui-${QT5_PV}*[dbus]
+   dev-libs/glib:2
+   =dev-qt/qtgui-${QT5_PV}*:5=[dbus]
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango
@@ -34,6 +38,7 @@ QT5_TARGET_SUBDIRS=(
 )
 
 QT5_GENTOO_CONFIG=(
+   dbus:xdgdesktopportal:
gtk:gtk3:
::widgets
!:no-widgets:
@@ -46,6 +51,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 src_configure() {
local myconf=(
-opengl $(usex gles2-only es2 desktop)
+   $(qt_use dbus)
$(qt_use gtk)
-gui
$(qt_use png libpng system)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2021-08-20 Thread Andreas Sturmlechner
commit: 9ada11f0aec850a1027a3eb590ecf6ec54ba3a49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 19 18:38:04 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 20 12:34:10 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ada11f0

dev-qt/qtwidgets: EAPI-8 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
index f2e3982d..385a4f95 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 QT5_MODULE="qtbase"
 inherit qt5-build
@@ -51,7 +51,7 @@ src_configure() {
$(qt_use png libpng system)
-widgets
$(qt_use X xcb)
-   $(usex X '-xcb-xlib -xkbcommon' '')
+   $(usev X '-xcb-xlib -xkbcommon')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtnetwork/, dev-qt/qtconcurrent/, dev-qt/qtchooser/, ...

2021-08-11 Thread Andreas Sturmlechner
commit: 9d7974f8ef6c3d20da1b2acc520fae4d6755c056
Author: Alex Fan  yahoo  com>
AuthorDate: Thu Jul 22 03:05:20 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 10 18:52:29 2021 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9d7974f8

dev-qt: keyword various packages for ~riscv

Sync with Gentoo ebuild repo.

See also: https://github.com/gentoo/gentoo/pull/21750

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alex Fan  yahoo.com>
Signed-off-by: Yixun Lan  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtchooser/qtchooser-.ebuild| 4 ++--
 dev-qt/qtconcurrent/qtconcurrent-5.15..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.15..ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5.15..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild   | 2 +-
 dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15..ebuild | 2 +-
 dev-qt/qtgui/qtgui-5.15..ebuild   | 2 +-
 dev-qt/qtimageformats/qtimageformats-5.15..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.15..ebuild   | 2 +-
 dev-qt/qtquickcontrols/qtquickcontrols-5.15..ebuild   | 2 +-
 dev-qt/qtquickcontrols2/qtquickcontrols2-5.15..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.15..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.15..ebuild   | 2 +-
 dev-qt/qttest/qttest-5.15..ebuild | 2 +-
 dev-qt/qtwayland/qtwayland-5.15..ebuild   | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.15..ebuild   | 2 +-
 dev-qt/qtx11extras/qtx11extras-5.15..ebuild   | 2 +-
 dev-qt/qtxml/qtxml-5.15..ebuild   | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev-qt/qtchooser/qtchooser-.ebuild 
b/dev-qt/qtchooser/qtchooser-.ebuild
index aacf7457..a246286a 100644
--- a/dev-qt/qtchooser/qtchooser-.ebuild
+++ b/dev-qt/qtchooser/qtchooser-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == ** ]]; then
inherit git-r3
 else
SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz";
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"

diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15..ebuild 
b/dev-qt/qtconcurrent/qtconcurrent-5.15..ebuild
index 870caa28..c3dc742d 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15..ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15..ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild 
b/dev-qt/qtcore/qtcore-5.15..ebuild
index 06672498..a160f08e 100644
--- a/dev-qt/qtcore/qtcore-5.15..ebuild
+++ b/dev-qt/qtcore/qtcore-5.15..ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="icu old-kernel systemd"

diff --git a/dev-qt/qtdbus/qtdbus-5.15..ebuild 
b/dev-qt/qtdbus/qtdbus-5.15..ebuild
index 9f439f0d..0c5e2605 100644
--- a/dev-qt/qtdbus/qtdbus-5.15..ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15..ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus 
protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild 
b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild
index 4b9b9920..91cb5fd2 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15..ebuild
@@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"

diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15..ebuild 
b

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/files/, dev-qt/qtx11extras/, dev-qt/qtvirtualkeyboard/, ...

2020-04-20 Thread Andreas Sturmlechner
commit: 4e8e5fef694482ada7f984cd0757778a2f0bce25
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 20 18:36:21 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 20 18:36:21 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4e8e5fef

dev-qt: Drop Qt 5.15.0_beta3

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/assistant/Manifest  |   1 -
 dev-qt/assistant/assistant-5.15.0_beta3.ebuild |  55 --
 dev-qt/designer/Manifest   |   1 -
 dev-qt/designer/designer-5.15.0_beta3.ebuild   |  67 
 dev-qt/linguist-tools/Manifest |   1 -
 .../linguist-tools-5.15.0_beta3.ebuild |  45 -
 dev-qt/linguist/Manifest   |   1 -
 dev-qt/linguist/linguist-5.15.0_beta3.ebuild   |  48 --
 dev-qt/pixeltool/Manifest  |   1 -
 dev-qt/pixeltool/pixeltool-5.15.0_beta3.ebuild |  35 
 dev-qt/qdbus/Manifest  |   1 -
 dev-qt/qdbus/qdbus-5.15.0_beta3.ebuild |  25 ---
 dev-qt/qdbusviewer/Manifest|   1 -
 dev-qt/qdbusviewer/qdbusviewer-5.15.0_beta3.ebuild |  45 -
 dev-qt/qdoc/Manifest   |   1 -
 dev-qt/qdoc/qdoc-5.15.0_beta3.ebuild   |  41 -
 dev-qt/qt3d/Manifest   |   1 -
 dev-qt/qt3d/qt3d-5.15.0_beta3.ebuild   |  34 
 dev-qt/qtbluetooth/Manifest|   1 -
 dev-qt/qtbluetooth/qtbluetooth-5.15.0_beta3.ebuild |  33 
 dev-qt/qtcharts/Manifest   |   1 -
 dev-qt/qtcharts/qtcharts-5.15.0_beta3.ebuild   |  29 
 dev-qt/qtconcurrent/Manifest   |   1 -
 .../qtconcurrent/qtconcurrent-5.15.0_beta3.ebuild  |  23 ---
 dev-qt/qtcore/Manifest |   1 -
 dev-qt/qtcore/qtcore-5.15.0_beta3.ebuild   | 100 ---
 dev-qt/qtdatavis3d/Manifest|   1 -
 dev-qt/qtdatavis3d/qtdatavis3d-5.15.0_beta3.ebuild |  31 
 dev-qt/qtdbus/Manifest |   1 -
 dev-qt/qtdbus/qtdbus-5.15.0_beta3.ebuild   |  43 -
 dev-qt/qtdeclarative/Manifest  |   1 -
 ...15.0_beta3-cmake-targets-double-inclusion.patch |  44 -
 .../qtdeclarative-5.15.0_beta3.ebuild  |  55 --
 dev-qt/qtdiag/Manifest |   1 -
 dev-qt/qtdiag/qtdiag-5.15.0_beta3.ebuild   |  46 --
 dev-qt/qtgamepad/Manifest  |   1 -
 dev-qt/qtgamepad/qtgamepad-5.15.0_beta3.ebuild |  35 
 dev-qt/qtgraphicaleffects/Manifest |   1 -
 .../qtgraphicaleffects-5.15.0_beta3.ebuild |  21 ---
 dev-qt/qtgui/Manifest  |   1 -
 dev-qt/qtgui/qtgui-5.15.0_beta3.ebuild | 184 -
 dev-qt/qthelp/Manifest |   1 -
 dev-qt/qthelp/qthelp-5.15.0_beta3.ebuild   |  29 
 dev-qt/qtimageformats/Manifest |   1 -
 .../qtimageformats-5.15.0_beta3.ebuild |  30 
 dev-qt/qtlocation/Manifest |   1 -
 dev-qt/qtlocation/qtlocation-5.15.0_beta3.ebuild   |  47 --
 dev-qt/qtmultimedia/Manifest   |   1 -
 .../qtmultimedia/qtmultimedia-5.15.0_beta3.ebuild  |  68 
 dev-qt/qtnetwork/Manifest  |   1 -
 dev-qt/qtnetwork/qtnetwork-5.15.0_beta3.ebuild |  62 ---
 dev-qt/qtnetworkauth/Manifest  |   1 -
 .../qtnetworkauth-5.15.0_beta3.ebuild  |  20 ---
 dev-qt/qtopengl/Manifest   |   1 -
 dev-qt/qtopengl/qtopengl-5.15.0_beta3.ebuild   |  34 
 dev-qt/qtpaths/Manifest|   1 -
 dev-qt/qtpaths/qtpaths-5.15.0_beta3.ebuild |  33 
 dev-qt/qtplugininfo/Manifest   |   1 -
 .../qtplugininfo/qtplugininfo-5.15.0_beta3.ebuild  |  33 
 dev-qt/qtpositioning/Manifest  |   1 -
 .../qtpositioning-5.15.0_beta3.ebuild  |  40 -
 dev-qt/qtprintsupport/Manifest |   1 -
 .../qtprintsupport-5.15.0_beta3.ebuild |  42 -
 dev-qt/qtquickcontrols/Manifest|   1 -
 .../qtquickcontrols-5.15.0_beta3.ebuild|  32 
 dev-qt/qtquickcontrols2/Manifest   |   1 -
 .../qtquickcontrols2-5.15.0_beta3.ebuild   |  30 
 dev-qt/qtscript/Manifest   |   1 -
 dev-qt/qtscript/qtscript-5.15.0_beta3.ebuild   |  36 
 dev-qt/qtscxml/Manifest|   1 -
 dev-qt/qtscxml/qtscxml-5.15.0_beta3.ebuild |  19 ---
 dev-qt/qtsensors/Manifest  |   1 -
 dev-qt/qtsensors/qtsensors-5.15.0_beta3.ebuild |  28 
 dev-qt/qtserialbus/Manifest 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/

2020-04-06 Thread Andreas Sturmlechner
commit: 8adb90fd21e13ab8ae32b4f658886af88ea3f26a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr  6 22:15:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr  6 22:24:50 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8adb90fd

dev-qt/qtwidgets: Fix double inclusion of CMake plugin targets

See also: https://bugreports.qt.io/browse/QTBUG-83282

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 0_beta3-cmake-targets-double-inclusion-0.patch | 35 ++
 0_beta3-cmake-targets-double-inclusion-1.patch | 25 
 dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild |  2 ++
 3 files changed, 62 insertions(+)

diff --git 
a/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch
 
b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch
new file mode 100644
index ..a796bdfd
--- /dev/null
+++ 
b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch
@@ -0,0 +1,35 @@
+From 7e7c6498841cb4e5a5b4454424a374b70bb111d9 Mon Sep 17 00:00:00 2001
+From: Kai Koehne 
+Date: Fri, 3 Apr 2020 10:39:14 +0200
+Subject: [PATCH] CMake: Fix double inclusion of CMake plugin targets
+
+After 99ace38d22c640e37bb1a41095ee3b126169816a, all plugin files are
+included automatically, not only the ones ending in Plugin.cmake.
+
+Thus the extra inclusion done by the QmlConfigExtras file should only
+be done if strict mode is set.
+
+Amends 99ace38d22c640e37bb1a41095ee3b126169816a
+Amends 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4
+
+Task-number: QTBUG-83282
+Change-Id: I416cbad6c4788d605a9a74f21062543c9c98e968
+Reviewed-by: Alexandru Croitor 
+---
+ src/widgets/Qt5WidgetsConfigExtras.cmake.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 
b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+index 236d1d4159c..f05dae23ea7 100644
+--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -14,7 +14,8 @@ if (NOT TARGET Qt5::uic)
+ )
+ endif()
+ 
+-include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" 
OPTIONAL)
++if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB)
++include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" 
OPTIONAL)
+ 
+ set(Qt5Widgets_UIC_EXECUTABLE Qt5::uic)
+ 

diff --git 
a/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch
 
b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch
new file mode 100644
index ..56783fc6
--- /dev/null
+++ 
b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch
@@ -0,0 +1,25 @@
+From 3f9862db95ffbe1f87bc17b147b5c68954b4044d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?=
+ 
+Date: Sun, 5 Apr 2020 12:06:58 +0200
+Subject: [PATCH] Add missing endif() in a CMake file
+
+Change-Id: I545a91dafd26d0fc88c3b205aec9805629b9371e
+Reviewed-by: Kai Koehne 
+---
+ src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 
b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+index f05dae23ea7..83d8004a08f 100644
+--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -16,7 +16,7 @@ endif()
+ 
+ if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB)
+ include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" 
OPTIONAL)
+-
++endif()
+ set(Qt5Widgets_UIC_EXECUTABLE Qt5::uic)
+ 
+ # Create versionless tool targets.

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild
index 40218072..417cf210 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild
@@ -43,6 +43,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:widgets
 )
 
+PATCHES=( "${FILESDIR}"/${P}-cmake-targets-double-inclusion-{0,1}.patch ) # 
QTBUG-83282
+
 src_configure() {
local myconf=(
-opengl $(usex gles2-only es2 desktop)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2020-04-03 Thread Andreas Sturmlechner
commit: 357c7d14b6cc9a59012e15c07e38e8b8ddb99c56
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sat Nov 23 09:37:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  2 18:09:22 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=357c7d14

dev-qt/qtwidgets: rename USE=gles2 to USE=gles2-only

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwidgets/metadata.xml   | 1 -
 dev-qt/qtwidgets/qtwidgets-5.14..ebuild | 6 +++---
 dev-qt/qtwidgets/qtwidgets-5.15..ebuild | 6 +++---
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 910cf075..115da8d2 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -6,7 +6,6 @@
Gentoo Qt Project


-   Use GLES 2.0 or later instead of full 
OpenGL
Build the GTK platform theme plugin



diff --git a/dev-qt/qtwidgets/qtwidgets-5.14..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.14..ebuild
index 3d14a9cd..07ee6091 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14..ebuild
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +X"
+IUSE="gles2-only gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
+   ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -45,7 +45,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
local myconf=(
-   -opengl $(usex gles2 es2 desktop)
+   -opengl $(usex gles2-only es2 desktop)
$(qt_use gtk)
-gui
$(qt_use png libpng system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
index 0cf42233..40218072 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +X"
+IUSE="gles2-only gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
+   ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -45,7 +45,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
local myconf=(
-   -opengl $(usex gles2 es2 desktop)
+   -opengl $(usex gles2-only es2 desktop)
$(qt_use gtk)
-gui
$(qt_use png libpng system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 3d14a9cd..07ee6091 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -13,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +X"
+IUSE="gles2-only gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
+   ~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -45,7 +45,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 
 src_configure() {
local myconf=(
-   -opengl $(usex gles2 es2 desktop)
+   -opengl $(usex gles2-only es2 desktop)
$(qt_use gtk)
-gui
$(qt_use png libpng system)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2020-01-22 Thread Jimi Huotari
commit: ecc0d566a5f4dbc290bc45d73f7b1b5c98781880
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Jan 22 11:40:46 2020 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Jan 22 11:40:46 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ecc0d566

dev-qt/qtwidgets: fix 5.15 configure with and without USE="X"

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
index 4032c89b..0cf42233 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
@@ -50,7 +50,7 @@ src_configure() {
-gui
$(qt_use png libpng system)
-widgets
-   $(qt_use X)
+   $(qt_use X xcb)
$(usex X '-xcb-xlib -xkbcommon' '')
)
qt5-build_src_configure



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2020-01-19 Thread Andreas Sturmlechner
commit: 71bfd3c05c75cb8ee0fa0179b1f34a732a4e5f17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 14 23:09:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 14 23:09:54 2020 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=71bfd3c0

dev-qt/qtwidgets: 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  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.12..ebuild | 11 ++-
 dev-qt/qtwidgets/qtwidgets-5.14..ebuild | 11 ++-
 dev-qt/qtwidgets/qtwidgets-5.15..ebuild | 11 ++-
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 11 ++-
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
index 700b6405..3d14a9cd 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12..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
 
@@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2 gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -49,8 +50,8 @@ src_configure() {
-gui
$(qt_use png libpng system)
-widgets
-   $(qt_use xcb xcb system)
-   $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+   $(qt_use X xcb system)
+   $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.14..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.14..ebuild
index 700b6405..3d14a9cd 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14..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
 
@@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2 gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -49,8 +50,8 @@ src_configure() {
-gui
$(qt_use png libpng system)
-widgets
-   $(qt_use xcb xcb system)
-   $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+   $(qt_use X xcb system)
+   $(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
index fb915b77..4032c89b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15..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
 
@@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2 gtk +png +X"
 
 DEPEND="
~dev-qt/qtcore-${PV}
-   ~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[gles2=,png=,X?]
gtk? (
~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
@@ -49,8 +50,8 @@ src_configure() {
-gui
$(qt_use png libpng system)
-widgets
-   $(qt_use xcb)
-   $(usex xcb '-xcb-xlib -xkbcommon' '')
+   $(qt_use X)
+   $(usex X '-xcb-xlib -xkbcommon' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 700b6405..3d14a9cd 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..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
 
@@ -12,11 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtk +png +xcb"
+IUSE="gles2 gtk

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/

2019-09-29 Thread Andreas Sturmlechner
commit: a01453d34ae409ef1a3430a08c01b4633484a696
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 28 09:55:39 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 28 09:55:55 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a01453d3

dev-qt/qtwidgets: Fix focus widget issue

Fixes keyboard input or rather lack thereof in qtwebengine based applications.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...dgets-5.13.1-adjust-focus-widget-properly.patch | 34 ++
 dev-qt/qtwidgets/qtwidgets-5.13.1.ebuild   |  2 ++
 2 files changed, 36 insertions(+)

diff --git 
a/dev-qt/qtwidgets/files/qtwidgets-5.13.1-adjust-focus-widget-properly.patch 
b/dev-qt/qtwidgets/files/qtwidgets-5.13.1-adjust-focus-widget-properly.patch
new file mode 100644
index ..6fdc0f2b
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.13.1-adjust-focus-widget-properly.patch
@@ -0,0 +1,34 @@
+From 947883141d9d8b3079a8a21981ad8a5ce3c4798e Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Mon, 9 Sep 2019 18:12:26 +0200
+Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly
+
+My commit 3e7463411e adjusted the focus widget by setting
+QApplicationPrivate::focus_widget directly, while there is a method for
+doing this properly, including setFocus_sys() and emitting signals.
+
+Fixes: QTBUG-77364
+Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4
+Reviewed-by: Florian Bruhin 
+Reviewed-by: Volker Hilsheimer 
+Reviewed-by: Allan Sandfeld Jensen 
+Reviewed-by: Shawn Rutledge 
+---
+ src/widgets/kernel/qwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 04290a4ce12..0fa59077449 100644
+--- a/src/widgets/kernel/qwidget.cpp
 b/src/widgets/kernel/qwidget.cpp
+@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
+ 
+ if (changingAppFocusWidget) {
+ QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+-QApplicationPrivate::focus_widget = newDeepestFocusProxy ? 
newDeepestFocusProxy : this;
++QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? 
newDeepestFocusProxy : this, Qt::NoFocusReason);
+ }
+ }
+ 
+-- 
+2.16.3

diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.13.1.ebuild
index 85ceaa9c..677d210f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.1.ebuild
@@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=(
:widgets
 )
 
+PATCHES=( "${FILESDIR}/${P}-adjust-focus-widget-properly.patch" ) # QTBUG-77364
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2019-09-18 Thread Jimi Huotari
commit: 73e9c00613ce01c85c006a452a7a2fba9c2ba6a7
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Sep 18 18:57:00 2019 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Sep 18 18:57:00 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=73e9c006

dev-qt/qtwidgets: adjust xcb configure options for 5.15

0. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jimi Huotari  gentoo.org>

 dev-qt/qtwidgets/qtwidgets-5.15..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
index 85ceaa9c..1ab36261 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15..ebuild
@@ -49,8 +49,8 @@ src_configure() {
-gui
$(qt_use png libpng system)
-widgets
-   $(qt_use xcb xcb system)
-   $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+   $(qt_use xcb)
+   $(usex xcb '-xcb-xlib -xkbcommon' '')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-12-19 Thread Jimi Huotari
commit: e46756c9970782657cbeb29edb19486a29f9f6d8
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Dec 19 16:03:42 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Dec 19 16:03:50 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e46756c9

dev-qt/qtwidgets: update configuration with regards to 'xkbcommon'

Upstream: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=c3a963da

Bug: https://bugs.gentoo.org/672340
Signed-off-by: Jimi Huotari  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.12

 dev-qt/qtwidgets/qtwidgets-5.12..ebuild | 5 ++---
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
index 3798cf2e..b62d3677 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,8 +50,7 @@ src_configure() {
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)
-   $(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+   $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 3798cf2e..b62d3677 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,8 +50,7 @@ src_configure() {
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)
-   $(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+   $(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-08-15 Thread Jimi Huotari
commit: f6c63e189dedbc2cbd6aecf8881ea063283d
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Aug 15 13:20:16 2018 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Wed Aug 15 13:20:16 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f6c63e18

dev-qt/qtwidgets: replace 'xinput2' with 'xcb-xinput'

Closes: https://bugs.gentoo.org/651306
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 dev-qt/qtwidgets/qtwidgets-5.12..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
index caf1f79a..3798cf2e 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12..ebuild
@@ -51,7 +51,7 @@ src_configure() {
-widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+   $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index caf1f79a..3798cf2e 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -51,7 +51,7 @@ src_configure() {
-widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
+   $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-02-06 Thread Michael Palimaka
commit: dfc5f67f13306a3bf15fbbbc58fcac15546bc093
Author: Psi  psionix  net>
AuthorDate: Tue Feb  6 12:31:50 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Feb  6 12:32:30 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=dfc5f67f

dev-qt/qtwidgets: add widgets to widgets to QT5_GENTOO_CONFIG

Bug: https://bugs.gentoo.org/646504
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild| 1 +
 dev-qt/qtwidgets/qtwidgets-5.10..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.11..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild  | 1 +
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 1 +
 5 files changed, 5 insertions(+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
index 4b650e6c..ccb0c529 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
gtk:gtk3:
+   ::widgets
!:no-widgets:
 )
 

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
index 4b650e6c..ccb0c529 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
gtk:gtk3:
+   ::widgets
!:no-widgets:
 )
 

diff --git a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
index 4b650e6c..ccb0c529 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
gtk:gtk3:
+   ::widgets
!:no-widgets:
 )
 

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index 4b650e6c..ccb0c529 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
gtk:gtk3:
+   ::widgets
!:no-widgets:
 )
 

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 4b650e6c..ccb0c529 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -34,6 +34,7 @@ QT5_TARGET_SUBDIRS=(
 
 QT5_GENTOO_CONFIG=(
gtk:gtk3:
+   ::widgets
!:no-widgets:
 )
 



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-02-02 Thread Michael Palimaka
commit: 79fac64728ac10c6b401b863d64a13497b452be6
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Feb  3 04:34:02 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Feb  3 04:34:13 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=79fac647

dev-qt/qtwidgets: enable gui too

Building with -no-gui -widgets results in the following error:
ERROR: Feature 'widgets' was enabled, but the pre-condition 'features.gui' 
failed.

Closes: https://bugs.gentoo.org/646460
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild| 1 +
 dev-qt/qtwidgets/qtwidgets-5.10..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.11..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild  | 1 +
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 1 +
 6 files changed, 6 insertions(+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 231d0426..4b650e6c 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -45,6 +45,7 @@ src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
+   -gui
$(qt_use png libpng system)
-widgets
$(qt_use xcb xcb system)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-02-02 Thread Michael Palimaka
commit: 7062bdeb28f6fd0017653b53aefcd54d4bd6f188
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Feb  3 03:57:30 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Feb  3 03:57:35 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=7062bdeb

dev-qt/qtwidgets: enable widgets

Since e553539e7ee050d094da9a4673b2e5ac71aae422, we started passing -no-widgets
so we need to start explicitly enabling it here.

Bug: https://bugs.gentoo.org/646448
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild| 1 +
 dev-qt/qtwidgets/qtwidgets-5.10..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.11..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild  | 1 +
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 1 +
 6 files changed, 6 insertions(+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')

diff --git a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 48abddf9..231d0426 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -46,6 +46,7 @@ src_configure() {
-opengl $(usex gles2 es2 desktop)
$(qt_use gtk)
$(qt_use png libpng system)
+   -widgets
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
$(usex xcb '-xcb-xlib -xinput2 -xkb' '')



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2018-02-02 Thread Michael Palimaka
commit: 8cdf091054f43116d40dc6945d8b893e1ddc702c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 26 02:57:17 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 11:53:56 2018 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=8cdf0910

dev-qt/qtwidgets: add QT5_GENTOO_PRIVATE_CONFIG

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild| 6 +-
 dev-qt/qtwidgets/qtwidgets-5.10..ebuild | 6 +-
 dev-qt/qtwidgets/qtwidgets-5.11..ebuild | 4 
 dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild | 4 
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild  | 6 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 6 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
index b82ca24a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
index b82ca24a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
index 0825646a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11..ebuild
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
index 0825646a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4.ebuild
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index b82ca24a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index b82ca24a..48abddf9 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,10 @@ QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
 
+QT5_GENTOO_PRIVATE_CONFIG=(
+   :widgets
+)
+
 src_configure() {
local myconf=(
-opengl $(usex gles2 es2 desktop)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2017-10-15 Thread Michael Palimaka
commit: 4549cb1cbe2a3bf813e37a28c0505fcb2b45f900
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Oct 15 11:10:01 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 15 11:11:06 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=4549cb1c

dev-qt/qtwidgets: USE="gtk" requires dev-qt/qtgui[dbus]

Bug: https://bugs.gentoo.org/634072
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qtwidgets/qtwidgets-5.10..ebuild | 1 +
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild  | 1 +
 dev-qt/qtwidgets/qtwidgets-5..ebuild| 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
index ed7f16fb..b82ca24a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.10..ebuild
@@ -18,6 +18,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
gtk? (
+   ~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index ed7f16fb..b82ca24a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -18,6 +18,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
gtk? (
+   ~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index ed7f16fb..b82ca24a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -18,6 +18,7 @@ DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
gtk? (
+   ~dev-qt/qtgui-${PV}[dbus]
x11-libs/gtk+:3
x11-libs/libX11
x11-libs/pango



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2017-08-05 Thread Michael Palimaka
commit: 94b673ed7f32a5baa3abeec907f4185ab42278e8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug  6 05:12:52 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug  6 05:13:06 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=94b673ed

Revert "dev-qt/qtwidgets: sort QT5_TARGET_SUBDIRS"

This reverts commit e1ac537830bb55148e0edf960aa60cb42b22f045.

 dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild| 2 +-
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
index 3aa656ff..ed7f16fb 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
-   src/plugins/platformthemes
src/tools/uic
src/widgets
+   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index 3aa656ff..ed7f16fb 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
-   src/plugins/platformthemes
src/tools/uic
src/widgets
+   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 3aa656ff..ed7f16fb 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
-   src/plugins/platformthemes
src/tools/uic
src/widgets
+   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2017-08-05 Thread Michael Palimaka
commit: e1ac537830bb55148e0edf960aa60cb42b22f045
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Aug  6 03:46:42 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug  6 03:48:09 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=e1ac5378

dev-qt/qtwidgets: sort QT5_TARGET_SUBDIRS

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild| 2 +-
 dev-qt/qtwidgets/qtwidgets-5.9..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
index ed7f16fb..3aa656ff 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.1.ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
+   src/plugins/platformthemes
src/tools/uic
src/widgets
-   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
index ed7f16fb..3aa656ff 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9..ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
+   src/plugins/platformthemes
src/tools/uic
src/widgets
-   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index ed7f16fb..3aa656ff 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -26,9 +26,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 QT5_TARGET_SUBDIRS=(
+   src/plugins/platformthemes
src/tools/uic
src/widgets
-   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2017-04-14 Thread Davide Pesavento
commit: 3b974dbd918a500debc65d7f8f5979dc3b912f69
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Mar 15 16:15:46 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Apr 15 04:41:10 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=3b974dbd

dev-qt/qtwidgets: Stop passing -xrender to configure on {5,5.8}.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qtwidgets/qtwidgets-5.8..ebuild | 4 ++--
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.8..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
index d17ef19c..ed7f16fb 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,7 +43,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
+   $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index d17ef19c..ed7f16fb 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,7 +43,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
+   $(usex xcb '-xcb-xlib -xinput2 -xkb' '')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtgui/

2016-12-05 Thread Michael Palimaka
commit: 09ec279994a1c99582b923c98deb9e6bafd551e6
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec  1 14:33:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec  6 05:40:32 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=09ec2799

dev-qt/qtgui: move gtk platform plugin to qtwidgets

See qtbase commit 2d3c73fcfe7a93cb46190e8e82410fe93145dbe0.

 dev-qt/qtgui/qtgui-5.8..ebuild | 13 ++---
 dev-qt/qtgui/qtgui-5..ebuild   | 13 ++---
 dev-qt/qtwidgets/metadata.xml  |  1 +
 dev-qt/qtwidgets/qtwidgets-5.8..ebuild | 10 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 10 +-
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/dev-qt/qtgui/qtgui-5.8..ebuild 
b/dev-qt/qtgui/qtgui-5.8..ebuild
index a8baafa..3e2c4ce 100644
--- a/dev-qt/qtgui/qtgui-5.8..ebuild
+++ b/dev-qt/qtgui/qtgui-5.8..ebuild
@@ -14,8 +14,8 @@ fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
-   ibus jpeg libinput +png tslib tuio +udev vnc +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+   jpeg libinput +png tslib tuio +udev vnc +xcb"
 REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -40,12 +40,6 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
-   gtk? (
-   x11-libs/gtk+:3
-   x11-libs/libX11
-   x11-libs/pango
-   !!x11-libs/cairo[qt4]
-   )
gles2? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
@@ -88,7 +82,6 @@ QT5_TARGET_SUBDIRS=(
src/plugins/imageformats
src/plugins/platforms
src/plugins/platforminputcontexts
-   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(
@@ -105,7 +98,6 @@ QT5_GENTOO_CONFIG=(
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
-   gtk:gtk3:
!:no-gui:
:system-harfbuzz:HARFBUZZ
!:no-harfbuzz:
@@ -159,7 +151,6 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
-   $(qt_use gtk)
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)

diff --git a/dev-qt/qtgui/qtgui-5..ebuild b/dev-qt/qtgui/qtgui-5..ebuild
index a8baafa..3e2c4ce 100644
--- a/dev-qt/qtgui/qtgui-5..ebuild
+++ b/dev-qt/qtgui/qtgui-5..ebuild
@@ -14,8 +14,8 @@ fi
 
 # TODO: linuxfb
 
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 gtk
-   ibus jpeg libinput +png tslib tuio +udev vnc +xcb"
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+   jpeg libinput +png tslib tuio +udev vnc +xcb"
 REQUIRED_USE="
|| ( eglfs xcb )
accessibility? ( dbus xcb )
@@ -40,12 +40,6 @@ RDEPEND="
x11-libs/libdrm
)
evdev? ( sys-libs/mtdev )
-   gtk? (
-   x11-libs/gtk+:3
-   x11-libs/libX11
-   x11-libs/pango
-   !!x11-libs/cairo[qt4]
-   )
gles2? ( media-libs/mesa[gles2] )
jpeg? ( virtual/jpeg:0 )
libinput? (
@@ -88,7 +82,6 @@ QT5_TARGET_SUBDIRS=(
src/plugins/imageformats
src/plugins/platforms
src/plugins/platforminputcontexts
-   src/plugins/platformthemes
 )
 
 QT5_GENTOO_CONFIG=(
@@ -105,7 +98,6 @@ QT5_GENTOO_CONFIG=(
!gif:no-gif:
gles2::OPENGL_ES
gles2:opengles2:OPENGL_ES_2
-   gtk:gtk3:
!:no-gui:
:system-harfbuzz:HARFBUZZ
!:no-harfbuzz:
@@ -159,7 +151,6 @@ src_configure() {
-fontconfig
-system-freetype
$(usex gif '' -no-gif)
-   $(qt_use gtk)
-system-harfbuzz
$(qt_use jpeg libjpeg system)
$(qt_use libinput)

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 90521a2..546354b 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -7,6 +7,7 @@


Use GLES 2.0 or later instead of full 
OpenGL
+   Build the GTK platform theme plugin
Build a Qt style called GTK+ that mimics 
the active
GTK+ theme


diff --git a/dev-qt/qtwidgets/qtwidgets-5.8..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
index 587ace3..ee94617 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.8..ebuild
@@ -13,26 +13,34 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 +png +xcb"
+IUSE="gles2 gtk +png +xcb"
 
 DEPEND="
~dev-qt/qtcore-${PV}
~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+   gtk? (
+   x11-libs/gtk+:3
+   x11-libs/libX11
+   x11-libs/pango
+   )

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2016-06-12 Thread Davide Pesavento
commit: 65fd961afba6fac4ce3bc34107b0a44dd3ea562a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Jun 13 00:06:24 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Jun 13 00:11:05 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=65fd961a

dev-qt/qtwidgets: convert to usex

Package-Manager: portage-2.3.0_rc1

 dev-qt/qtwidgets/qtwidgets-5.6.1.ebuild| 2 +-
 dev-qt/qtwidgets/qtwidgets-5.6..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.7.0_rc.ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.7..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.6.1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.6.1.ebuild
index f41ac1c..531ef65 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.6.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.6.1.ebuild
@@ -37,7 +37,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.6..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
index f41ac1c..531ef65 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
@@ -37,7 +37,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.7.0_rc.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.7.0_rc.ebuild
index 28fde4f..587ace3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.7.0_rc.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.7.0_rc.ebuild
@@ -36,7 +36,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.7..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.7..ebuild
index 28fde4f..587ace3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.7..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.7..ebuild
@@ -36,7 +36,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 28fde4f..587ace3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -36,7 +36,7 @@ src_configure() {
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)
-   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
+   $(usex xcb '-xcb-xlib -xinput2 -xkb -xrender' '')
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtxmlpatterns/, dev-qt/qtxml/, dev-qt/qtgui/, ...

2016-04-23 Thread Michael Palimaka
commit: f93b527d3d99af70c7e7fcceb2f4d58c8351e240
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Apr 23 17:19:02 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Apr 23 17:20:24 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f93b527d

dev-qt: sync release keywords from main tree

Package-Manager: portage-2.2.28

 dev-qt/designer/designer-5.6..ebuild   | 2 +-
 dev-qt/designer/designer-5.7.0_beta.ebuild | 2 +-
 dev-qt/designer/designer-5.7..ebuild   | 2 +-
 dev-qt/designer/designer-5..ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.6..ebuild   | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.7.0_beta.ebuild | 2 +-
 dev-qt/linguist-tools/linguist-tools-5.7..ebuild   | 2 +-
 dev-qt/linguist-tools/linguist-tools-5..ebuild | 2 +-
 dev-qt/qdbus/qdbus-5.6..ebuild | 2 +-
 dev-qt/qdbus/qdbus-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qdbus/qdbus-5.7..ebuild | 2 +-
 dev-qt/qdbus/qdbus-5..ebuild   | 2 +-
 dev-qt/qdoc/qdoc-5.6..ebuild   | 2 +-
 dev-qt/qdoc/qdoc-5.7.0_beta.ebuild | 2 +-
 dev-qt/qdoc/qdoc-5.7..ebuild   | 2 +-
 dev-qt/qdoc/qdoc-5..ebuild | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.6..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5.7..ebuild   | 2 +-
 dev-qt/qtconcurrent/qtconcurrent-5..ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.6..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtcore/qtcore-5.7..ebuild   | 2 +-
 dev-qt/qtcore/qtcore-5..ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5.6..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtdbus/qtdbus-5.7..ebuild   | 2 +-
 dev-qt/qtdbus/qtdbus-5..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.6..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5.7..ebuild | 2 +-
 dev-qt/qtdeclarative/qtdeclarative-5..ebuild   | 2 +-
 dev-qt/qtgui/qtgui-5.6..ebuild | 2 +-
 dev-qt/qtgui/qtgui-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qtgui/qtgui-5.7..ebuild | 2 +-
 dev-qt/qtgui/qtgui-5..ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.6..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qtnetwork/qtnetwork-5.7..ebuild | 2 +-
 dev-qt/qtnetwork/qtnetwork-5..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5.6..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtopengl/qtopengl-5.7..ebuild   | 2 +-
 dev-qt/qtopengl/qtopengl-5..ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.6..ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5.7..ebuild   | 2 +-
 dev-qt/qtprintsupport/qtprintsupport-5..ebuild | 2 +-
 dev-qt/qtscript/qtscript-5.6..ebuild   | 2 +-
 dev-qt/qtscript/qtscript-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtscript/qtscript-5.7..ebuild   | 2 +-
 dev-qt/qtscript/qtscript-5..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.6..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qtsql/qtsql-5.7..ebuild | 2 +-
 dev-qt/qtsql/qtsql-5..ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.6..ebuild | 2 +-
 dev-qt/qtsvg/qtsvg-5.7.0_beta.ebuild   | 2 +-
 dev-qt/qtsvg/qtsvg-5.7..ebuild | 2 +-
 dev-qt/qtsvg/qtsvg-5..ebuild   | 2 +-
 dev-qt/qttest/qttest-5.6..ebuild   | 2 +-
 dev-qt/qttest/qttest-5.7.0_beta.ebuild | 2 +-
 dev-qt/qttest/qttest-5.7..ebuild   | 2 +-
 dev-qt/qttest/qttest-5..ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-5.6..ebuild   | 2 +-
 dev-qt/qttranslations/qttranslations-5.7.0_beta.ebuild | 2 +-
 dev-qt/qttranslations/qttranslations-5.7..ebuild   | 2 +-
 dev-qt/qttranslations/qttranslations-5..ebuild | 2 +-
 dev-qt/qtwebchannel/qtwebchannel-5.6..ebuild   | 2 +-
 dev-qt/qtwebchannel/qtwebchannel-5.7.0_beta.ebuild | 2 +-
 dev-qt/qtwebchannel/qtwebchannel-5.7..ebuild   | 2 +-
 dev-qt/qtwebchannel/qtwebchannel-5..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.6..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidge

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2015-11-27 Thread Davide Pesavento
commit: 718e835bb71873e72c29f4ad4e810e4c257852e3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Nov 27 23:28:36 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Nov 27 23:28:36 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=718e835b

dev-qt/qtwidgets: shorten DESCRIPTION to make repoman happy

Package-Manager: portage-2.2.26

 dev-qt/qtwidgets/qtwidgets-5.5..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5.6..ebuild | 2 +-
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
index 83886f4..6ecaaf1 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="Set of UI elements for creating classic desktop-style user 
interfaces for the Qt5 framework"
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the 
Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"

diff --git a/dev-qt/qtwidgets/qtwidgets-5.6..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
index 83886f4..6ecaaf1 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.6..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="Set of UI elements for creating classic desktop-style user 
interfaces for the Qt5 framework"
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the 
Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index fb5942b..2f57b65 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 QT5_MODULE="qtbase"
 inherit qt5-build
 
-DESCRIPTION="Set of UI elements for creating classic desktop-style user 
interfaces for the Qt5 framework"
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the 
Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2015-04-19 Thread Michael Palimaka
commit: c4685af536ac38f671c89f86c8e6f7f17fee7940
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Apr 19 16:53:24 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Apr 19 16:53:24 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c4685af5

[dev-qt/qtwidgets] Add gtkstyle USE flag wrt bug #526866.

Package-Manager: portage-2.2.18

 dev-qt/qtwidgets/metadata.xml  | 2 ++
 dev-qt/qtwidgets/qtwidgets-5.4..ebuild | 5 +++--
 dev-qt/qtwidgets/qtwidgets-5.5..ebuild | 5 +++--
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 5 +++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 048f936..87f5b74 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -4,6 +4,8 @@
qt

Use OpenGL ES 2.0 instead of desktop 
OpenGL
+   Build a Qt style called GTK+ that mimics 
the active
+   GTK+ theme


https://bugreports.qt.io/

diff --git a/dev-qt/qtwidgets/qtwidgets-5.4..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
index e42003a..035540b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
@@ -17,14 +17,14 @@ else
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 +opengl +png +xcb"
+IUSE="gles2 gtkstyle +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -48,6 +48,7 @@ src_configure() {
local myconf=(
# copied from qtgui
${gl}
+   $(qt_use gtkstyle)
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
index e42003a..035540b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.5..ebuild
@@ -17,14 +17,14 @@ else
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 +opengl +png +xcb"
+IUSE="gles2 gtkstyle +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -48,6 +48,7 @@ src_configure() {
local myconf=(
# copied from qtgui
${gl}
+   $(qt_use gtkstyle)
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index e42003a..035540b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -17,14 +17,14 @@ else
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 +opengl +png +xcb"
+IUSE="gles2 gtkstyle +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -48,6 +48,7 @@ src_configure() {
local myconf=(
# copied from qtgui
${gl}
+   $(qt_use gtkstyle)
$(qt_use png libpng system)
$(qt_use xcb xcb system)
$(qt_use xcb xkbcommon system)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/files/, dev-qt/qtsql/files/, dev-qt/qtwebsockets/files/

2014-12-12 Thread Davide Pesavento
commit: e8f1249313077aae509e42271e430de02c4582ac
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Dec 12 17:37:30 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Dec 12 17:37:30 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8f12493

Delete unused patches.

---
 .../qtsql/files/qtsql-5.3.1-path-filtering.patch   |  31 --
 ...01-Remove-dependency-on-unused-sql-module.patch |  28 --
 .../files/qtwidgets-5.3.1-prefer-qpa.patch | 343 -
 3 files changed, 402 deletions(-)

diff --git a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch 
b/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
deleted file mode 100644
index 6571896..000
--- a/dev-qt/qtsql/files/qtsql-5.3.1-path-filtering.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9de7b4d7501c7e8e9eb561d02149a52b05a2bc1d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-Date: Fri, 27 Jun 2014 04:25:52 +1000
-Subject: [PATCH] Canonicalize inputs when filtering default system paths
-
-Contrary to expectations, various -config tools sometimes spit out
-denormalized paths, which breaks the text-based filtering, as it relies
-on exact matches with normalized paths.
-
-Change-Id: I0613ed24953a3bde19939d28d09572c88b43a361
-Task-number: QTBUG-39216
-Reviewed-by: Oswald Buddenhagen 

- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index 8c16b12..96cc82b 100755
 a/configure
-+++ b/configure
-@@ -364,6 +364,7 @@ filterDefaultPaths()
- {
- local path
- path=`cat`
-+path=`"$relpath/config.tests/unix/makeabs" "$path"`
- echo "$1" | grep "^$path\$" > /dev/null || echo "$path"
- }
- 
--- 
-1.8.5.5
-

diff --git 
a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch 
b/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch
deleted file mode 100644
index 4c71a8d..000
--- 
a/dev-qt/qtwebsockets/files/0001-Remove-dependency-on-unused-sql-module.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6bd414a1f74f5a0ebfc1f4abcc140f7b3b536e1b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= 
-Date: Tue, 20 May 2014 16:15:43 +0300
-Subject: Remove dependency on unused sql module
-
-Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403
-Reviewed-by: Kurt Pattyn 
-Reviewed-by: Davide Pesavento 

- src/websockets/websockets.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro
-index 99e84b6..5b5ff78 100644
 a/src/websockets/websockets.pro
-+++ b/src/websockets/websockets.pro
-@@ -1,7 +1,7 @@
- load(qt_build_config)
- TARGET = QtWebSockets
- 
--QT = core network core-private sql
-+QT = core network core-private
- 
- TEMPLATE = lib
- 
--- 
-1.9.3
-

diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch 
b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
deleted file mode 100644
index 2a5d130..000
--- a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= 
-Date: Wed, 19 Feb 2014 11:01:44 +0100
-Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available
-
-In order to have the possibility to provide a custom QSystemTrayIcon
-implementation in the platform theme instead of the X11 xembed based
-one, the qpa implementation needs to be called. This was not possible
-as qpa and x11 implementation were compile time mutual exclusive.
-
-This change moves the qpa implementation in the shared part and the
-methods in qsystemtrayicon_qpa just delegate to them. In addition the
-_x11 part tries to create a QPlatformSystemTrayIcon through the
-platform theme and if that succeeds the implementation prefers the qpa
-variant and delegates to the same methods.
-
-Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561
-Reviewed-by: Kevin Krammer 
-Reviewed-by: Friedemann Kleint 
-Reviewed-by: Paul Olav Tvete 

- src/widgets/util/qsystemtrayicon.cpp | 68 
- src/widgets/util/qsystemtrayicon_p.h |  9 +
- src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +---
- src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++-
- 4 files changed, 126 insertions(+), 42 deletions(-)
-
-diff --git a/src/widgets/util/qsystemtrayicon.cpp 
b/src/widgets/util/qsystemtrayicon.cpp
-index f1a69e6..fa318f3 100644
 a/src/widgets/util/qsystemtrayicon.cpp
-+++ b/src/widgets/util/qsystemtrayicon.cpp
-@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e)
- QWidget::timerEvent(e);
- }
- 
-+//
-+void QSystemTrayIconPrivate::install_sys_qpa()
-+{
-+qpa_sys->init();
-+QObject::connect(qpa_sys, 
SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
-+ q

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2014-09-08 Thread Davide Pesavento
commit: a606936208398a61e35dd4846926be872ce0b466
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Sep  8 23:23:53 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Sep  8 23:23:53 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a6069362

[dev-qt/qtwidgets] Introduce USE=xcb to fix bug 522382.

Initial patch by Timo Rothenpieler  rothenpieler.org>

Package-Manager: portage-2.2.12

---
 dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild | 9 +++--
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild | 9 +++--
 dev-qt/qtwidgets/qtwidgets-5.4..ebuild | 9 +++--
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 9 +++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
index 208edc0..44e9340 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.1-r2.ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -51,8 +52,12 @@ src_configure() {
fi
 
local myconf=(
+   # copied from qtgui
${gl}
$(qt_use png libpng system)
+   $(qt_use xcb xcb system)
+   $(qt_use xcb xkbcommon system)
+   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
index 208edc0..44e9340 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -51,8 +52,12 @@ src_configure() {
fi
 
local myconf=(
+   # copied from qtgui
${gl}
$(qt_use png libpng system)
+   $(qt_use xcb xcb system)
+   $(qt_use xcb xkbcommon system)
+   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5.4..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
index 1aa1cf4..aa70372 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4..ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -45,8 +46,12 @@ src_configure() {
fi
 
local myconf=(
+   # copied from qtgui
${gl}
$(qt_use png libpng system)
+   $(qt_use xcb xcb system)
+   $(qt_use xcb xkbcommon system)
+   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
 }

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 1aa1cf4..aa70372 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -16,14 +16,15 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="gles2 +opengl +png"
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 +opengl +png +xcb"
 REQUIRED_USE="
gles2? ( opengl )
 "
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -45,8 +46,12 @@ src_configure() {
fi
 
local myconf=(
+   # copied from qtgui
${gl}
$(qt_use png libpng system)
+   $(qt_use xcb xcb system)
+   $(qt_use xcb xkbcommon system)
+   $(use xcb && echo -xcb-xlib -xinput2 -xkb -xrender)
)
qt5-build_src_configure
 }



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2014-07-27 Thread Davide Pesavento
commit: 76016f5309edfd7da7f6ecbbb583b55b303ab16c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 27 14:33:58 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 27 14:33:58 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76016f53

[dev-qt/qtwidgets:5] Introduce some USE flags to keep consistency with qtgui.

Should fix the crashes reported by Franz Fellner in bug 518262#c2

Package-Manager: portage-2.2.10

---
 dev-qt/qtwidgets/metadata.xml  |  3 +++
 dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild | 22 --
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild | 22 --
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 22 --
 4 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 9d5bff1..10bfda0 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -2,6 +2,9 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
qt
+   
+   Use OpenGL ES 2.0 instead of desktop 
OpenGL
+   

https://bugreports.qt-project.org/
http://qt-project.org/doc/

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
index 35c598d..208edc0 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
@@ -16,11 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+   gles2? ( opengl )
+"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,3 +41,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
+
+src_configure() {
+   local gl="-no-opengl"
+   if use gles2; then
+   gl="-opengl es2"
+   elif use opengl; then
+   gl="-opengl desktop"
+   fi
+
+   local myconf=(
+   ${gl}
+   $(qt_use png libpng system)
+   )
+   qt5-build_src_configure
+}

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
index 35c598d..208edc0 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
@@ -16,11 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+   gles2? ( opengl )
+"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,3 +41,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
+
+src_configure() {
+   local gl="-no-opengl"
+   if use gles2; then
+   gl="-opengl es2"
+   elif use opengl; then
+   gl="-opengl desktop"
+   fi
+
+   local myconf=(
+   ${gl}
+   $(qt_use png libpng system)
+   )
+   qt5-build_src_configure
+}

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index c8844e3..1aa1cf4 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -16,11 +16,14 @@ else
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+   gles2? ( opengl )
+"
 
 DEPEND="
~dev-qt/qtcore-${PV}[debug=]
-   ~dev-qt/qtgui-${PV}[debug=]
+   ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -32,3 +35,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
!:no-widgets:
 )
+
+src_configure() {
+   local gl="-no-opengl"
+   if use gles2; then
+   gl="-opengl es2"
+   elif use opengl; then
+   gl="-opengl desktop"
+   fi
+
+   local myconf=(
+   ${gl}
+   $(qt_use png libpng system)
+   )
+   qt5-build_src_configure
+}



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2014-07-26 Thread Davide Pesavento
commit: 5285f682b4593cdfd2a846bc31f035c1674d4ba1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 26 10:46:03 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 26 10:46:03 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=5285f682

[dev-qt/qtwidgets:5] Implement QT5_GENTOO_CONFIG.

Package-Manager: portage-2.2.10

---
 dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild | 4 
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild | 4 
 dev-qt/qtwidgets/qtwidgets-5..ebuild   | 4 
 3 files changed, 12 insertions(+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
index 5328486..35c598d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
@@ -34,3 +34,7 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
 )
+
+QT5_GENTOO_CONFIG=(
+   !:no-widgets:
+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
index 5328486..35c598d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3..ebuild
@@ -34,3 +34,7 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
 )
+
+QT5_GENTOO_CONFIG=(
+   !:no-widgets:
+)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 440eff7..c8844e3 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -28,3 +28,7 @@ QT5_TARGET_SUBDIRS=(
src/tools/uic
src/widgets
 )
+
+QT5_GENTOO_CONFIG=(
+   !:no-widgets:
+)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/

2014-06-27 Thread Davide Pesavento
commit: dec357e79272b00c9d5e5a6113a3147f9fe1ad73
Author: David Heidelberger  ixit  cz>
AuthorDate: Fri Jun 27 16:49:47 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jun 28 01:48:28 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dec357e7

[dev-qt/qtwidgets] Cherry pick systray improvement from dev branch.

Recommended by KDE developers, for more information see
http://blog.martin-graesslin.com/blog/2014/06/where-are-my-systray-icons/

---
 .../files/qtwidgets-5.3.1-prefer-qpa.patch | 343 +
 ...gets-5.3.1.ebuild => qtwidgets-5.3.1-r1.ebuild} |   5 +
 dev-qt/qtwidgets/qtwidgets-5.3..ebuild |   5 +
 3 files changed, 353 insertions(+)

diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch 
b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
new file mode 100644
index 000..2a5d130
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.3.1-prefer-qpa.patch
@@ -0,0 +1,343 @@
+From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= 
+Date: Wed, 19 Feb 2014 11:01:44 +0100
+Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available
+
+In order to have the possibility to provide a custom QSystemTrayIcon
+implementation in the platform theme instead of the X11 xembed based
+one, the qpa implementation needs to be called. This was not possible
+as qpa and x11 implementation were compile time mutual exclusive.
+
+This change moves the qpa implementation in the shared part and the
+methods in qsystemtrayicon_qpa just delegate to them. In addition the
+_x11 part tries to create a QPlatformSystemTrayIcon through the
+platform theme and if that succeeds the implementation prefers the qpa
+variant and delegates to the same methods.
+
+Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561
+Reviewed-by: Kevin Krammer 
+Reviewed-by: Friedemann Kleint 
+Reviewed-by: Paul Olav Tvete 
+---
+ src/widgets/util/qsystemtrayicon.cpp | 68 
+ src/widgets/util/qsystemtrayicon_p.h |  9 +
+ src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +---
+ src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++-
+ 4 files changed, 126 insertions(+), 42 deletions(-)
+
+diff --git a/src/widgets/util/qsystemtrayicon.cpp 
b/src/widgets/util/qsystemtrayicon.cpp
+index f1a69e6..fa318f3 100644
+--- a/src/widgets/util/qsystemtrayicon.cpp
 b/src/widgets/util/qsystemtrayicon.cpp
+@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e)
+ QWidget::timerEvent(e);
+ }
+ 
++//
++void QSystemTrayIconPrivate::install_sys_qpa()
++{
++qpa_sys->init();
++QObject::connect(qpa_sys, 
SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
++ q_func(), 
SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
++QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked,
++ q_func(), &QSystemTrayIcon::messageClicked);
++updateMenu_sys();
++updateIcon_sys();
++updateToolTip_sys();
++}
++
++void QSystemTrayIconPrivate::remove_sys_qpa()
++{
++qpa_sys->cleanup();
++}
++
++QRect QSystemTrayIconPrivate::geometry_sys_qpa() const
++{
++return qpa_sys->geometry();
++}
++
++void QSystemTrayIconPrivate::updateIcon_sys_qpa()
++{
++qpa_sys->updateIcon(icon);
++}
++
++void QSystemTrayIconPrivate::updateMenu_sys_qpa()
++{
++if (menu) {
++if (!menu->platformMenu()) {
++QPlatformMenu *platformMenu = qpa_sys->createMenu();
++if (platformMenu)
++menu->setPlatformMenu(platformMenu);
++}
++qpa_sys->updateMenu(menu->platformMenu());
++}
++}
++
++void QSystemTrayIconPrivate::updateToolTip_sys_qpa()
++{
++qpa_sys->updateToolTip(toolTip);
++}
++
++void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message,
++ const QString &title,
++ QSystemTrayIcon::MessageIcon 
icon,
++ int msecs)
++{
++QIcon notificationIcon;
++switch (icon) {
++case QSystemTrayIcon::Information:
++notificationIcon = 
QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
++break;
++case QSystemTrayIcon::Warning:
++notificationIcon = 
QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
++break;
++case QSystemTrayIcon::Critical:
++notificationIcon = 
QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
++break;
++default:
++break;
++}
++qpa_sys->showMessage(message, title, notificationIcon,
++ static_cast(icon), 
msecs);
++}
++
+ QT_END_NAMESPACE
+ 
+ #endif // QT_NO_SYSTEMTRAYICON
+diff --git a

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/

2014-05-24 Thread Davide Pesavento
commit: df6eab209d70041be2127f15e9979798ec1214ca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat May 24 17:42:33 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat May 24 17:42:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=df6eab20

[dev-qt/qtwidgets] Add upstream patch to fix rendering of context menus.

Thanks to Elias Probst in bug 511388.

Package-Manager: portage-2.2.10

---
 ...QMenu-is-polished-before-creating-the-nat.patch | 37 ++
 dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild|  5 +++
 2 files changed, 42 insertions(+)

diff --git 
a/dev-qt/qtwidgets/files/0001-Ensure-the-QMenu-is-polished-before-creating-the-nat.patch
 
b/dev-qt/qtwidgets/files/0001-Ensure-the-QMenu-is-polished-before-creating-the-nat.patch
new file mode 100644
index 000..e9947da
--- /dev/null
+++ 
b/dev-qt/qtwidgets/files/0001-Ensure-the-QMenu-is-polished-before-creating-the-nat.patch
@@ -0,0 +1,37 @@
+From df3720527dddad4c04ad1a6b7c07f4bd66495053 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= 
+Date: Mon, 28 Apr 2014 09:42:10 +0200
+Subject: Ensure the QMenu is polished before creating the native window
+
+Call ::ensurePolished from QMenu::exec before the native window gets
+created. This ensures that the style handles the menu before its too
+late. E.g. a style which wants to create RGBA menus needs to add the
+appropriate flag before the native window gets created. Without this
+change the style cannot change to RGBA as the native window has already
+been created and changing the format used by QWindow is not possible
+after QWindow::create was called.
+
+Change-Id: Ic861037a438b4cb74c59a00be0ef2d633db538ed
+Reviewed-by: Friedemann Kleint 
+Reviewed-by: Gabriel de Dietrich 
+Reviewed-by: David Edmundson 
+Reviewed-by: Frederik Gladhorn 
+---
+ src/widgets/widgets/qmenu.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
+index 403ebe7..7e48bad 100644
+--- a/src/widgets/widgets/qmenu.cpp
 b/src/widgets/widgets/qmenu.cpp
+@@ -2177,6 +2177,7 @@ QAction *QMenu::exec()
+ QAction *QMenu::exec(const QPoint &p, QAction *action)
+ {
+ Q_D(QMenu);
++ensurePolished();
+ createWinId();
+ QEventLoop eventLoop;
+ d->eventLoop = &eventLoop;
+-- 
+1.9.3
+

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild 
b/dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild
index e2b87e5..683b0d1 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.0.ebuild
@@ -29,3 +29,8 @@ QT5_TARGET_SUBDIRS=(
src/widgets
src/plugins/accessible
 )
+
+PATCHES=(
+   # bug 511388
+   
"${FILESDIR}/0001-Ensure-the-QMenu-is-polished-before-creating-the-nat.patch"
+)



[gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/

2014-05-22 Thread Davide Pesavento
commit: de2ceaed88fdb5224dd9267be02f16d7c361cd27
Author: Axel Rasmussen  gmail  com>
AuthorDate: Thu May 22 19:21:00 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu May 22 19:21:00 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=de2ceaed

[dev-qt/qtwidgets:5] Remove accessible plugin from ebuild

Upstream has made the accessibility plugin part of the normal widgets
code, instead of being a separate plugin. This fixes build failures
stating that "src/plugins/accessible" cannot be found when building with
upstream commit eaee2bd0.

---
 dev-qt/qtwidgets/qtwidgets-5..ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qtwidgets/qtwidgets-5..ebuild 
b/dev-qt/qtwidgets/qtwidgets-5..ebuild
index 9af75b2..512ce2f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5..ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5..ebuild
@@ -27,5 +27,4 @@ RDEPEND="${DEPEND}"
 QT5_TARGET_SUBDIRS=(
src/tools/uic
src/widgets
-   src/plugins/accessible
 )