* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/galaxis/files/, games-puzzle/galaxis/
@ 2023-10-09 20:39 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2023-10-09 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 8d0922f67eb64603d744c26f994027b4662325b4
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Oct 3 18:49:38 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 20:37:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0922f6
games-puzzle/galaxis: Fix call to undeclared library function bzero
Closes: https://bugs.gentoo.org/895986
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33170
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/galaxis-1.10-clang16-build-fix.patch | 11 ++++++
games-puzzle/galaxis/galaxis-1.10-r1.ebuild | 39 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/games-puzzle/galaxis/files/galaxis-1.10-clang16-build-fix.patch b/games-puzzle/galaxis/files/galaxis-1.10-clang16-build-fix.patch
new file mode 100644
index 000000000000..43d2862cd640
--- /dev/null
+++ b/games-puzzle/galaxis/files/galaxis-1.10-clang16-build-fix.patch
@@ -0,0 +1,11 @@
+Bug: https://bugs.gentoo.org/895986
+--- a/galaxis.c
++++ b/galaxis.c
+@@ -6,6 +6,7 @@
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+ #define _POSIX_SOURCE
++#define _GNU_SOURCE
+
+ #include <stdio.h>
+ #include <termios.h>
diff --git a/games-puzzle/galaxis/galaxis-1.10-r1.ebuild b/games-puzzle/galaxis/galaxis-1.10-r1.ebuild
new file mode 100644
index 000000000000..13029dc32afd
--- /dev/null
+++ b/games-puzzle/galaxis/galaxis-1.10-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
+HOMEPAGE="http://www.catb.org/~esr/galaxis/"
+SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-c2x.patch
+ "${FILESDIR}"/${P}-clang16-build-fix.patch
+)
+
+src_compile() {
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags ncurses || die) -DNDEBUG
+ append-libs $($(tc-getPKG_CONFIG) --libs ncurses || die)
+
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" TERMLIB="${LIBS}"
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.6
+ einstalldocs
+
+ doicon ${PN}.png
+ domenu ${PN}.desktop
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/galaxis/files/, games-puzzle/galaxis/
@ 2022-10-15 20:07 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-10-15 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 2ab1c4983677f889e70f70174082e33e76377897
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 19:06:46 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 20:06:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ab1c498
games-puzzle/galaxis: drop 1.8-r1
1.10 is almost identical, no reason to keep
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-puzzle/galaxis/Manifest | 1 -
.../galaxis/files/galaxis-1.8-gentoo.patch | 60 ----------------------
games-puzzle/galaxis/galaxis-1.8-r1.ebuild | 32 ------------
3 files changed, 93 deletions(-)
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index 7733580b0417..d6c1772790ea 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,2 +1 @@
DIST galaxis-1.10.tar.gz 11499 BLAKE2B d18dbedbe9533de3238a6f77dc05854454afe05ceb3ad9fdcdba1b80c3a07a904e1c16932e19ca3ef769121704823a28e62c87fa7e79acc1707226db35b1b67e SHA512 cedaac1923674fdae85dd09d6c38c6a15e0c027cf520ea6d92c15f0613adbc3a3b7e1e627d19e6d8b21c93fdb8acab8236893ce179dc4e898ba7da8f256dd341
-DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
diff --git a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
deleted file mode 100644
index abee05096288..000000000000
--- a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru galaxis-1.8.orig/Makefile galaxis-1.8/Makefile
---- galaxis-1.8.orig/Makefile 2010-10-19 09:48:58.000000000 -0400
-+++ galaxis-1.8/Makefile 2010-10-20 04:04:49.246650551 -0400
-@@ -3,9 +3,8 @@
- VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
-
- # Flags for use with the Linux ncurses package (recommended)
--CFLAGS = -g -DNDEBUG # -I/usr/local/include -L/usr/local/lib
-+CFLAGS += -DNDEBUG # -I/usr/local/include -L/usr/local/lib
- TERMLIB = -lncurses
--CC = gcc
-
- # Flags for use with stock curses
- #CFLAGS = -DNDEBUG
-@@ -13,7 +12,7 @@
- #CC = gcc
-
- galaxis: galaxis.c
-- $(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
-
- galaxis.6: galaxis.xml
- xmlto man galaxis.xml
-diff -ru galaxis-1.8.orig/galaxis.c galaxis-1.8/galaxis.c
---- galaxis-1.8.orig/galaxis.c 2010-10-13 06:13:31.000000000 -0400
-+++ galaxis-1.8/galaxis.c 2010-10-20 04:05:30.036888771 -0400
-@@ -8,6 +8,8 @@
- #define _POSIX_SOURCE
-
- #include <stdio.h>
-+#include <unistd.h>
-+#include <time.h>
- #include <termios.h>
- #include <curses.h>
- #include <signal.h>
-@@ -176,6 +177,7 @@
- (void) refresh();
- }
-
-+#if 0
- static void error(char *s)
- {
- (void) move(PROMPTLINE + 2, 0);
-@@ -186,6 +188,7 @@
- (void) beep();
- }
- }
-+#endif
-
- static int rnd(int n)
- {
-@@ -644,7 +647,7 @@
- }
- }
-
--main(argc, argv)
-+int main(argc, argv)
- int argc;
- char *argv[];
- {
diff --git a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
deleted file mode 100644
index d646f5a94a2b..000000000000
--- a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
-HOMEPAGE="http://www.catb.org/~esr/galaxis/"
-SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.3:0="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
- local PKGCONFIG="$(tc-getPKG_CONFIG)"
- emake TERMLIB="$(${PKGCONFIG} --libs ncurses)"
-}
-
-src_install() {
- dobin galaxis
- doman galaxis.6
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-09 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 20:39 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/galaxis/files/, games-puzzle/galaxis/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2022-10-15 20:07 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox