Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/cockatrice/files/
Date: Fri, 29 Jan 2021 21:56:11
Message-Id: 1611957353.575319695ccf04677439f055c6d0415d8f86bc66.chewi@gentoo
1 commit: 575319695ccf04677439f055c6d0415d8f86bc66
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Jan 29 15:39:41 2021 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 29 21:55:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57531969
7
8 games-board/cockatrice: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/19254
13 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
14
15 .../files/cockatrice-20190304-qt-5.15.patch | 20 -------------
16 games-board/cockatrice/files/use-ccache.patch | 33 ----------------------
17 2 files changed, 53 deletions(-)
18
19 diff --git a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch b/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
20 deleted file mode 100644
21 index 878a8d42824..00000000000
22 --- a/games-board/cockatrice/files/cockatrice-20190304-qt-5.15.patch
23 +++ /dev/null
24 @@ -1,20 +0,0 @@
25 -From 7fa1936d0f4efffa16ae28d6bd3f9e727e207046 Mon Sep 17 00:00:00 2001
26 -From: ebbit1q <ebbit1q@×××××.com>
27 -Date: Fri, 19 Jun 2020 16:50:09 +0200
28 -Subject: [PATCH] qt 5.15 compatibility (#4027)
29 -
30 ----
31 - cockatrice/src/replay_timeline_widget.cpp | 1 +
32 - 27 files changed, 101 insertions(+), 39 deletions(-)
33 -
34 -diff --git a/cockatrice/src/replay_timeline_widget.cpp b/cockatrice/src/replay_timeline_widget.cpp
35 -index 6d04dce80..e79ad5f5c 100644
36 ---- a/cockatrice/src/replay_timeline_widget.cpp
37 -+++ b/cockatrice/src/replay_timeline_widget.cpp
38 -@@ -1,6 +1,7 @@
39 - #include "replay_timeline_widget.h"
40 - #include <QPainter>
41 -+#include <QPainterPath>
42 - #include <QPalette>
43 - #include <QTimer>
44 - #include <cmath>
45
46 diff --git a/games-board/cockatrice/files/use-ccache.patch b/games-board/cockatrice/files/use-ccache.patch
47 deleted file mode 100644
48 index 16deeaf0bb7..00000000000
49 --- a/games-board/cockatrice/files/use-ccache.patch
50 +++ /dev/null
51 @@ -1,33 +0,0 @@
52 -From 494501bbc88d30d9f1ceb6fb3fbd428eeb58ddee Mon Sep 17 00:00:00 2001
53 -From: James Le Cuirot <chewi@g.o>
54 -Date: Wed, 13 Mar 2019 22:18:45 +0000
55 -Subject: [PATCH] Add USE_CCACHE option to CMake so that ccache can be forcibly
56 - disabled
57 -
58 ----
59 - CMakeLists.txt | 15 +++++++++------
60 - 1 file changed, 9 insertions(+), 6 deletions(-)
61 -
62 -diff --git a/CMakeLists.txt b/CMakeLists.txt
63 -index cc39e77..59eec3d 100644
64 ---- a/CMakeLists.txt
65 -+++ b/CMakeLists.txt
66 -@@ -25,12 +25,15 @@ ELSE()
67 - ENDIF()
68 -
69 - # Early detect ccache
70 -+OPTION(USE_CCACHE "Cache the build results with ccache" ON)
71 -+if(USE_CCACHE)
72 - find_program(CCACHE_PROGRAM ccache)
73 - if(CCACHE_PROGRAM)
74 - # Support Unix Makefiles and Ninja
75 - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
76 - MESSAGE(STATUS "Found CCache ${CCACHE_PROGRAM}")
77 - endif()
78 -+endif()
79 -
80 - # A project name is needed for CPack
81 - # Version can be overriden by git tags, see cmake/getversion.cmake
82 ---
83 -2.20.1
84 -