1 |
commit: da8940e3d8eef6796436dcb7d4fc624665f19a9b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 15 16:27:26 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 16 19:10:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8940e3 |
7 |
|
8 |
games-strategy/freeciv: Drop 2.6.2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/769164 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
games-strategy/freeciv/Manifest | 1 - |
15 |
.../freeciv/files/freeciv-2.6.2-qt515.patch | 39 ----- |
16 |
games-strategy/freeciv/freeciv-2.6.2.ebuild | 190 --------------------- |
17 |
3 files changed, 230 deletions(-) |
18 |
|
19 |
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest |
20 |
index a42d00191c8..d843e0eb465 100644 |
21 |
--- a/games-strategy/freeciv/Manifest |
22 |
+++ b/games-strategy/freeciv/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3 |
25 |
DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221 |
26 |
|
27 |
diff --git a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch b/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch |
28 |
deleted file mode 100644 |
29 |
index db5e657a585..00000000000 |
30 |
--- a/games-strategy/freeciv/files/freeciv-2.6.2-qt515.patch |
31 |
+++ /dev/null |
32 |
@@ -1,39 +0,0 @@ |
33 |
-From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001 |
34 |
-From: Marko Lindqvist <cazfi74@×××××.com> |
35 |
-Date: Tue, 7 Apr 2020 13:22:14 +0300 |
36 |
-Subject: [PATCH] Include <QPainterPath> where needed |
37 |
- |
38 |
-This fixes Qt-client build on OpenEmbedded |
39 |
- |
40 |
-See hrm Bug #868060 |
41 |
- |
42 |
-Signed-off-by: Marko Lindqvist <cazfi74@×××××.com> |
43 |
---- |
44 |
- client/gui-qt/canvas.cpp | 1 + |
45 |
- client/gui-qt/dialogs.cpp | 1 + |
46 |
- 2 files changed, 2 insertions(+) |
47 |
- |
48 |
-diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp |
49 |
-index 24291bc183..00fa1b8f52 100644 |
50 |
---- a/client/gui-qt/canvas.cpp |
51 |
-+++ b/client/gui-qt/canvas.cpp |
52 |
-@@ -18,6 +18,7 @@ |
53 |
- // Qt |
54 |
- #include <QFontMetrics> |
55 |
- #include <QPainter> |
56 |
-+#include <QPainterPath> |
57 |
- |
58 |
- // qt-client |
59 |
- #include "canvas.h" |
60 |
-diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp |
61 |
-index e0f9de31d4..4b3254c496 100644 |
62 |
---- a/client/gui-qt/dialogs.cpp |
63 |
-+++ b/client/gui-qt/dialogs.cpp |
64 |
-@@ -24,6 +24,7 @@ |
65 |
- #include <QMessageBox> |
66 |
- #include <QMouseEvent> |
67 |
- #include <QPainter> |
68 |
-+#include <QPainterPath> |
69 |
- #include <QRadioButton> |
70 |
- #include <QRect> |
71 |
- #include <QSignalMapper> |
72 |
|
73 |
diff --git a/games-strategy/freeciv/freeciv-2.6.2.ebuild b/games-strategy/freeciv/freeciv-2.6.2.ebuild |
74 |
deleted file mode 100644 |
75 |
index e361752c4a5..00000000000 |
76 |
--- a/games-strategy/freeciv/freeciv-2.6.2.ebuild |
77 |
+++ /dev/null |
78 |
@@ -1,190 +0,0 @@ |
79 |
-# Copyright 1999-2020 Gentoo Authors |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
- |
82 |
-EAPI=7 |
83 |
- |
84 |
-MY_PV="${PV/_beta/-beta}" |
85 |
-MY_PV="${MY_PV/_rc/-RC}" |
86 |
-MY_P="${PN}-${MY_PV}" |
87 |
-inherit desktop flag-o-matic qmake-utils xdg |
88 |
- |
89 |
-DESCRIPTION="multiplayer strategy game (Civilization Clone)" |
90 |
-HOMEPAGE="http://www.freeciv.org/" |
91 |
- |
92 |
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then |
93 |
- SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" |
94 |
- KEYWORDS="~amd64 ~ppc64 ~x86" |
95 |
-fi |
96 |
- |
97 |
-LICENSE="GPL-2+" |
98 |
-SLOT="0" |
99 |
-IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" |
100 |
- |
101 |
-# postgres isn't yet really supported by upstream |
102 |
-BDEPEND=" |
103 |
- virtual/pkgconfig |
104 |
- !dedicated? ( |
105 |
- x11-base/xorg-proto |
106 |
- nls? ( sys-devel/gettext ) |
107 |
- ) |
108 |
-" |
109 |
-DEPEND=" |
110 |
- app-arch/bzip2 |
111 |
- app-arch/xz-utils |
112 |
- net-misc/curl |
113 |
- sys-libs/zlib |
114 |
- auth? ( |
115 |
- !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) |
116 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
117 |
- sqlite? ( dev-db/sqlite:3 ) |
118 |
- ) |
119 |
- dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) |
120 |
- !dedicated? ( |
121 |
- media-libs/libpng:0 |
122 |
- gtk? ( x11-libs/gtk+:2 ) |
123 |
- mapimg? ( media-gfx/imagemagick:= ) |
124 |
- modpack? ( x11-libs/gtk+:2 ) |
125 |
- nls? ( virtual/libintl ) |
126 |
- qt5? ( |
127 |
- dev-qt/qtcore:5 |
128 |
- dev-qt/qtgui:5 |
129 |
- dev-qt/qtwidgets:5 |
130 |
- ) |
131 |
- !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) |
132 |
- sdl? ( |
133 |
- media-libs/libsdl2[video] |
134 |
- media-libs/sdl2-gfx |
135 |
- media-libs/sdl2-image[png] |
136 |
- media-libs/sdl2-ttf |
137 |
- ) |
138 |
- server? ( aimodules? ( sys-devel/libtool:2 ) ) |
139 |
- sound? ( |
140 |
- media-libs/libsdl2[sound] |
141 |
- media-libs/sdl2-mixer[vorbis] |
142 |
- ) |
143 |
- ) |
144 |
- readline? ( sys-libs/readline:0= ) |
145 |
- system-lua? ( >=dev-lang/lua-5.3:= ) |
146 |
-" |
147 |
-RDEPEND="${DEPEND}" |
148 |
- |
149 |
-S="${WORKDIR}/${MY_P}" |
150 |
- |
151 |
-PATCHES=( |
152 |
- "${FILESDIR}/${P}-qt515.patch" #728254 |
153 |
-) |
154 |
- |
155 |
-pkg_setup() { |
156 |
- if use !dedicated && use !server ; then |
157 |
- ewarn "Disabling server USE flag will make it impossible" |
158 |
- ewarn "to start local games, but you will still be able to" |
159 |
- ewarn "join multiplayer games." |
160 |
- fi |
161 |
-} |
162 |
- |
163 |
-src_prepare() { |
164 |
- default |
165 |
- |
166 |
- # install the .desktop in /usr/share/applications |
167 |
- # install the icons in /usr/share/pixmaps |
168 |
- sed -i \ |
169 |
- -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \ |
170 |
- -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \ |
171 |
- -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \ |
172 |
- client/Makefile.in \ |
173 |
- server/Makefile.in \ |
174 |
- tools/Makefile.in \ |
175 |
- data/icons/Makefile.in || die |
176 |
- sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die |
177 |
-} |
178 |
- |
179 |
-src_configure() { |
180 |
- local myclient=() mydatabase=() myeconfargs=() |
181 |
- |
182 |
- if use auth ; then |
183 |
- if ! use mysql && ! use sqlite ; then |
184 |
- einfo "No database backend chosen, defaulting" |
185 |
- einfo "to mysql!" |
186 |
- mydatabase=( mysql ) |
187 |
- else |
188 |
- use mysql && mydatabase+=( mysql ) |
189 |
- use sqlite && mydatabase+=( sqlite3 ) |
190 |
- fi |
191 |
- else |
192 |
- mydatabase=( no ) |
193 |
- fi |
194 |
- |
195 |
- if use dedicated ; then |
196 |
- myclient=( no ) |
197 |
- myeconfargs+=( |
198 |
- --enable-server |
199 |
- --enable-freeciv-manual=html |
200 |
- ) |
201 |
- else |
202 |
- if use !sdl && use !gtk && ! use qt5 ; then |
203 |
- einfo "No client backend given, defaulting to" |
204 |
- einfo "gtk2 client!" |
205 |
- myclient=( gtk2 ) |
206 |
- else |
207 |
- use sdl && myclient+=( sdl2 ) |
208 |
- use gtk && myclient+=( gtk2 ) |
209 |
- if use qt5 ; then |
210 |
- local -x MOCCMD=$(qt5_get_bindir)/moc |
211 |
- myclient+=( qt ) |
212 |
- append-cxxflags -std=c++11 |
213 |
- fi |
214 |
- fi |
215 |
- myeconfargs+=( |
216 |
- $(use_enable server) |
217 |
- $(use_enable server freeciv-manual html ) |
218 |
- ) |
219 |
- fi |
220 |
- |
221 |
- myeconfargs+=( |
222 |
- --enable-aimodules="$(usex aimodules "yes" "no")" |
223 |
- --enable-client="${myclient[*]}" |
224 |
- --enable-fcdb="${mydatabase[*]}" |
225 |
- --enable-fcmp="$(usex modpack "gtk2" "no")" |
226 |
- # disabling shared libs will break aimodules USE flag |
227 |
- --enable-shared |
228 |
- --localedir=/usr/share/locale |
229 |
- --with-appdatadir="${EPREFIX}"/usr/share/metainfo |
230 |
- $(use_enable ipv6) |
231 |
- $(use_enable mapimg) |
232 |
- $(use_enable nls) |
233 |
- $(use_enable sound sdl-mixer) |
234 |
- $(use_enable system-lua sys-lua) |
235 |
- $(use_with readline) |
236 |
- ) |
237 |
- econf "${myeconfargs[@]}" |
238 |
-} |
239 |
- |
240 |
-src_install() { |
241 |
- default |
242 |
- |
243 |
- if use dedicated ; then |
244 |
- rm -rf "${ED}"/usr/share/pixmaps || die |
245 |
- rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die |
246 |
- else |
247 |
- if use server ; then |
248 |
- # Create and install the html manual. It can't be done for dedicated |
249 |
- # servers, because the 'freeciv-manual' tool is then not built. Also |
250 |
- # delete freeciv-manual from the GAMES_BINDIR, because it's useless. |
251 |
- # Note: to have it localized, it should be ran from _postinst, or |
252 |
- # something like that, but then it's a PITA to avoid orphan files... |
253 |
- ./tools/freeciv-manual || die |
254 |
- docinto html |
255 |
- dodoc classic*.html |
256 |
- fi |
257 |
- if use sdl ; then |
258 |
- make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client |
259 |
- else |
260 |
- rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* |
261 |
- fi |
262 |
- rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* |
263 |
- fi |
264 |
- find "${ED}" -name "freeciv-manual*" -delete || die |
265 |
- |
266 |
- rm -f "${ED}/usr/$(get_libdir)"/*.a || die |
267 |
- find "${ED}" -type f -name "*.la" -delete || die |
268 |
-} |