gentoo resync : 14.07.2018

6 files changed, 112 insertions, 0 deletions

diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
new file mode 100644
index 000000000000..74a087263368
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
@@ -0,0 +1,11 @@
+--- a/supertux2.desktop
++++ b/supertux2.desktop
+@@ -35,7 +35,7 @@
+ Comment[pt]=Joga este clássico de plataformas 2D
+ 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
++Icon=supertux
+ Exec=supertux2
+ Terminal=false
+ StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
new file mode 100644
index 000000000000..66be0ebe493b
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -571,7 +571,7 @@
+ 
+   SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
+ 
+-  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
++  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
+ 
+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
+ ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
new file mode 100644
index 000000000000..e35f85ce416f
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.4.0-license.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -578,7 +578,7 @@
+ 
+ INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
+ 
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
+ 
diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
new file mode 100644
index 000000000000..1b05369f67f3
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
@@ -0,0 +1,19 @@
+--- supertux-0.5.0/CMakeLists.txt
++++ supertux-0.5.0/CMakeLists.txt
+@@ -382,7 +382,6 @@
+ include_directories(${CMAKE_BINARY_DIR}/)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
+ 
+ IF(WIN32)
+@@ -392,7 +391,7 @@
+ 
+ ## Build list of sources for supertux binary
+ 
+-FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
++FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
+ 
+ FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
+ FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch
new file mode 100644
index 000000000000..3bedc38eb803
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch
@@ -0,0 +1,30 @@
+--- SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt
++++ SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt
+@@ -59,7 +59,7 @@
+ )
+ 
+ ## Reveal library type choice to users
+-option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" ON)
++option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" OFF)
+ 
+ # TinyGetText library compilation
+ 
+@@ -128,17 +128,7 @@
+ ## Debug options
+ 
+ option(WERROR "Stops on first compiler warning in debug mode" OFF)
+-option(WARNINGS "Enable long list of warnings for compiler to check" ON)
+-
+-CHECK_CXX_FLAG(std=c++0x)
+-CHECK_CXX_FLAG(O3)
+-IF(NOT MSVC)
+-    #MSVC is excessivly verbose when Wall is activated
+-    CHECK_CXX_FLAG(Wall)
+-ENDIF()
+-CHECK_CXX_FLAG(Wextra)
+-CHECK_CXX_FLAG(Weffc++)
+-CHECK_CXX_FLAG(pedantic)
++option(WARNINGS "Enable long list of warnings for compiler to check" OFF)
+ 
+ if(WARNINGS)
+   CHECK_CXX_FLAG(Wabi)
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
new file mode 100644
index 000000000000..d5181177fdcd
--- /dev/null
+++ b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
@@ -0,0 +1,30 @@
+Allow building with ninja instead of CMake, see also:
+
+  https://bugs.gentoo.org/649458
+  https://cmake.org/pipermail/cmake/2015-April/060234.html
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -332,7 +332,10 @@
+   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+   -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
+-  -DINSTALL_INC_DIR=include)
++  -DINSTALL_INC_DIR=include
++  BUILD_BYPRODUCTS
++  squirrel/lib/libsquirrel_static.a
++  squirrel/lib/libsqstdlib_static.a)
+ 
+ IF(WIN32)
+ 	ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
+@@ -370,7 +373,9 @@
+   -DHAVE_SDL=ON
+   -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
+   -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
+-  -DLIB_SUFFIX=${LIB_SUFFIX})
++  -DLIB_SUFFIX=${LIB_SUFFIX}
++  BUILD_BYPRODUCTS
++  tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
+ 
+ ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
+ SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")