From nobody Wed Dec 29 18:38:54 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9A874190D1C9; Wed, 29 Dec 2021 18:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPKtR20Vsz4qrq; Wed, 29 Dec 2021 18:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA1051CBD; Wed, 29 Dec 2021 18:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BTIcsHX028940; Wed, 29 Dec 2021 18:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTIcslB028939; Wed, 29 Dec 2021 18:38:54 GMT (envelope-from git) Date: Wed, 29 Dec 2021 18:38:54 GMT Message-Id: <202112291838.1BTIcslB028939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 2fa35a912315 - main - games/stratagus: update to 3.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fa35a912315ebc2be23e12bbb86def55919e732 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640803136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E7dPnC0oN+SVhrvzbhuQXYRQBESBC/1IEV2illQ2g/Y=; b=yNdLi6jiOke34/rwETaoPaAQbamM3UOIME2B4roQcbIGhNB1OS2HNdU1TKDUzQCeBBS4DE UezswGV3ngaa0WJhkqVzyxK7KE1cpBFs64bKa6GzNtSkKgNX7wsKWUxobfqX4ycMun3+cS 8UbPZSl7R22ve32puDFkBg5oNAzXL021H5l1asfrK4HNgLMGil3naNIPOuRDFct4iVUzgH N4fu4sthSDapOBXQV/gnojjFFAOT5l3zsLBK7Adq/0FCiSCiAWtlRaoBtU1wdVd3mASLYG iIb8FdXhDQtdKdBMdTHAxr/ADO2I/DKjPWxC2Kfn/Uw/XlZYG3TxC3fz85FgbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640803136; a=rsa-sha256; cv=none; b=SZ1wwVXIA/XTLVbAFGa8ZO9XdyPe+Y6Eistf8a/cylNRT6LLP9f4b+alPx3a8n2aigk6xO gvcrcx8hEpGZw+GcF0zeZCXkyIBDLKcG5YBwkclUzaNtNqUw3zqYl1ad1nxQHKXEovC2aB wB1TADtAFu+de3E+qdpVRry8IAgYNqADFHUydYRH01IJdF5679hTyaqWxkEay+BwHSCLn7 tuzX0RgMgXWjU6qIsAfK7poS0eIOiiUkwLyGdQTah8N/82bouePCnwvvGu47934Opc8vkM 6KwxKxyq26NQmFromCXPwo3+u7sr0n7tt8PgL5FH0EgA5YV9bo+XztWRIg5GlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fa35a912315ebc2be23e12bbb86def55919e732 commit 2fa35a912315ebc2be23e12bbb86def55919e732 Author: Dmitry Marakasov AuthorDate: 2021-12-29 12:15:27 +0000 Commit: Dmitry Marakasov CommitDate: 2021-12-29 18:33:59 +0000 games/stratagus: update to 3.2.0 --- games/stratagus/Makefile | 2 +- games/stratagus/distinfo | 6 +-- games/stratagus/files/patch-CMakeLists.txt | 56 ++++------------------ .../patch-gameheaders_stratagus-tinyfiledialogs.h | 31 +++++++++--- 4 files changed, 38 insertions(+), 57 deletions(-) diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 1122810f8a3f..636d15e370bc 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -1,7 +1,7 @@ # Created by: Travis Poppe PORTNAME= stratagus -PORTVERSION= 3.1.2 +PORTVERSION= 3.2.0 DISTVERSIONPREFIX= v CATEGORIES= games diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo index f4b2a048d3a9..4d274b5e6812 100644 --- a/games/stratagus/distinfo +++ b/games/stratagus/distinfo @@ -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 diff --git a/games/stratagus/files/patch-CMakeLists.txt b/games/stratagus/files/patch-CMakeLists.txt index 19cda636d2ba..0c1bc6f73b2f 100644 --- a/games/stratagus/files/patch-CMakeLists.txt +++ b/games/stratagus/files/patch-CMakeLists.txt @@ -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}) diff --git a/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h b/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h index a70acf33aa2d..89b6319d565e 100644 --- a/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h +++ b/games/stratagus/files/patch-gameheaders_stratagus-tinyfiledialogs.h @@ -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 ; +