From f2bdc27fe0f79f8f9a3945eb2b1163ce75c56439 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Feb 2025 00:13:18 +0000 Subject: gentoo auto-resync : 16:02:2025 - 00:13:18 --- games-board/Manifest.gz | Bin 9878 -> 9876 bytes games-board/gnushogi/Manifest | 4 +- .../gnushogi/files/gnushogi-1.4.1-makefile.patch | 72 +++++++++++++++++++++ .../files/gnushogi-1.4.1-xshogi-parser.patch | 25 +++++++ games-board/gnushogi/gnushogi-1.4.1-r1.ebuild | 57 ---------------- games-board/gnushogi/gnushogi-1.4.1-r2.ebuild | 50 ++++++++++++++ 6 files changed, 150 insertions(+), 58 deletions(-) create mode 100644 games-board/gnushogi/files/gnushogi-1.4.1-makefile.patch create mode 100644 games-board/gnushogi/files/gnushogi-1.4.1-xshogi-parser.patch delete mode 100644 games-board/gnushogi/gnushogi-1.4.1-r1.ebuild create mode 100644 games-board/gnushogi/gnushogi-1.4.1-r2.ebuild (limited to 'games-board') diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz index 00f6029b9177..d79f0a15c0d3 100644 Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest index be4f9b060c9e..bf0b65a5f761 100644 --- a/games-board/gnushogi/Manifest +++ b/games-board/gnushogi/Manifest @@ -1,4 +1,6 @@ AUX gnushogi-1.4.1-fno-common.patch 366 BLAKE2B a84ecad2b955c0866ae0bb71bb7efe3c234d3a796ea94b07449e390a1839a52cc0ceb5f4b679cfc03ab20f30e2212c2cde652872ec6045e6e821795473ef3014 SHA512 61a53e379720b7b841f0fbb28972ef0f776c8f34efb45e86741fc023f6f3e439304ac180e116ebf038f99419b60f169c2032c88becbaaa170d4dc06bb9d3c3c8 +AUX gnushogi-1.4.1-makefile.patch 1581 BLAKE2B 8147f7d9ec4f069821ed973640d8ce9749c5d4f63aba11613b726e26330c44f6f865f28c34579d4ca4cbf875b9113cd2ea2b04b5885a6ddb716f431de835abc3 SHA512 8024cf400c15110d27f020eebd53f25880e2da70207e5cb79e149a2f1760fa70c4d2708473f663aa33ac9dd4df63cb61d2aaf9249bbd15c19265699455b79a15 +AUX gnushogi-1.4.1-xshogi-parser.patch 711 BLAKE2B 062714fa6e22aae451d512a6e58a9f4c57112fc126a43279137456623a14814e1594c03d25519a47c82f9c43c0c77e632cdbb122c331b1a5855d1ddae895dcbd SHA512 ab4f9c9750365a2479e7e6a9754ae9f4c37e9b5446ce6ea025cc8d620dbc971e6d6a6575eab4528aa0f142cc3d43a9ed4ab12cdb16b3a3cfaa5c73a2b7cd71ee DIST gnushogi-1.4.1.tar.gz 542301 BLAKE2B bc2c0c89ca63d4cc617914771f9439d1e99ef89c87d46b3649fde97d521b874c74f049fe5340a5ccab603e7f532441821b7785aef2b50609903e926905d75ba9 SHA512 b997f309bfba85553465ceb262094aa0a9a53dc7ad970f77c0eb0c1558ba12f9dd15b42a6abfc85f5ac08bbfecc7816a6e3e4fb0efe2caabb043fb343b1ebecd -EBUILD gnushogi-1.4.1-r1.ebuild 1080 BLAKE2B 18244409cd6911632b09f573c3ec1ceaaa8c8525ac7980a363a364b4f5c743b9547d4ae63fd13665272d2eda445afdc108e5c36721d08303a96bcbd0e98c2d41 SHA512 7d47259f569ec4aa98830fbb19e4ab16e093ba052f988ef8b494cbdc743bf2ab0578e2f56f9c2fec3154a229facf2448afdb826b9e021cacf4a16bdcbb59a8ee +EBUILD gnushogi-1.4.1-r2.ebuild 955 BLAKE2B 327820fefd5bb6bf5b9bb2a080d249debbcfa44df3c83490d91c47ab15d86446e067fb3947a918de9aa15f7d64b3e7a5fe10b389af8ae5ec26919fad10049df9 SHA512 90654dbd416a229c2d7757afeee96b6029f0c5c48a69b53bb505ff96f0014238c87f22cb2e86be419dbf963ad12325ab746f5d60cb8874f673d758edb0bc765f MISC metadata.xml 339 BLAKE2B 19bfa841e05de54536d3f4794347f49e9b6e441613650a2aaa9059fa1f2fb3e92dd0f96eb85008514a6b72461f2fcaa4b43a45eaeca78b88d9f9ce6a6ad43254 SHA512 aec0424b176ab9cc6e93128a8001fd3ff4b13658d66e337dacf25fb0126097b5923120ab617e0c3ed151a2c47de1bc3766f3b662a94478172b2fbb0df304e961 diff --git a/games-board/gnushogi/files/gnushogi-1.4.1-makefile.patch b/games-board/gnushogi/files/gnushogi-1.4.1-makefile.patch new file mode 100644 index 000000000000..e6b046ba7dd3 --- /dev/null +++ b/games-board/gnushogi/files/gnushogi-1.4.1-makefile.patch @@ -0,0 +1,72 @@ +Fix for the build system. +Allows propagating errors upwards, replaces sometimes dubious +if well-meaning seds from ebuild +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,19 +44,19 @@ + # + + gnushogi_compile: +- -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME) ++ $(MAKE) -C $(GNUSHOGIDIR) $(PROGNAME) + + pat2inc: +- -cd $(GNUSHOGIDIR) && $(MAKE) pat2inc ++ $(MAKE) -C $(GNUSHOGIDIR) pat2inc + + sizetest: +- -cd $(GNUSHOGIDIR) && $(MAKE) sizetest ++ $(MAKE) -C $(GNUSHOGIDIR) sizetest + + xshogi_compile: +- -cd $(XSHOGIDIR) && $(MAKE) ++ $(MAKE) -C $(XSHOGIDIR) + +-bbk: ++bbk: gnushogi_compile pat2inc sizetest +- -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME).bbk ++ $(MAKE) -C $(GNUSHOGIDIR) $(PROGNAME).bbk + + + # +@@ -73,10 +73,10 @@ + install: gnushogi_install @XSHOGIINSTALL@ + + gnushogi_install: +- -cd $(GNUSHOGIDIR) && $(MAKE) install ++ $(MAKE) -C $(GNUSHOGIDIR) install + + xshogi_install: $(XSHOGIDIR)/xshogi +- -cd $(XSHOGIDIR) && $(MAKE) install ++ $(MAKE) -C $(XSHOGIDIR) install + + + +@@ -87,13 +87,13 @@ + clean: gnushogi_clean @XSHOGICLEAN@ doc_clean + + gnushogi_clean: +- cd $(GNUSHOGIDIR) && $(MAKE) clean ++ $(MAKE) -C $(GNUSHOGIDIR) clean + + xshogi_clean: +- cd $(XSHOGIDIR) && $(MAKE) clean ++ $(MAKE) -C $(XSHOGIDIR) clean + + doc_clean: +- cd $(BUILDROOT)/doc && $(MAKE) clean ++ $(MAKE) -C $(BUILDROOT)/doc clean + + + # +--- a/gnushogi/Makefile.in ++++ b//gnushogi/Makefile.in +@@ -51,7 +51,7 @@ + + # Where the language description, the book, and the + # persistent hashtable live. +-LIBDIR = $(prefix)/lib/$(PROGNAME) ++LIBDIR = @libdir@ + + # Where the man page goes. + MANDIR = $(prefix)/man/man6 diff --git a/games-board/gnushogi/files/gnushogi-1.4.1-xshogi-parser.patch b/games-board/gnushogi/files/gnushogi-1.4.1-xshogi-parser.patch new file mode 100644 index 000000000000..3b1f865bb5a7 --- /dev/null +++ b/games-board/gnushogi/files/gnushogi-1.4.1-xshogi-parser.patch @@ -0,0 +1,25 @@ +Fix compilation with modern C: add correct function declarations +https://bugs.gentoo.org/883893 +https://bugs.gentoo.org/930372 +https://bugs.gentoo.org/932280 +--- a/xshogi/parser.y ++++ b/xshogi/parser.y +@@ -70,7 +70,9 @@ + + enum { False, True }; + +-static void yyerror(); ++static void yyerror(char *); ++extern int yyparse (void); ++extern int yylex (void); + + static ShogiMove move_type; + static int from_x, from_y, to_x, to_y; +@@ -88,6 +90,7 @@ + extern void SendToProgram(char *message, FILE *fp); + extern void MakeMove(ShogiMove *move_type, int from_x, int from_y, + int to_x, int to_y); ++extern void DisplayMessage(char *message, int toRemotePlayer); + + %} + diff --git a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild b/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild deleted file mode 100644 index dbee91130b0c..000000000000 --- a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop - -DESCRIPTION="Japanese version of chess (commandline + X-Version)" -HOMEPAGE="https://www.gnu.org/software/gnushogi/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND=" - sys-libs/ncurses:0= - X? ( x11-libs/libXaw )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/bison-1.34 - app-alternatives/lex" - -PATCHES=( "${FILESDIR}"/${PN}-1.4.1-fno-common.patch ) - -src_prepare() { - default - - sed -i \ - -e '/^bbk:/s/$/ gnushogi_compile pat2inc sizetest/' \ - Makefile.in || die - sed -i \ - -e "/^LIBDIR/s:=.*:=\"$(get_libdir)\":" \ - gnushogi/Makefile.in || die -} - -src_configure() { - econf \ - $(use_with X x) \ - $(use_enable X xshogi) -} - -src_install() { - dobin gnushogi/gnushogi - doman doc/gnushogi.6 - doinfo doc/gnushogi.info - - if use X; then - dobin xshogi/xshogi - doman doc/xshogi.6 - make_desktop_entry xshogi XShogi - fi - - dolib.a gnushogi/gnushogi.bbk - dodoc README NEWS CONTRIB doc/gnushogi/*.html -} diff --git a/games-board/gnushogi/gnushogi-1.4.1-r2.ebuild b/games-board/gnushogi/gnushogi-1.4.1-r2.ebuild new file mode 100644 index 000000000000..4e53dacb0b22 --- /dev/null +++ b/games-board/gnushogi/gnushogi-1.4.1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +DESCRIPTION="Japanese version of chess (commandline + X-Version)" +HOMEPAGE="https://www.gnu.org/software/gnushogi/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND=" + sys-libs/ncurses:0= + X? ( x11-libs/libXaw )" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/bison-1.34 + app-alternatives/lex" + +PATCHES=( + "${FILESDIR}"/"${P}-fno-common.patch" + "${FILESDIR}"/"${P}-makefile.patch" + "${FILESDIR}"/"${P}-xshogi-parser.patch" +) + +src_configure() { + econf \ + $(use_with X x) \ + $(use_enable X xshogi) +} + +src_install() { + dobin gnushogi/gnushogi + doman doc/gnushogi.6 + doinfo doc/gnushogi.info + + if use X; then + dobin xshogi/xshogi + doman doc/xshogi.6 + make_desktop_entry xshogi XShogi + fi + + dolib.a gnushogi/gnushogi.bbk + dodoc README NEWS CONTRIB doc/gnushogi/*.html +} -- cgit v1.2.3