public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/, games-board/cockatrice/
Date: Sun, 21 Jun 2020 11:38:00 +0000 (UTC)	[thread overview]
Message-ID: <1592739461.a74631c7a568d0bde571713530dbc0da7bde363b.asturm@gentoo> (raw)

commit:     a74631c7a568d0bde571713530dbc0da7bde363b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:16:53 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 11:37:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74631c7

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 <AT> gentoo.org>

 games-board/cockatrice/cockatrice-20190304-r1.ebuild |  8 +++-----
 .../files/cockatrice-20190304-qt-5.15.patch          | 20 ++++++++++++++++++++
 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>


             reply	other threads:[~2020-06-21 11:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-21 11:38 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-17 21:42 [gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/, games-board/cockatrice/ James Le Cuirot
2019-03-13 22:45 James Le Cuirot
2016-07-12 17:03 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1592739461.a74631c7a568d0bde571713530dbc0da7bde363b.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox