From nobody Mon May 22 18:27:49 2023 X-Original-To: dev-commits-ports-all@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 4QQ5Xk1frJz4CJBM; Mon, 22 May 2023 18:27:50 +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 4QQ5Xk10sHz3wBX; Mon, 22 May 2023 18:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684780070; 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=LzImxm2019lUgdQ723N1noWyTDk0oV75Q8hyUkdzRdg=; b=QWnsOIPSWSxtLB0+NEnMh4Xc7c5SzzVtizBGVZbxdx3wFGg42Ha2uEnewlkdbA1yqazcDR e3+UERSrR835hAqIIfxPLfIE2MSOiVxaG3+/jxOBdJWG7S7MYJx1JJOTEHIXEYk9NiL64D 9VpukBVfpah95ROs+dbz7dERlBRX/Sa3y+H/OWGh9Ahc6F5UqVlip/27mHSC1655Ji+RLa AI8sFHJGnkr1b7HPouxK8VIcoWrOx6uiBrWEfP+WbYeeDY+dnVw7MAgts9eZP/xFvwlgpL 3RAXe4Io0e1HU8CBGv6SYbFehXi7B2+NP8lDmFqwcmKWRIc87D5BVFmQ2viM4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684780070; 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=LzImxm2019lUgdQ723N1noWyTDk0oV75Q8hyUkdzRdg=; b=QtGMaQVvVOOOaS/oFEuO5+zlMPzn9/Ro9zKAPO/06T5oMwCXORVW/AezQG8UECZdbZS0Ga fht/Zkimsh53yrH+74RKqYTRhniyv76V98UHtRCu/dS6Y6iX4zyCwJQN9yL0OUwjLuAGwX bLxWh2dRvqDjYKo+G831+NjcfN+iLnyjoq/1BmRkfzpfNpbOgJxU1SA3lo0+Lc3Ukk0nuP bXNKvJW7hn23fA6KECRfrG03KZRkO1vdA/sPOnqttuvU2uPc1bnL+JGO/ljUdVa7nyYOhj 3cHchI86qJrSshYBIKswLniFi8lNBiNqSo44Kp6BkvwlEDol4cFuowDc1GQbdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684780070; a=rsa-sha256; cv=none; b=Ib7j/cDrKSDmYVFIIfGOGKDpmylV2yGpN4RfyiV2Ht8gppGBzh/y9bcvKcjea0MiN722id tICUaafnnB1HPTAVYv4MaiB1iPsHnFQPPCR9zicCQAhCkM145172dR9CpCeEy0LNer6/5A eKn9e4yIGDLel/+S1ozlofM6KmefTkbhAENd6iJedvYn+FDojI1yJLiZLiRYMg9WwPa2hG jnKi96QUGZjBePTUcr9WHzfUD8Xo1tjpXqvHnE44MfVOzcHZZS0QKUlMMwFAvIYGNyHDgD RT/S7fUwhkP5rzimcJuafPx6yfe1hfTGvLK9hVYVw86r7sEYyjr8bUR3ZT16Ng== 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 4QQ5Xk04bgzSjS; Mon, 22 May 2023 18:27:50 +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 34MIRn76038702; Mon, 22 May 2023 18:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MIRnxk038699; Mon, 22 May 2023 18:27:49 GMT (envelope-from git) Date: Mon, 22 May 2023 18:27:49 GMT Message-Id: <202305221827.34MIRnxk038699@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: 092787dffe45 - main - games/stratagus: fix build with recent c++ library List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 092787dffe45ea6ee1c5ea3b8cede34eea142992 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=092787dffe45ea6ee1c5ea3b8cede34eea142992 commit 092787dffe45ea6ee1c5ea3b8cede34eea142992 Author: Dmitry Marakasov AuthorDate: 2023-05-22 14:39:10 +0000 Commit: Dmitry Marakasov 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), header would be removed in favor of standard . 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 @@ -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