From 5aedb944a6811d714ffbccd63aa080887643f2d9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Apr 07 2010 11:49:35 +0000 Subject: - New upstream release 0.3.3 - As upstream consistently calls this supertux2, do the same (rather then renaming it to supertux) - Move the icon to the FDO icon dir --- diff --git a/.cvsignore b/.cvsignore index ea7f431..527debe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -supertux-0.3.1d.tar.bz2 +supertux-0.3.3.tar.bz2 diff --git a/sources b/sources index 280d860..311b72d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6741f3874f64bc5371d72d664a6424bc supertux-0.3.1d.tar.bz2 +f3f803e629ee51a9de0b366a036e393d supertux-0.3.3.tar.bz2 diff --git a/supertux-0.3.1-comments.patch b/supertux-0.3.1-comments.patch deleted file mode 100644 index 3a6f2ac..0000000 --- a/supertux-0.3.1-comments.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Lubomir Rintel -Subject: [PATCH] Fix useless warnings using most locales - -This actually addresses two issues: - -Consider blank lines to be comments, skip over them rather than -attempting to read keywords there. - -Empty a token when the comment is enountered -- the comment -is not necessarily followed by a keyword, but it can be an EOF. - -diff -up supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments supertux-0.3.1/src/tinygettext/tinygettext.cpp ---- supertux-0.3.1/src/tinygettext/tinygettext.cpp.comments 2008-12-20 22:37:54.000000000 +0100 -+++ supertux-0.3.1/src/tinygettext/tinygettext.cpp 2008-12-20 22:38:17.000000000 +0100 -@@ -705,15 +705,16 @@ public: - switch(state) - { - case READ_KEYWORD: -- if (c == '#') -+ // Read a new token -+ token = Token(); -+ -+ if (c == '#' || c == '\n' || c == '\r') - { - state = SKIP_COMMENT; -+ in.unget(); - } - else - { -- // Read a new token -- token = Token(); -- - do { // Read keyword - token.keyword += c; - } while((c = getchar(in)) != EOF && !isspace(c)); diff --git a/supertux-0.3.1-cons_disable.patch b/supertux-0.3.1-cons_disable.patch deleted file mode 100644 index c8378dc..0000000 --- a/supertux-0.3.1-cons_disable.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up supertux-0.3.1/src/console.cpp.cons_disable supertux-0.3.1/src/console.cpp ---- supertux-0.3.1/src/console.cpp.cons_disable 2008-12-20 22:46:37.000000000 +0100 -+++ supertux-0.3.1/src/console.cpp 2008-12-20 22:46:48.000000000 +0100 -@@ -347,6 +347,7 @@ Console::addLine(std::string s) - // output line to stderr - std::cerr << s << std::endl; - -+#if 0 - // wrap long lines - std::string overflow; - unsigned int line_count = 0; -@@ -373,6 +374,7 @@ Console::addLine(std::string s) - // increase time that console stays open - if(stayOpen < 6) - stayOpen += 1.5; -+#endif - } - - void diff --git a/supertux-0.3.1-gcc43.patch b/supertux-0.3.1-gcc43.patch deleted file mode 100644 index bd1ef00..0000000 --- a/supertux-0.3.1-gcc43.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up supertux-0.3.1/src/addon_manager.cpp~ supertux-0.3.1/src/addon_manager.cpp ---- supertux-0.3.1/src/addon_manager.cpp~ 2008-07-10 10:58:11.000000000 +0200 -+++ supertux-0.3.1/src/addon_manager.cpp 2008-07-10 10:58:11.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include "addon_manager.hpp" - #include "config.h" - #include "log.hpp" -diff -up supertux-0.3.1/src/console.hpp~ supertux-0.3.1/src/console.hpp ---- supertux-0.3.1/src/console.hpp~ 2008-07-10 10:48:45.000000000 +0200 -+++ supertux-0.3.1/src/console.hpp 2008-07-10 10:57:01.000000000 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - class Console; -diff -up supertux-0.3.1/src/lisp/lexer.cpp~ supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1/src/lisp/lexer.cpp~ 2008-07-10 11:00:49.000000000 +0200 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2008-07-10 11:00:49.000000000 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "lexer.hpp" - -diff -up supertux-0.3.1/src/resources.cpp~ supertux-0.3.1/src/resources.cpp -diff -up supertux-0.3.1/src/sprite/sprite_manager.hpp~ supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1/src/sprite/sprite_manager.hpp~ 2008-07-10 10:58:59.000000000 +0200 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-07-10 10:58:59.000000000 +0200 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include -+#include - - class SpriteData; - class Sprite; -diff -up supertux-0.3.1/src/textscroller.hpp~ supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1/src/textscroller.hpp~ 2008-07-10 10:50:27.000000000 +0200 -+++ supertux-0.3.1/src/textscroller.hpp 2008-07-10 10:57:18.000000000 +0200 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "screen.hpp" - #include "math/vector.hpp" -diff -up supertux-0.3.1/src/title.cpp~ supertux-0.3.1/src/title.cpp ---- supertux-0.3.1/src/title.cpp~ 2008-07-10 10:57:50.000000000 +0200 -+++ supertux-0.3.1/src/title.cpp 2008-07-10 10:57:50.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -up supertux-0.3.1/src/video/sdl_texture.hpp~ supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1/src/video/sdl_texture.hpp~ 2008-07-10 11:01:13.000000000 +0200 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-07-10 11:01:13.000000000 +0200 -@@ -22,6 +22,7 @@ - - #include - -+#include - #include - - #include "texture.hpp" diff --git a/supertux-0.3.1-gcc44.patch b/supertux-0.3.1-gcc44.patch deleted file mode 100644 index bba9144..0000000 --- a/supertux-0.3.1-gcc44.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix build with GCC 4.4 - -Lubomir Rintel - -diff -up supertux-0.3.1/src/lisp/lisp.cpp.gcc44 supertux-0.3.1/src/lisp/lisp.cpp ---- supertux-0.3.1/src/lisp/lisp.cpp.gcc44 2009-03-01 15:13:40.000000000 +0100 -+++ supertux-0.3.1/src/lisp/lisp.cpp 2009-03-01 15:13:53.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include - -+#include - #include "lisp.hpp" - - namespace lisp -diff -up supertux-0.3.1/src/random_generator.cpp.gcc44 supertux-0.3.1/src/random_generator.cpp ---- supertux-0.3.1/src/random_generator.cpp.gcc44 2009-03-01 15:14:05.000000000 +0100 -+++ supertux-0.3.1/src/random_generator.cpp 2009-03-01 15:14:18.000000000 +0100 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "random_generator.hpp" - - RandomGenerator systemRandom; // global random number generator diff --git a/supertux-0.3.3-desktop.patch b/supertux-0.3.3-desktop.patch new file mode 100644 index 0000000..086ee46 --- /dev/null +++ b/supertux-0.3.3-desktop.patch @@ -0,0 +1,22 @@ +diff -up supertux-0.3.3/supertux2.desktop~ supertux-0.3.3/supertux2.desktop +--- supertux-0.3.3/supertux2.desktop~ 2010-03-01 13:40:55.000000000 +0100 ++++ supertux-0.3.3/supertux2.desktop 2010-04-06 13:48:49.649787145 +0200 +@@ -1,7 +1,5 @@ + [Desktop Entry] + Type=Application +-Version=1.0 +-Encoding=UTF-8 + Name=SuperTux 2 + Name[en]=SuperTux 2 + GenericName=Platform Game +@@ -35,8 +33,8 @@ Comment[nn]=Eit klassisk todimensjonalt + Comment[sv]=Ett klassiskt tvådimensionellt plattformsspel + Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr + Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék +-Icon=supertux.png +-Exec=supertux2 ++Icon=supertux ++Exec=supertux2-wrapper + Terminal=false + StartupNotify=false + Categories=Game;ArcadeGame; diff --git a/supertux-0.3.3-system-squirrel.patch b/supertux-0.3.3-system-squirrel.patch new file mode 100644 index 0000000..7f9508d --- /dev/null +++ b/supertux-0.3.3-system-squirrel.patch @@ -0,0 +1,31 @@ +diff -up supertux-0.3.3/CMakeLists.txt~ supertux-0.3.3/CMakeLists.txt +--- supertux-0.3.3/CMakeLists.txt~ 2010-03-01 13:40:55.000000000 +0100 ++++ supertux-0.3.3/CMakeLists.txt 2010-04-07 11:34:40.349816531 +0200 +@@ -147,19 +147,10 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURR + + INCLUDE(ConfigureChecks) + +-## Also execute instructions in src/squirrel/CMakeLists.txt +- +-ADD_SUBDIRECTORY(external/squirrel) +- +-## Add squirrel lib dir to search path +- +-LINK_DIRECTORIES(external/squirrel) +- + ## Some additional include paths + + 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/) +@@ -325,6 +325,7 @@ ADD_DEPENDENCIES(supertux2 svnversion) + ## Link supertux binary with squirrel and other libraries + + TARGET_LINK_LIBRARIES(supertux2 squirrel) ++TARGET_LINK_LIBRARIES(supertux2 sqstdlib) + TARGET_LINK_LIBRARIES(supertux2 ${SDL_LIBRARY}) + TARGET_LINK_LIBRARIES(supertux2 ${SDLIMAGE_LIBRARY}) + TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY}) diff --git a/supertux.spec b/supertux.spec index dd947ae..dd26b5c 100644 --- a/supertux.spec +++ b/supertux.spec @@ -19,6 +19,9 @@ BuildRequires: physfs-devel BuildRequires: openal-devel BuildRequires: libvorbis-devel BuildRequires: squirrel-devel +BuildRequires: glew-devel +BuildRequires: boost-devel +BuildRequires: libcurl-devel BuildRequires: gettext BuildRequires: flex BuildRequires: bison