From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DACD15802F for ; Fri, 10 Mar 2023 07:46:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CCB9E086D; Fri, 10 Mar 2023 07:46:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 537A9E086D for ; Fri, 10 Mar 2023 07:46:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75E18335D8F for ; Fri, 10 Mar 2023 07:45:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1353321 for ; Fri, 10 Mar 2023 07:45:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678434340.ef781b2e02df4142141a43ee8da72738c42c67c3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/dxx-rebirth/files/, games-action/dxx-rebirth/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch X-VCS-Directories: games-action/dxx-rebirth/files/ games-action/dxx-rebirth/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef781b2e02df4142141a43ee8da72738c42c67c3 X-VCS-Branch: master Date: Fri, 10 Mar 2023 07:45:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2909517-ec4c-42cb-bdc8-97434f7060ed X-Archives-Hash: 49ae39ae8245143cf00af443c1bda98a commit: ef781b2e02df4142141a43ee8da72738c42c67c3 Author: Sam James gentoo org> AuthorDate: Fri Mar 10 07:39:28 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 10 07:45:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef781b2e games-action/dxx-rebirth: fix build w/ gcc 12 Closes: https://bugs.gentoo.org/894678 Signed-off-by: Sam James gentoo.org> .../dxx-rebirth-0.61.0_pre20210623.ebuild | 4 ++++ .../dxx-rebirth-0.61.0_pre20210623-gcc-12.patch | 25 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild index 853ff1d1f770..f703b0ade70e 100644 --- a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild +++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20210623.ebuild @@ -162,6 +162,10 @@ BDEPEND="virtual/pkgconfig" # and therefore requires a rebuild when changed. #IUSE_RUNTIME="flac l10n_de midi mp3 opl3-musicpack sc55-musicpack vorbis" +PATCHES=( + "${FILESDIR}"/${P}-gcc-12.patch +) + dxx_scons() { # Always build profile `m`. If use editor, also build profile `e`. # Set most variables in the default anonymous profile. Only diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch new file mode 100644 index 000000000000..3681385976a6 --- /dev/null +++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.61.0_pre20210623-gcc-12.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/894678 +https://github.com/dxx-rebirth/dxx-rebirth/commit/092daecb6118b3c072c71a8bea24f119e300bd49 + +From 092daecb6118b3c072c71a8bea24f119e300bd49 Mon Sep 17 00:00:00 2001 +From: Kp +Date: Sat, 28 May 2022 21:04:37 +0000 +Subject: [PATCH] Use static_cast<> to convert player_marker_num to + game_marker_index + +gcc-12 rejects the list initialization syntax. Switch to static_cast<>, +which generates equivalent code. + +Reported-by: dbermond +--- a/similar/main/automap.cpp ++++ b/similar/main/automap.cpp +@@ -370,7 +370,7 @@ game_marker_index convert_player_marker_index_to_game_marker_index(const game_mo + return static_cast((player_num * MAX_DROP_MULTI_COOP) + static_cast(player_marker_num)); + if (game_mode & GM_MULTI) + return static_cast((player_num * MAX_DROP_MULTI_COMPETITIVE) + static_cast(player_marker_num)); +- return game_marker_index{player_marker_num}; ++ return static_cast(player_marker_num); + } + + unsigned d_marker_state::get_markers_per_player(const game_mode_flags game_mode, const unsigned max_numplayers) +