[gentoo-commits] repo/gentoo:master commit in: games-puzzle/freesweep/files/, games-puzzle/freesweep/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/freesweep/files/, games-puzzle/freesweep/

[Ionen Wolkens]

commit:     3e8f2c0b1fe3b12d53e718061c452e0d4a9cd9a5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 15:43:44 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 19:08:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8f2c0b

games-puzzle/freesweep: drop 1.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-puzzle/freesweep/Manifest                    |  1 -
 .../freesweep/files/freesweep-1.0.1-gcc10.patch    | 39 ----------------------
 games-puzzle/freesweep/freesweep-1.0.1.ebuild      | 31 -----------------
 3 files changed, 71 deletions(-)

diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
index 2622f2a0ef95..35d43e33fc71 100644
--- a/games-puzzle/freesweep/Manifest
+++ b/games-puzzle/freesweep/Manifest
@@ -1,2 +1 @@
-DIST freesweep-1.0.1.tar.gz 93966 BLAKE2B 8eab63930e41067e2e5626a4504bef00db58bfde54a43c4512bed2e8ae186d165b5b15acf8c1074a8b02e1d63876fb4e36b8c78f181c7d86d055976a15b8ec83 SHA512 8270c77940225c8ebf0912ac896eaaaabd81775a82877650f3b9c2e0cf3b6a296b73f02ebc26e8fe526fc56f3807d9a2809f46e44b3d8507f011f9cf2c794099
 DIST freesweep-1.0.2.tar.gz 93986 BLAKE2B 306c0e87448534c23c7754f9bedbaf9d72ee705bfdb3cc08a004076bd56a117f4bbb19f4676282edccc57286b5135d6714d6ad2e94a903235c8f4bb9a305ad77 SHA512 1695bb29efbaed5e6baf5faadcbd685e8e6b4ccb5d52567a833b5f5eeb69200fc220579fea7d6907bffc92a06e9b220bca494e8597394820a421f81f0af1d3aa

diff --git a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch b/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
deleted file mode 100644
index 4288c8b26a2c..000000000000
--- a/games-puzzle/freesweep/files/freesweep-1.0.1-gcc10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a86245df4f3ff276a393f799d737d28a5cb0a5a8 Mon Sep 17 00:00:00 2001
-From: Reiner Herrmann <reiner@reiner-h.de>
-Date: Thu, 23 Apr 2020 00:46:58 +0200
-Subject: [PATCH] Fix build with GCC 10
-
-mark variable declaration in sweep.h as extern, as otherwise
-linker would complain about multiple definitions.
-keep actual declaration in a C file.
----
- main.c     | 2 ++
- sweep.h.in | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index 6411dcb..8d5cbe7 100644
---- a/main.c
-+++ b/main.c
-@@ -10,6 +10,8 @@
- 
- #include "sweep.h"
- 
-+DrawChars CharSet;
-+
- int main(int argc, char** argv)
- {
- 	GameStats* Game;
-diff --git a/sweep.h.in b/sweep.h.in
-index f30c133..7f398de 100644
---- a/sweep.h.in
-+++ b/sweep.h.in
-@@ -246,7 +246,7 @@ struct FileBuf
- FILE* DebugLog;
- #endif /* DEBUG_LOG */
- 
--DrawChars CharSet;
-+extern DrawChars CharSet;
- 
- /* These are the functions defined in files.c */
- int SourceHomeFile(GameStats* Game);

diff --git a/games-puzzle/freesweep/freesweep-1.0.1.ebuild b/games-puzzle/freesweep/freesweep-1.0.1.ebuild
deleted file mode 100644
index 3a27c3f4f0b9..000000000000
--- a/games-puzzle/freesweep/freesweep-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Console Minesweeper"
-HOMEPAGE="https://github.com/rwestlund/freesweep"
-SRC_URI="https://github.com/rwestlund/freesweep/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin freesweep
-	einstalldocs
-	doman freesweep.6
-}

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/freesweep/files/, games-puzzle/freesweep/

[Sam James]

commit:     5656e4bbbf52ff27ef8afe4a6e561c4d3844e98c
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Thu Jul 10 20:32:48 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 12 05:55:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5656e4bb

games-puzzle/freesweep: fix build with gcc15

Closes: https://bugs.gentoo.org/944183
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/42950
Closes: https://github.com/gentoo/gentoo/pull/42950
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-puzzle/freesweep/files/freesweep-1.0.2-gcc15.patch   | 14 ++++++++++++++
 ...freesweep-1.0.2-r1.ebuild => freesweep-1.0.2-r2.ebuild} |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-puzzle/freesweep/files/freesweep-1.0.2-gcc15.patch b/games-puzzle/freesweep/files/freesweep-1.0.2-gcc15.patch
new file mode 100644
index 000000000000..337c5e47848e
--- /dev/null
+++ b/games-puzzle/freesweep/files/freesweep-1.0.2-gcc15.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/944183
+Since 1.0.2 the upstream code looks very different now
+
+--- a/game.c
++++ b/game.c
+@@ -414,7 +414,7 @@ int ParseArgs(GameStats* Game, int Argc, char** Argv)
+ 	{
+ 		StartCurses();
+ 		InitCharSet(Game,Game->LineDraw);
+-		PrintGPL(NULL);
++		PrintGPL();
+ 		clear();
+ 		noutrefresh();
+ 		doupdate();

diff --git a/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild b/games-puzzle/freesweep/freesweep-1.0.2-r2.ebuild
similarity index 89%
rename from games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
rename to games-puzzle/freesweep/freesweep-1.0.2-r2.ebuild
index b2a002295f08..86af4b39ca4c 100644
--- a/games-puzzle/freesweep/freesweep-1.0.2-r1.ebuild
+++ b/games-puzzle/freesweep/freesweep-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,10 @@ RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}"-gcc15.patch
+)
+
 src_prepare() {
 	default