From: Michael Mair-Keimberger (asterix) Date: Fri, 25 Nov 2016 16:20:30 +0000 (+0100) Subject: games-arcade/performous: remove unused patches X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=95a62dfec9987024ca64e7066baa38be4f62c30d;p=gentoo.git games-arcade/performous: remove unused patches --- diff --git a/games-arcade/performous/files/performous-1.0-gcc52.patch b/games-arcade/performous/files/performous-1.0-gcc52.patch deleted file mode 100644 index dc3eb6b6d125..000000000000 --- a/games-arcade/performous/files/performous-1.0-gcc52.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- game/songparser.hh.old 2016-04-19 21:57:29.594132735 +0200 -+++ game/songparser.hh 2016-04-19 21:57:55.736682808 +0200 -@@ -33,7 +33,7 @@ - Song& m_song; - std::stringstream m_ss; - unsigned int m_linenum; -- bool getline(std::string& line) { ++m_linenum; return std::getline(m_ss, line);} -+ bool getline(std::string& line) { ++m_linenum; return !std::getline(m_ss, line).fail();} - bool m_relative; - double m_gap; - double m_bpm; diff --git a/games-arcade/performous/files/performous-1.0-gentoo.patch b/games-arcade/performous/files/performous-1.0-gentoo.patch deleted file mode 100644 index a73663a88c41..000000000000 --- a/games-arcade/performous/files/performous-1.0-gentoo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt ---- performous-1.0.orig/game/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400 -@@ -141,7 +141,7 @@ - set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin subfolder. - set(SUBSYSTEM_WIN32 WIN32) - else() -- set(BIN_INSTALL bin) -+ set(BIN_INSTALL @GENTOO_BINDIR@) - endif() - - # Build main executable diff --git a/games-arcade/performous/files/performous-1.0-include.patch b/games-arcade/performous/files/performous-1.0-include.patch deleted file mode 100644 index ba67018e5422..000000000000 --- a/games-arcade/performous/files/performous-1.0-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- performous-1.0/game/song.hh.orig 2015-03-31 13:56:13.546360617 -0400 -+++ performous-1.0/game/song.hh 2015-03-31 13:56:23.609025021 -0400 -@@ -3,6 +3,7 @@ - #include "i18n.hh" - #include "notes.hh" - #include "util.hh" -+#include "fs.hh" - #include - #include - #include diff --git a/games-arcade/performous/files/performous-1.0-libav.patch b/games-arcade/performous/files/performous-1.0-libav.patch deleted file mode 100644 index e3f36615281e..000000000000 --- a/games-arcade/performous/files/performous-1.0-libav.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake ---- Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:44:26.112930173 +0200 -+++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:56:10.229914635 +0200 -@@ -25,9 +25,15 @@ - if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") - set(AVUtil_INCLUDE "${suffix}avutil.h") - endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") -+ if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") -+ set(AVUtilMath_INCLUDE "${suffix}mathematics.h") -+ endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") - endif(NOT AVUtil_INCLUDE) - endforeach(suffix) - -+ if(NOT AVUtilMath_INCLUDE) -+ message(FATAL_ERROR "Found mathematics.h include dir, but not the header file. Perhaps you need to clear CMake cache?") -+ endif(NOT AVUtilMath_INCLUDE) - if(NOT AVUtil_INCLUDE) - message(FATAL_ERROR "Found avutil.h include dir, but not the header file. Perhaps you need to clear CMake cache?") - endif(NOT AVUtil_INCLUDE) diff --git a/games-arcade/performous/files/performous-1.0-linguas.patch b/games-arcade/performous/files/performous-1.0-linguas.patch deleted file mode 100644 index f8f1349ea3b9..000000000000 --- a/games-arcade/performous/files/performous-1.0-linguas.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt ---- performous-1.0.orig/lang/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400 -+++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500 -@@ -9,5 +9,13 @@ - file(MAKE_DIRECTORY "${mobuild}") - add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM) - add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make sure the mofiles are always built -- install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES") - endforeach(language) -+foreach(language $ENV{LINGUAS}) -+ set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) -+ if (EXISTS ${pofile}) -+ set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo) -+ install(FILES ${mofile} DESTINATION -+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo) -+ endif() -+endforeach(language) -+