From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97AEF1382C5 for ; Sun, 21 Jun 2020 11:38:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CD66E0882; Sun, 21 Jun 2020 11:38:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92689E087C for ; Sun, 21 Jun 2020 11:38:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1D0A34FA6E for ; Sun, 21 Jun 2020 11:38:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 352F42A3 for ; Sun, 21 Jun 2020 11:38:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1592739461.a74631c7a568d0bde571713530dbc0da7bde363b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/, games-board/cockatrice/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-board/cockatrice/cockatrice-20190304-r1.ebuild games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch X-VCS-Directories: games-board/cockatrice/files/ games-board/cockatrice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a74631c7a568d0bde571713530dbc0da7bde363b X-VCS-Branch: master Date: Sun, 21 Jun 2020 11:38:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66ff4540-55e5-4fd9-b567-1c1416c63540 X-Archives-Hash: 6ab69933b9aaac6333c578f7b8e657db commit: a74631c7a568d0bde571713530dbc0da7bde363b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 11:16:53 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 ++#include + #include + #include + #include