summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-21 13:16:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-21 13:37:41 +0200
commita74631c7a568d0bde571713530dbc0da7bde363b (patch)
treee1b95bf090ae520e3034fb3905e88c906213e057
parentmedia-video/avidemux: Fix build with Qt 5.15 (diff)
downloadgentoo-a74631c7a568d0bde571713530dbc0da7bde363b.tar.gz
gentoo-a74631c7a568d0bde571713530dbc0da7bde363b.tar.bz2
gentoo-a74631c7a568d0bde571713530dbc0da7bde363b.zip
games-board/cockatrice: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/726740 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--games-board/cockatrice/cockatrice-20190304-r1.ebuild8
-rw-r--r--games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch20
2 files changed, 23 insertions, 5 deletions
diff --git a/games-board/cockatrice/cockatrice-20190304-r1.ebuild b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
index 39f89707cad..50792e3ce5f 100644
--- a/games-board/cockatrice/cockatrice-20190304-r1.ebuild
+++ b/games-board/cockatrice/cockatrice-20190304-r1.ebuild
@@ -17,23 +17,21 @@ IUSE="+client +oracle server"
RDEPEND="
dev-qt/qtconcurrent:5
- dev-qt/qtprintsupport:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
client? (
dev-libs/protobuf:=
dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
)
oracle? ( sys-libs/zlib )
server? (
dev-libs/protobuf:=
dev-qt/qtsql:5
- dev-qt/qtwebsockets:5
)
"
BDEPEND="
@@ -41,8 +39,7 @@ BDEPEND="
client? ( dev-libs/protobuf )
server? ( dev-libs/protobuf )
"
-DEPEND="${RDEPEND}
-"
+DEPEND="${RDEPEND}"
# As the default help/about display the sha1 we need it
SHA1='294b433'
@@ -51,6 +48,7 @@ S="${WORKDIR}/Cockatrice-${MY_PV}"
PATCHES=(
"${FILESDIR}"/use-ccache.patch
+ "${FILESDIR}"/${P}-qt-5.15.patch
)
src_configure() {
diff --git a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
new file mode 100644
index 00000000000..878a8d42824
--- /dev/null
+++ b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
@@ -0,0 +1,20 @@
+From 7fa1936d0f4efffa16ae28d6bd3f9e727e207046 Mon Sep 17 00:00:00 2001
+From: ebbit1q <ebbit1q@gmail.com>
+Date: Fri, 19 Jun 2020 16:50:09 +0200
+Subject: [PATCH] qt 5.15 compatibility (#4027)
+
+---
+ cockatrice/src/replay_timeline_widget.cpp | 1 +
+ 27 files changed, 101 insertions(+), 39 deletions(-)
+
+diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp
+index 6d04dce80..e79ad5f5c 100644
+--- a/cockatrice/src/replay_timeline_widget.cpp
++++ b/cockatrice/src/replay_timeline_widget.cpp
+@@ -1,6 +1,7 @@
+ #include "replay_timeline_widget.h"
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPalette>
+ #include <QTimer>
+ #include <cmath>