1 |
commit: ac151d59332d5fed657ccbf56d69f2c713d593f8 |
2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Oct 30 17:45:23 2013 +0000 |
4 |
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> |
5 |
CommitDate: Wed Oct 30 17:45:23 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ac151d59 |
7 |
|
8 |
[games-strategy/curseofwar] Bump to 1.2.0. |
9 |
|
10 |
--- |
11 |
games-strategy/curseofwar/curseofwar-1.1.8.ebuild | 29 ----------- |
12 |
games-strategy/curseofwar/curseofwar-1.2.0.ebuild | 57 ++++++++++++++++++++++ |
13 |
...urseofwar-1.2.0-fix-gcc-error-compilation.patch | 30 ++++++++++++ |
14 |
3 files changed, 87 insertions(+), 29 deletions(-) |
15 |
|
16 |
diff --git a/games-strategy/curseofwar/curseofwar-1.1.8.ebuild b/games-strategy/curseofwar/curseofwar-1.1.8.ebuild |
17 |
deleted file mode 100644 |
18 |
index 2bd573a..0000000 |
19 |
--- a/games-strategy/curseofwar/curseofwar-1.1.8.ebuild |
20 |
+++ /dev/null |
21 |
@@ -1,29 +0,0 @@ |
22 |
-# Copyright 1999-2013 Gentoo Foundation |
23 |
-# Distributed under the terms of the GNU General Public License v2 |
24 |
-# $Header: $ |
25 |
- |
26 |
-EAPI=5 |
27 |
- |
28 |
-inherit games |
29 |
- |
30 |
-DESCRIPTION="A fast-paced action strategy game implemented using ncurses user interface." |
31 |
-HOMEPAGE="https://github.com/a-nikolaev/curseofwar/wiki" |
32 |
-SRC_URI="https://github.com/a-nikolaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
33 |
- |
34 |
-LICENSE="GPL-3" |
35 |
-SLOT="0" |
36 |
-KEYWORDS="~amd64 ~x86" |
37 |
-IUSE="" |
38 |
- |
39 |
-DEPEND="sys-libs/ncurses" |
40 |
-RDEPEND="${DEPEND}" |
41 |
- |
42 |
-src_prepare() { |
43 |
- sed -i -e "s:%VERSION%:${PV}:g" ${PN}.6 |
44 |
-} |
45 |
- |
46 |
-src_install() { |
47 |
- dogamesbin ${PN} |
48 |
- doman ${PN}.6 |
49 |
- dodoc CHANGELOG README |
50 |
-} |
51 |
|
52 |
diff --git a/games-strategy/curseofwar/curseofwar-1.2.0.ebuild b/games-strategy/curseofwar/curseofwar-1.2.0.ebuild |
53 |
new file mode 100644 |
54 |
index 0000000..97a86c1 |
55 |
--- /dev/null |
56 |
+++ b/games-strategy/curseofwar/curseofwar-1.2.0.ebuild |
57 |
@@ -0,0 +1,57 @@ |
58 |
+# Copyright 1999-2013 Gentoo Foundation |
59 |
+# Distributed under the terms of the GNU General Public License v2 |
60 |
+# $Header: $ |
61 |
+ |
62 |
+EAPI=5 |
63 |
+ |
64 |
+inherit cmake-utils games |
65 |
+ |
66 |
+DESCRIPTION="A fast-paced action strategy game implemented using ncurses user interface." |
67 |
+HOMEPAGE="https://github.com/a-nikolaev/curseofwar/wiki" |
68 |
+SRC_URI="https://github.com/a-nikolaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
69 |
+ |
70 |
+LICENSE="GPL-3" |
71 |
+SLOT="0" |
72 |
+KEYWORDS="~amd64 ~x86" |
73 |
+IUSE="ncurses sdl" |
74 |
+REQUIRED_USE="|| ( ncurses sdl )" |
75 |
+ |
76 |
+DEPEND="ncurses? ( sys-libs/ncurses ) |
77 |
+ sdl? ( media-libs/libsdl )" |
78 |
+RDEPEND="${DEPEND}" |
79 |
+ |
80 |
+src_prepare() { |
81 |
+ sed -i -e "s:%VERSION%:${PV}:g" ${PN}{,-sdl}.6 |
82 |
+ sed -i -e "s:/usr/local/share/:${GAMES_DATADIR}/:g" path.c |
83 |
+ epatch "${FILESDIR}/${P}-fix-gcc-error-compilation.patch" |
84 |
+} |
85 |
+ |
86 |
+src_configure() { |
87 |
+ mycmakeargs=( |
88 |
+ $(cmake-utils_use ncurses CW_NCURSE_FRONTEND) |
89 |
+ $(cmake-utils_use sdl CW_SDL_FRONTEND) |
90 |
+ $(cmake-utils_use sdl CW_SDL_MULTIPLAYER) |
91 |
+ ) |
92 |
+ cmake-utils_src_configure |
93 |
+} |
94 |
+ |
95 |
+src_compile() { |
96 |
+ cmake-utils_src_compile |
97 |
+} |
98 |
+ |
99 |
+src_install() { |
100 |
+ doicon pixmaps/${PN}-32x32.xpm |
101 |
+ if use ncurses ; then |
102 |
+ dogamesbin "${BUILD_DIR}/${PN}" |
103 |
+ make_desktop_entry ${PN} "Curse of War" ${PN}-32x32 "Game;StrategyGame" "Terminal=true" |
104 |
+ doman ${PN}.6 |
105 |
+ fi |
106 |
+ if use sdl ; then |
107 |
+ dogamesbin "${BUILD_DIR}/${PN}-sdl" |
108 |
+ make_desktop_entry ${PN}-sdl "Curse of War (SDL)" ${PN}-32x32 |
109 |
+ doman ${PN}-sdl.6 |
110 |
+ insinto "${GAMES_DATADIR}/${PN}" |
111 |
+ doins -r images |
112 |
+ fi |
113 |
+ dodoc CHANGELOG README |
114 |
+} |
115 |
|
116 |
diff --git a/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch b/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch |
117 |
new file mode 100644 |
118 |
index 0000000..d2593c7 |
119 |
--- /dev/null |
120 |
+++ b/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch |
121 |
@@ -0,0 +1,30 @@ |
122 |
+From 5d4865e03f96b73af602c6fb11a618195dc6d00c Mon Sep 17 00:00:00 2001 |
123 |
+From: "Azamat H. Hackimov" <azamat.hackimov@×××××.com> |
124 |
+Date: Wed, 30 Oct 2013 23:19:29 +0600 |
125 |
+Subject: [PATCH] =?UTF-8?q?Fixed=20GCC=20error=20compilation=20Fixed=20"ex?= |
126 |
+ =?UTF-8?q?pected=20primary-expression=20before=20=C2=AB.=C2=BB=20token"?= |
127 |
+ =?UTF-8?q?=20error.?= |
128 |
+MIME-Version: 1.0 |
129 |
+Content-Type: text/plain; charset=UTF-8 |
130 |
+Content-Transfer-Encoding: 8bit |
131 |
+ |
132 |
+--- |
133 |
+ output-sdl.c | 2 +- |
134 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
135 |
+ |
136 |
+diff --git a/output-sdl.c b/output-sdl.c |
137 |
+index 7f67c5c..54f652b 100644 |
138 |
+--- a/output-sdl.c |
139 |
++++ b/output-sdl.c |
140 |
+@@ -380,7 +380,7 @@ void output_sdl (SDL_Surface *tileset, SDL_Surface *typeface, SDL_Surface *uisur |
141 |
+ /* line */ |
142 |
+ int line_width=555; |
143 |
+ struct SDL_Rect src_line_rect = {0, 0, line_width, 1}; |
144 |
+- struct SDL_Rect dst_line_rect = {.x=TILE_WIDTH + 75*TYPE_WIDTH/2 - line_width/2, .y=screen_y + (TYPE_HEIGHT*5/2), .w=line_width, .h=1}; |
145 |
++ struct SDL_Rect dst_line_rect = {TILE_WIDTH + 75*TYPE_WIDTH/2 - line_width/2, screen_y + (TYPE_HEIGHT*5/2), line_width, 1}; |
146 |
+ SDL_BlitSurface(uisurf, &src_line_rect, screen, &dst_line_rect); |
147 |
+ |
148 |
+ } |
149 |
+-- |
150 |
+1.8.1.5 |
151 |
+ |