Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/
Date: Sun, 31 May 2020 12:42:45
Message-Id: 1590928938.00f515c1c6f5d75ecc2b94351f0e133d128060cd.pacho@gentoo
1 commit: 00f515c1c6f5d75ecc2b94351f0e133d128060cd
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 11:12:19 2020 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 12:42:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f515c1
7
8 x11-themes/QGnomePlatform: Fix build with qt-5.15
9
10 Closes: https://bugs.gentoo.org/725830
11 Package-Manager: Portage-2.3.100, Repoman-2.3.22
12 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
13
14 .../QGnomePlatform/QGnomePlatform-0.6.1.ebuild | 2 ++
15 .../files/QGnomePlatform-0.6.1-qt5.15.patch | 21 +++++++++++++++++++++
16 2 files changed, 23 insertions(+)
17
18 diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
19 index 65c5840ce9d..1ec98282675 100644
20 --- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
21 +++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
22 @@ -22,6 +22,8 @@ RDEPEND="
23 DEPEND="${RDEPEND}"
24 BDEPEND="${RDEPEND}"
25
26 +PATCHES=( "${FILESDIR}/${P}-qt5.15.patch" )
27 +
28 src_configure() {
29 eqmake5
30 }
31
32 diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
33 new file mode 100644
34 index 00000000000..b0927d12e79
35 --- /dev/null
36 +++ b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
37 @@ -0,0 +1,21 @@
38 +From c835c9e80cfadd62e01f16591721d2103d28a212 Mon Sep 17 00:00:00 2001
39 +From: Jan Grulich <jgrulich@××××××.com>
40 +Date: Wed, 27 May 2020 13:38:49 +0200
41 +Subject: [PATCH] Fix build with Qt 5.15
42 +
43 +---
44 + decoration/qgnomeplatformdecoration.cpp | 1 +
45 + 1 file changed, 1 insertion(+)
46 +
47 +diff --git a/decoration/qgnomeplatformdecoration.cpp b/decoration/qgnomeplatformdecoration.cpp
48 +index 61c2af9..c8b381c 100644
49 +--- a/decoration/qgnomeplatformdecoration.cpp
50 ++++ b/decoration/qgnomeplatformdecoration.cpp
51 +@@ -46,6 +46,7 @@
52 + #include <QtGui/QCursor>
53 + #include <QtGui/QLinearGradient>
54 + #include <QtGui/QPainter>
55 ++#include <QtGui/QPainterPath>
56 + #include <QtGui/QPalette>
57 + #include <QtGui/QPixmap>
58 +