diff --git a/games-arcade/supertux/ChangeLog b/games-arcade/supertux/ChangeLog --- a/games-arcade/supertux/ChangeLog +++ b/games-arcade/supertux/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/ChangeLog,v 1.33 2009/02/23 01:02:56 mr_bones_ Exp $ + 02 Feb 2010; Nathan Phillip Brink (ohnobinki) + supertux-9999.ebuild, + +files/supertux-9999-tinygettext-external.patch: + Added patch to support external tinygettext. Removed explicit dep on + subversion (provided by subversion.eclass automatically). + 14 Jan 2010; Nathan Phillip Brink (ohnobinki) supertux-9999.ebuild: Fixed shared game directory path. Added deps for boost and glew. Some diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest --- a/games-arcade/supertux/Manifest +++ b/games-arcade/supertux/Manifest @@ -1,3 +1,4 @@ -EBUILD supertux-9999.ebuild 1386 RMD160 fd2f7236c97802d48fba7f0977685b1720a2aa77 SHA1 7ac0d6e59590d5f82c84a7973787712c255da1ce SHA256 b75d9dba7e7145bfaef9dbf6b7c02e3fbf695d204514aacb8f8d9b0deae09af4 -MISC ChangeLog 5354 RMD160 c52da9c2976af3210121be96b452a88ebd206fa0 SHA1 a0a530a2428633c255c50e1efc0075485b8e8c1c SHA256 6239f8c9df0c0dba9e9f6afa225d5bc9213fc706aa4f0f718879df0ecb1cd3ff +AUX supertux-9999-tinygettext-external.patch 2171 RMD160 2a349e424c156a127c43144b5b2d8e43f17bd0b5 SHA1 eb205255063f4e51a22c3cc09c2efa91e44c47d6 SHA256 a86cf1f548cba707007791df5db2105c2b855a87f9542169752d59a2e20171df +EBUILD supertux-9999.ebuild 1506 RMD160 20bee5061fc76ac9da603102eeeb0a44211d285e SHA1 d620f48150fe07a2ac5147f6c6ada96ec29c00b5 SHA256 bc79bc5b8990cdd9a96b8605d9ef5df24f110af8278ced4a25959c3dde3e7cc0 +MISC ChangeLog 5640 RMD160 44b35bd39a6f29c54269456daf2d3fc9d269aae2 SHA1 d36c438a0b8f0f4eaf0b509c77a33dc3afa9a202 SHA256 45d1ff1ba213bab3b539539629e60b31c08fdf67ff443d2c96f2c013eef1496f MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-arcade/supertux/files/supertux-9999-tinygettext-external.patch b/games-arcade/supertux/files/supertux-9999-tinygettext-external.patch new file mode 100644 --- /dev/null +++ b/games-arcade/supertux/files/supertux-9999-tinygettext-external.patch @@ -0,0 +1,51 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 6304) ++++ CMakeLists.txt (working copy) +@@ -102,6 +102,17 @@ + SET(HAVE_LIBCURL TRUE) + ENDIF(CURL_FOUND) + ++INCLUDE(FindPkgConfig) ++pkg_check_modules(TINYGETTEXT tinygettext>=0.1) ++IF(TINYGETTEXT_FOUND) ++ SET(TINYGETTEXT_SOURCES_CXX "") ++ ADD_DEFINITIONS(${TINYGETTEXT_CFLAGS}) ++ELSE(TINYGETTEXT_FOUND) ++ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/) ++ FILE(GLOB TINYGETTEXT_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/tinygettext/tinygettext/*.cpp) ++ SET_SOURCE_FILES_PROPERTIES(${TINYGETTEXT_SOURCES_CXX} PROPERTIES COMPILE_DEFINITIONS HAVE_SDL) ++ENDIF(TINYGETTEXT_FOUND) ++ + #FIND_PACKAGE(ICONV REQUIRED) + #INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) + #LINK_LIBRARIES(${ICONV_LIBRARY}) +@@ -160,7 +171,6 @@ + include_directories (${CMAKE_BINARY_DIR}/) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/) +-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/binreloc/) +@@ -171,9 +181,6 @@ + + FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/main.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp) + +-FILE(GLOB TINYGETTEXT_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/tinygettext/tinygettext/*.cpp) +-SET_SOURCE_FILES_PROPERTIES(${TINYGETTEXT_SOURCES_CXX} PROPERTIES COMPILE_DEFINITIONS HAVE_SDL) +- + IF(HAVE_OPENGL) + FILE(GLOB SUPERTUX_OPENGL_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/video/gl/*.cpp) + SET(SUPERTUX_SOURCES_CXX ${SUPERTUX_SOURCES_CXX} ${SUPERTUX_OPENGL_SOURCES}) +@@ -346,6 +353,10 @@ + IF(HAVE_LIBCURL) + TARGET_LINK_LIBRARIES(supertux2 ${CURL_LIBRARY}) + ENDIF(HAVE_LIBCURL) ++IF(TINYGETTEXT_FOUND) ++ #then use the external tinygettext ++ TARGET_LINK_LIBRARIES(supertux2 ${TINYGETTEXT_LDFLAGS}) ++ENDIF(TINYGETTEXT_FOUND) + + ## Install stuff + diff --git a/games-arcade/supertux/supertux-9999.ebuild b/games-arcade/supertux/supertux-9999.ebuild --- a/games-arcade/supertux/supertux-9999.ebuild +++ b/games-arcade/supertux/supertux-9999.ebuild @@ -19,6 +19,7 @@ KEYWORDS="" IUSE="opengl curl debug" RDEPEND="dev-games/physfs + dev-libs/tinygettext media-libs/libsdl[joystick] media-libs/libvorbis media-libs/openal @@ -31,8 +32,12 @@ RDEPEND="dev-games/physfs # boost templates are used DEPEND="${RDEPEND} dev-libs/boost - dev-util/cmake - dev-util/subversion" + dev-util/cmake" + +src_prepare() { + epatch "${FILESDIR}/supertux-9999-tinygettext-external.patch" + rm -rf externals/tinygettext || die +} src_configure() { local mycmakeargs="-DWERROR=OFF