From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 044CA1385F6 for ; Wed, 30 Oct 2013 17:46:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1F22E09B5; Wed, 30 Oct 2013 17:46:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FE67E09B5 for ; Wed, 30 Oct 2013 17:46:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B912D33EF15 for ; Wed, 30 Oct 2013 17:46:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6B209E546A for ; Wed, 30 Oct 2013 17:46:00 +0000 (UTC) From: "Azamat H. Hackimov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Azamat H. Hackimov" Message-ID: <1383155123.ac151d59332d5fed657ccbf56d69f2c713d593f8.winterheart@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: games-strategy/curseofwar/files/, games-strategy/curseofwar/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-strategy/curseofwar/curseofwar-1.1.8.ebuild games-strategy/curseofwar/curseofwar-1.2.0.ebuild games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch X-VCS-Directories: games-strategy/curseofwar/files/ games-strategy/curseofwar/ X-VCS-Committer: winterheart X-VCS-Committer-Name: Azamat H. Hackimov X-VCS-Revision: ac151d59332d5fed657ccbf56d69f2c713d593f8 X-VCS-Branch: master Date: Wed, 30 Oct 2013 17:46: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-Archives-Salt: 05b93be9-f843-484b-9597-b0fdaeb40bc8 X-Archives-Hash: 4672008c639d6971316537f101de2144 commit: ac151d59332d5fed657ccbf56d69f2c713d593f8 Author: Azamat H. Hackimov gmail com> AuthorDate: Wed Oct 30 17:45:23 2013 +0000 Commit: Azamat H. Hackimov gentoo ru> CommitDate: Wed Oct 30 17:45:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ac151d59 [games-strategy/curseofwar] Bump to 1.2.0. --- games-strategy/curseofwar/curseofwar-1.1.8.ebuild | 29 ----------- games-strategy/curseofwar/curseofwar-1.2.0.ebuild | 57 ++++++++++++++++++++++ ...urseofwar-1.2.0-fix-gcc-error-compilation.patch | 30 ++++++++++++ 3 files changed, 87 insertions(+), 29 deletions(-) diff --git a/games-strategy/curseofwar/curseofwar-1.1.8.ebuild b/games-strategy/curseofwar/curseofwar-1.1.8.ebuild deleted file mode 100644 index 2bd573a..0000000 --- a/games-strategy/curseofwar/curseofwar-1.1.8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit games - -DESCRIPTION="A fast-paced action strategy game implemented using ncurses user interface." -HOMEPAGE="https://github.com/a-nikolaev/curseofwar/wiki" -SRC_URI="https://github.com/a-nikolaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-libs/ncurses" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i -e "s:%VERSION%:${PV}:g" ${PN}.6 -} - -src_install() { - dogamesbin ${PN} - doman ${PN}.6 - dodoc CHANGELOG README -} diff --git a/games-strategy/curseofwar/curseofwar-1.2.0.ebuild b/games-strategy/curseofwar/curseofwar-1.2.0.ebuild new file mode 100644 index 0000000..97a86c1 --- /dev/null +++ b/games-strategy/curseofwar/curseofwar-1.2.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit cmake-utils games + +DESCRIPTION="A fast-paced action strategy game implemented using ncurses user interface." +HOMEPAGE="https://github.com/a-nikolaev/curseofwar/wiki" +SRC_URI="https://github.com/a-nikolaev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ncurses sdl" +REQUIRED_USE="|| ( ncurses sdl )" + +DEPEND="ncurses? ( sys-libs/ncurses ) + sdl? ( media-libs/libsdl )" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e "s:%VERSION%:${PV}:g" ${PN}{,-sdl}.6 + sed -i -e "s:/usr/local/share/:${GAMES_DATADIR}/:g" path.c + epatch "${FILESDIR}/${P}-fix-gcc-error-compilation.patch" +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use ncurses CW_NCURSE_FRONTEND) + $(cmake-utils_use sdl CW_SDL_FRONTEND) + $(cmake-utils_use sdl CW_SDL_MULTIPLAYER) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + doicon pixmaps/${PN}-32x32.xpm + if use ncurses ; then + dogamesbin "${BUILD_DIR}/${PN}" + make_desktop_entry ${PN} "Curse of War" ${PN}-32x32 "Game;StrategyGame" "Terminal=true" + doman ${PN}.6 + fi + if use sdl ; then + dogamesbin "${BUILD_DIR}/${PN}-sdl" + make_desktop_entry ${PN}-sdl "Curse of War (SDL)" ${PN}-32x32 + doman ${PN}-sdl.6 + insinto "${GAMES_DATADIR}/${PN}" + doins -r images + fi + dodoc CHANGELOG README +} 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 new file mode 100644 index 0000000..d2593c7 --- /dev/null +++ b/games-strategy/curseofwar/files/curseofwar-1.2.0-fix-gcc-error-compilation.patch @@ -0,0 +1,30 @@ +From 5d4865e03f96b73af602c6fb11a618195dc6d00c Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Wed, 30 Oct 2013 23:19:29 +0600 +Subject: [PATCH] =?UTF-8?q?Fixed=20GCC=20error=20compilation=20Fixed=20"ex?= + =?UTF-8?q?pected=20primary-expression=20before=20=C2=AB.=C2=BB=20token"?= + =?UTF-8?q?=20error.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + output-sdl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/output-sdl.c b/output-sdl.c +index 7f67c5c..54f652b 100644 +--- a/output-sdl.c ++++ b/output-sdl.c +@@ -380,7 +380,7 @@ void output_sdl (SDL_Surface *tileset, SDL_Surface *typeface, SDL_Surface *uisur + /* line */ + int line_width=555; + struct SDL_Rect src_line_rect = {0, 0, line_width, 1}; +- 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}; ++ struct SDL_Rect dst_line_rect = {TILE_WIDTH + 75*TYPE_WIDTH/2 - line_width/2, screen_y + (TYPE_HEIGHT*5/2), line_width, 1}; + SDL_BlitSurface(uisurf, &src_line_rect, screen, &dst_line_rect); + + } +-- +1.8.1.5 +