From a2ff7b9b883d3ca9f6d782b1bf3b77784d424453 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 22 Mar 2011 17:55:15 +0000 Subject: games-action/openlierox: Apply compilation patch (bug #359655) (Portage version: 2.1.9.44/cvs/Linux x86_64) --- games-action/openlierox/ChangeLog | 10 ++- .../openlierox/files/openlierox-0.58_rc1-icu.patch | 67 ++++++++++++++++++++ .../openlierox/openlierox-0.58_rc1-r1.ebuild | 71 ++++++++++++++++++++++ 3 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 games-action/openlierox/files/openlierox-0.58_rc1-icu.patch create mode 100644 games-action/openlierox/openlierox-0.58_rc1-r1.ebuild (limited to 'games-action/openlierox') diff --git a/games-action/openlierox/ChangeLog b/games-action/openlierox/ChangeLog index 9da42d45858b..b811bf1576e8 100644 --- a/games-action/openlierox/ChangeLog +++ b/games-action/openlierox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-action/openlierox -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.5 2010/03/09 12:34:56 abcd Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/ChangeLog,v 1.6 2011/03/22 17:55:15 sping Exp $ + +*openlierox-0.58_rc1-r1 (22 Mar 2011) + + 22 Mar 2011; Sebastian Pipping + +openlierox-0.58_rc1-r1.ebuild, +files/openlierox-0.58_rc1-icu.patch: + Apply compilation patch by upstream (Gentoo bug #359655) 09 Mar 2010; Jonathan Callen openlierox-0.58_beta9-r1.ebuild, openlierox-0.58_rc1.ebuild: diff --git a/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch new file mode 100644 index 000000000000..32817c035c7d --- /dev/null +++ b/games-action/openlierox/files/openlierox-0.58_rc1-icu.patch @@ -0,0 +1,67 @@ +From f30e2447944c5131b9c9502ca8054f847d1a9c0f Mon Sep 17 00:00:00 2001 +From: Albert Zeyer +Date: Tue, 22 Mar 2011 14:42:15 +0100 +Subject: [PATCH] rename UnicodeString to Unicode32String + +Seems that ICU (unicode/unistr.h) polutes the global namespace and uses this name. See http://bugs.gentoo.org/show_bug.cgi?id=359655 . +--- + include/Unicode.h | 6 +++--- + src/common/Unicode.cpp | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/include/Unicode.h b/include/Unicode.h +index a523b46..5b976ab 100644 +--- a/include/Unicode.h ++++ b/include/Unicode.h +@@ -15,7 +15,7 @@ + #include + + typedef Uint32 UnicodeChar; +-typedef std::basic_string UnicodeString; ++typedef std::basic_string Unicode32String; + #ifdef WIN32 + typedef wchar_t Utf16Char; + typedef std::wstring Utf16String; +@@ -158,8 +158,8 @@ char UnicodeCharToAsciiChar(UnicodeChar c); + std::string RemoveSpecialChars(const std::string &Utf8String); + std::string Utf16ToUtf8(const Utf16String& str); + Utf16String Utf8ToUtf16(const std::string& str); +-std::string UnicodeToUtf8(const UnicodeString& str); +-UnicodeString Utf8ToUnicode(const std::string& str); ++std::string UnicodeToUtf8(const Unicode32String& str); ++Unicode32String Utf8ToUnicode(const std::string& str); + std::string UnicodeToAscii(const std::string& utf8str); + std::string ISO88591ToUtf8(const std::string& isostr); + #ifdef WIN32 +diff --git a/src/common/Unicode.cpp b/src/common/Unicode.cpp +index 5956289..5a58c30 100644 +--- a/src/common/Unicode.cpp ++++ b/src/common/Unicode.cpp +@@ -1055,10 +1055,10 @@ Utf16String Utf8ToUtf16(const std::string& str) + + ////////////////// + // Convert a Unicode string to UTF8 +-std::string UnicodeToUtf8(const UnicodeString& str) ++std::string UnicodeToUtf8(const Unicode32String& str) + { + std::string result; +- for (UnicodeString::const_iterator i = str.begin(); i != str.end(); i++) { ++ for (Unicode32String::const_iterator i = str.begin(); i != str.end(); i++) { + result += GetUtf8FromUnicode(*i); + } + +@@ -1067,9 +1067,9 @@ std::string UnicodeToUtf8(const UnicodeString& str) + + ////////////////// + // Convert a UTF8 string to Unicode +-UnicodeString Utf8ToUnicode(const std::string& str) ++Unicode32String Utf8ToUnicode(const std::string& str) + { +- UnicodeString result; ++ Unicode32String result; + for (std::string::const_iterator it = str.begin(); it != str.end();) + result += GetNextUnicodeFromUtf8(it, str.end()); + +-- +1.7.3.4 + diff --git a/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild new file mode 100644 index 000000000000..17ba70143df8 --- /dev/null +++ b/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/openlierox/openlierox-0.58_rc1-r1.ebuild,v 1.1 2011/03/22 17:55:15 sping Exp $ + +EAPI="2" + +inherit cmake-utils eutils games + +MY_PN="OpenLieroX" +MY_P="${MY_PN}_${PV}" +DESCRIPTION="Real-time excessive Worms-clone" +HOMEPAGE="http://openlierox.sourceforge.net/" +SRC_URI="mirror://sourceforge/openlierox/${MY_P}.src.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X breakpad debug joystick" + +RDEPEND="media-libs/sdl-mixer + media-libs/sdl-image + media-libs/gd[png] + dev-libs/libxml2 + dev-libs/libzip + net-misc/curl + joystick? ( media-libs/libsdl[joystick] ) + !joystick? ( media-libs/libsdl ) + X? ( x11-libs/libX11 + media-libs/libsdl[X] ) + !X? ( media-libs/libsdl )" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-icu.patch +} + +src_configure() { + local mycmakeargs=" + $(cmake-utils_use debug DEBUG) + $(cmake-utils_use X X11) + -D BREAKPAD=$(use breakpad && echo "Yes" || echo "No") + -D DISABLE_JOYSTICK=$(use joystick && echo "No" || echo "Yes") + -D SYSTEM_DATA_DIR=${GAMES_DATADIR} + -D VERSION=${PV}" + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + # NOTE: App uses case-insensitive file-handling + insinto "${GAMES_DATADIR}"/${PN}/ + doins -r share/gamedir/* || die "doins failed" + + dodoc doc/{README,ChangeLog,Development,TODO} || die "dodoc failed" + insinto /usr/share/doc/"${PF}" + doins -r doc/original_lx_docs || die "doins failed" + + doicon share/OpenLieroX.* || die "doicon failed" + make_desktop_entry openlierox OpenLieroX OpenLieroX \ + "Game;ActionGame;ArcadeGame;" || die "make_desktop_entry failed" + + dogamesbin "${CMAKE_BUILD_DIR}"/bin/openlierox || die "dogamesbin failed" + + prepgamesdirs +} -- cgit v1.2.3-65-gdbad