mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00
Code Issues Releases Activity

games/stratagus: update to 3.2.0

Browse Source
This commit is contained in:
Dmitry Marakasov 2021-12-29 15:15:27 +03:00
parent 7a9b64f9c8
commit 2fa35a9123
4 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/stratagus/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Travis Poppe <tlp@liquidx.org>
PORTNAME= stratagus
PORTVERSION= 3.1.2
PORTVERSION= 3.2.0
DISTVERSIONPREFIX= v
CATEGORIES= games

6
games/stratagus/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1640017839
SHA256 (Wargus-stratagus-v3.1.2_GH0.tar.gz) = e88dbf5e9136329d5fbba403224465633c0b06c307dd1abef4073d58f34464e5
SIZE (Wargus-stratagus-v3.1.2_GH0.tar.gz) = 1190124
TIMESTAMP = 1640690292
SHA256 (Wargus-stratagus-v3.2.0_GH0.tar.gz) = 6fef6934714b80fabd61fde97cff5f0918a20ca490fcff7adbcebc3e899a8bee
SIZE (Wargus-stratagus-v3.2.0_GH0.tar.gz) = 1537172

56
games/stratagus/files/patch-CMakeLists.txt
View File

@ -1,56 +1,20 @@
--- CMakeLists.txt.orig 2021-07-17 05:26:07 UTC
--- CMakeLists.txt.orig 2021-12-24 20:26:54 UTC
+++ CMakeLists.txt
@@ -814,15 +814,7 @@ endif()
# Stratagus needs to have char by default signed
# No idea how to tell this to other compilers
-if(CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Werror")
-endif()
-if(CMAKE_COMPILER_IS_GNUC)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char")
-endif()
-if(WIN32 AND MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
if(CMAKE_BUILD_TYPE STREQUAL "Profile")
find_package(coz-profiler)
@@ -1195,22 +1187,20 @@ endif()
@@ -1238,7 +1238,6 @@ endif()
install(TARGETS stratagus DESTINATION ${GAMEDIR})
install(TARGETS png2stratagus DESTINATION ${BINDIR})
-if(ENABLE_DOC AND DOXYGEN_FOUND)
- install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
- install(FILES
- doc/development.html
- doc/faq.html
- doc/gpl.html
- doc/guichan-copyright.txt
- doc/changelog.html
- doc/index.html
- doc/install.html
- doc/media.html
- doc/README-SDL.txt
- DESTINATION share/doc/stratagus
- )
install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
install(FILES
doc/development.html
@@ -1252,8 +1251,7 @@ if(ENABLE_DOC AND DOXYGEN_FOUND)
doc/README-SDL.txt
DESTINATION share/doc/stratagus
)
- install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
-endif(ENABLE_DOC AND DOXYGEN_FOUND)
+install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
+install(FILES
+ doc/development.html
+ doc/faq.html
+ doc/gpl.html
+ doc/guichan-copyright.txt
+ doc/changelog.html
+ doc/index.html
+ doc/install.html
+ doc/media.html
+ doc/README-SDL.txt
+ DESTINATION share/doc/stratagus
+)
+install(DIRECTORY doc/graphics doc/scripts DESTINATION ${DOCDIR})
+ install(DIRECTORY doc/graphics doc/scripts DESTINATION ${DOCDIR})
if(ENABLE_DEV)
install(FILES ${gameheaders_HDRS} DESTINATION ${STRATAGUS_HEADERS})

31
games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h
View File

@ -1,13 +1,30 @@
We don't currently have osascript in ports, but for the case when
we actually do, make sure it's not suddenly called and prefer zenity.
Break overly clever and inconsistent logic of detecting a tool to
display a dialog box, always stick to zenity. Don't try to beep
too.
--- gameheaders/stratagus-tinyfiledialogs.h.orig 2021-07-17 05:26:07 UTC
+++ gameheaders/stratagus-tinyfiledialogs.h
@@ -2350,6 +2350,7 @@ static int gdialogPresent ( )
@@ -3676,6 +3676,7 @@ static int gdialogPresent(void)
static int osascriptPresent ( )
static int osascriptPresent(void)
{
+ return 0;
static int lOsascriptPresent = -1 ;
if ( lOsascriptPresent < 0 )
{
static int lOsascriptPresent = -1 ;
if (lOsascriptPresent < 0) {
gWarningDisplayed |= !!getenv("SSH_TTY");
@@ -3779,6 +3780,7 @@ int tfd_zenity3Present(void)
int tfd_kdialogPresent(void)
{
+ return 0;
static int lKdialogPresent = -1 ;
char lBuff[MAX_PATH_OR_CMD] ;
FILE *lIn ;
@@ -3974,6 +3976,7 @@ static void sigHandler(int signum)
void tinyfd_beep(void)
{
+ return;
char lDialogString[256] ;
FILE *lIn ;