git: 092787dffe45 - main - games/stratagus: fix build with recent c++ library
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 May 2023 18:27:49 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=092787dffe45ea6ee1c5ea3b8cede34eea142992
commit 092787dffe45ea6ee1c5ea3b8cede34eea142992
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2023-05-22 14:39:10 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2023-05-22 18:27:10 +0000
games/stratagus: fix build with recent c++ library
In recent c++ library (such as on 14.x), <experimental/filesystem>
header would be removed in favor of standard <filesystem>. Remove
check for the former and don't do weird stuff when
experimental/filesystem is not present.
Reported by: pkg-fallout
---
games/stratagus/files/patch-CMakeLists.txt | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/games/stratagus/files/patch-CMakeLists.txt b/games/stratagus/files/patch-CMakeLists.txt
index 7c0850bf2f87..ec99a394983a 100644
--- a/games/stratagus/files/patch-CMakeLists.txt
+++ b/games/stratagus/files/patch-CMakeLists.txt
@@ -1,5 +1,14 @@
---- CMakeLists.txt.orig 2022-07-31 09:44:18 UTC
+--- CMakeLists.txt.orig 2022-08-10 18:13:08 UTC
+++ CMakeLists.txt
+@@ -656,7 +656,7 @@ if(APPLE)
+ list(APPEND CMAKE_PREFIX_PATH /opt/homebrew/)
+ endif()
+
+-if(NOT WIN32 OR NOT MSVC)
++if(FALSE)
+ include(CheckCXXSourceCompiles)
+ set(FS_SRC "
+ #include <experimental/filesystem>
@@ -807,7 +807,7 @@ endif()
# Stratagus definitions
@@ -41,7 +50,7 @@
set(stratagus_LIBS ${stratagus_LIBS} ${THEORA_LIBRARY})
endif()
-@@ -1311,7 +1311,7 @@ if (WIN32)
+@@ -1311,8 +1311,8 @@ if (WIN32)
install(TARGETS midiplayer DESTINATION ${GAMEDIR})
endif()
@@ -50,6 +59,7 @@
+if(ENABLE_DOC)
install(FILES
doc/development.html
+ doc/faq.html
@@ -1325,8 +1325,11 @@ if(ENABLE_DOC AND DOXYGEN_FOUND)
doc/README-SDL.txt
DESTINATION share/doc/stratagus