games-arcade/supertux: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Fri, 22 Dec 2017 15:25:59 +0000 (16:25 +0100)
committerDavid Seifert <soap@gentoo.org>
Sat, 23 Dec 2017 13:10:18 +0000 (14:10 +0100)
games-arcade/supertux/files/supertux-0.4.0-flags.patch [deleted file]
games-arcade/supertux/files/supertux-0.4.0-obstack.patch [deleted file]
games-arcade/supertux/files/supertux-0.4.0-squirrel.patch [deleted file]
games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch [deleted file]

diff --git a/games-arcade/supertux/files/supertux-0.4.0-flags.patch b/games-arcade/supertux/files/supertux-0.4.0-flags.patch
deleted file mode 100644 (file)
index a09176c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -329,7 +329,7 @@
- endif(COMPILER_SUPPORTS_CXX11)
--IF(CMAKE_COMPILER_IS_GNUCC)
-+IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
-   SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
-   SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Debug flags")
-   SET(CMAKE_CXX_FLAGS_PROFILE "-pg" CACHE STRING "Profile flags")
-@@ -352,7 +352,7 @@
-     #   -Wlogical-op -Wstrict-null-sentinel
-     SET(SUPERTUX2_EXTRA_WARNING_FLAGS "-fdiagnostics-show-option -pedantic -Wno-long-long -Wcast-align -Wdisabled-optimization -Winit-self -Winvalid-pch -Wmissing-include-dirs -Wmissing-noreturn -Wpacked -Wredundant-decls -Wstack-protector -Wformat=2 -Weffc++ -Wctor-dtor-privacy  -Wno-unused-parameter -Wshadow -Wnon-virtual-dtor -Wcast-qual")
-   ENDIF(WARNINGS)
--ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
- ## If xgettext is available, generate messages.pot for sources
-@@ -407,9 +407,9 @@
- ENDIF(GENERATE_MESSAGESPOT)
- ## Some additional compiler switches
--IF(CMAKE_COMPILER_IS_GNUCC)
-+IF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
--ENDIF(CMAKE_COMPILER_IS_GNUCC)
-+ENDIF(CMAKE_COMPILER_IS_GNUCC_NOTOUCHING_FLAGS)
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-   ADD_DEFINITIONS(-DMACOSX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-obstack.patch b/games-arcade/supertux/files/supertux-0.4.0-obstack.patch
deleted file mode 100644 (file)
index 609fe94..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -251,7 +251,6 @@
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- IF(WIN32)
-   ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX)
-@@ -260,7 +259,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.4.0-squirrel.patch b/games-arcade/supertux/files/supertux-0.4.0-squirrel.patch
deleted file mode 100644 (file)
index 0982442..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- supertux-0.4.0.orig/external/squirrel/CMakeLists.txt
-+++ supertux-0.4.0/external/squirrel/CMakeLists.txt
-@@ -65,8 +65,6 @@
\r
- # the squirrel sources are out of our control so don't be too pedantic about\r
- # them\r
--SET(CMAKE_CXX_FLAGS "")\r
--SET(CMAKE_C_FLAGS "")\r
\r
- ## define a target for building the library\r
\r
-@@ -82,8 +80,3 @@
- set(LIB_SUBDIR "lib${LIB_SUFFIX}"\r
-       CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)")\r
\r
--INSTALL(TARGETS squirrel\r
--    RUNTIME DESTINATION bin\r
--      ARCHIVE DESTINATION ${LIB_SUBDIR}\r
--      LIBRARY DESTINATION ${LIB_SUBDIR}\r
--      COMPONENT squirrel)\r
diff --git a/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.4.0-tinygettext.patch
deleted file mode 100644 (file)
index 23e572d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
---- supertux-0.4.0.orig/external/tinygettext/CMakeLists.txt
-+++ supertux-0.4.0/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
-@@ -127,14 +127,9 @@
- ## 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)
-+option(WARNINGS "Enable long list of warnings for compiler to check" OFF)
- CHECK_CXX_FLAG(std=c++0x)
--CHECK_CXX_FLAG(O3)
--CHECK_CXX_FLAG(Wall)
--CHECK_CXX_FLAG(Wextra)
--CHECK_CXX_FLAG(Weffc++)
--CHECK_CXX_FLAG(pedantic)
- if(WARNINGS)
-   CHECK_CXX_FLAG(Wabi)
-@@ -194,22 +189,4 @@
-   endforeach(TEST)
- ENDIF()
--## Install tinygettext
--
--# use standardized variable name
--set(LIB_SUBDIR "lib${LIB_SUFFIX}"
--      CACHE STRING "Subdirectory of prefix into which libraries are installed (e.g., lib32, lib64)")
--
--## prepare tinygettext.pc
--configure_file(tinygettext.pc.in tinygettext.pc @ONLY)
--
--install(TARGETS tinygettext
--    RUNTIME DESTINATION bin
--      ARCHIVE DESTINATION ${LIB_SUBDIR}
--      LIBRARY DESTINATION ${LIB_SUBDIR})
--install(FILES ${TINYGETTEXT_HEADERS}
--      DESTINATION include/tinygettext)
--install(FILES ${tinygettext_BINARY_DIR}/tinygettext.pc
--      DESTINATION ${LIB_SUBDIR}/pkgconfig)
--
- # EOF #