commit: dcf791cd84278c02d9c7c42c1050c3c074a3643c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Feb 22 16:41:59 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Feb 22 18:27:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf791cd
games-simulation/EmptyEpsilon: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29727 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> ...EmptyEpsilon-Install-EmptyEpsilon.desktop.patch | 45 ---------------------- ...yEpsilon-Make-CMake-call-find_package-glm.patch | 35 ----------------- .../files/SeriousProton-Unbundle-json11.patch | 27 ------------- 3 files changed, 107 deletions(-) diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch deleted file mode 100644 index 4730bcbabb25..000000000000 --- a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c34c773ab5a403c288d7eecd971ae5b0d9eecfa0 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <f...@geekplace.eu> -Date: Thu, 21 Oct 2021 10:33:28 +0200 -Subject: [PATCH] Install EmptyEpsilon.desktop - -Fixes #405. - -See also https://bugs.gentoo.org/818697 ---- - CMakeLists.txt | 5 +++++ - EmptyEpsilon.desktop | 9 +++++++++ - 2 files changed, 14 insertions(+) - create mode 100644 EmptyEpsilon.desktop - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb3e32c0e6ed..b630668aecd9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -711,3 +711,8 @@ set(CPACK_INSTALL_CMAKE_PROJECTS - ) - - include(CPack) -+ -+if(UNIX AND NOT APPLE) -+ install(FILES EmptyEpsilon.desktop DESTINATION "share/applications") -+ install(FILES logo.png DESTINATION "share/icons" RENAME "EmptyEpsilon.png") -+endif() -diff --git a/EmptyEpsilon.desktop b/EmptyEpsilon.desktop -new file mode 100644 -index 000000000000..07cc109b578d ---- /dev/null -+++ b/EmptyEpsilon.desktop -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Name=EmptyEpsilon -+GenericName=EmptyEpsilon -+Comment=Spaceship bridge simulator game -+Exec=EmptyEpsilon -+Icon=EmptyEpsilon -+Terminal=false -+Type=Application -+Categories=Game;Simulation; --- -2.33.1 - diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch deleted file mode 100644 index da52f0267f77..000000000000 --- a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <f...@gentoo.org> -Date: Fri, 8 Oct 2021 11:07:20 +0200 -Subject: [PATCH] Make CMake call find_package(glm) - ---- - CMakeLists.txt | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6fb5c88f6614..9d65d1ef2653 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,17 +106,7 @@ if(WITH_DISCORD) - endif() - - # GLM --set(GLM_BASE_PATH "${EXTERNALS_DIR}") -- --if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") -- set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip") -- file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip"; "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON) -- -- file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm") -- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}") --endif() -- --add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL) -+find_package(glm) - - set(SOURCES - src/main.cpp --- -2.32.0 - diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch deleted file mode 100644 index deb44e9aee00..000000000000 --- a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ae5ea143e6a9f57c797a96b9024c8acc60f05828 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <f...@gentoo.org> -Date: Fri, 8 Oct 2021 13:26:27 +0200 -Subject: [PATCH] Unbundle json11 - ---- - CMakeLists.txt | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b57a4f6631a..0a06c3186ff5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,10 +86,6 @@ add_subdirectory(src/lua) - add_subdirectory(src/GL) - add_subdirectory(src/libopus) - --if(SERIOUSPROTON_WITH_JSON) -- add_subdirectory(src/json11) --endif() -- - #---------------------------------File lists----------------------------------- - set(source_files #All SeriousProton's objects to compile - src/clipboard.cpp --- -2.32.0 -
