| 1 |
commit: 54e123ebc9020f0ae7c93dd972ad970049ad38c7 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 26 22:07:19 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 26 22:07:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e123eb |
| 7 |
|
| 8 |
games-board/xgammon: Fix building against glibc 2.32 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/715452 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../xgammon/files/xgammon-0.98-glibc-2.32.patch | 19 +++++++++++++++ |
| 15 |
games-board/xgammon/xgammon-0.98-r1.ebuild | 27 +++++++++++++--------- |
| 16 |
2 files changed, 35 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..538f873b413 |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch |
| 23 |
@@ -0,0 +1,19 @@ |
| 24 |
+--- a/save.c |
| 25 |
++++ b/save.c |
| 26 |
+@@ -20,6 +20,7 @@ |
| 27 |
+ |
| 28 |
+ #include <stdio.h> |
| 29 |
+ #include <stdlib.h> |
| 30 |
++#include <string.h> |
| 31 |
+ #include <signal.h> |
| 32 |
+ #include <X11/Intrinsic.h> |
| 33 |
+ |
| 34 |
+@@ -142,7 +143,7 @@ |
| 35 |
+ fclose(save_file); |
| 36 |
+ |
| 37 |
+ #ifndef AIX |
| 38 |
+- fprintf (stderr, "xgammon: %s. Sorry and bye!\n", sys_siglist[n]); |
| 39 |
++ fprintf (stderr, "xgammon: %s. Sorry and bye!\n", strsignal(n)); |
| 40 |
+ #else |
| 41 |
+ fprintf (stderr, "xgammon: Caught signal %d. Sorry and bye!\n", n); |
| 42 |
+ #endif |
| 43 |
|
| 44 |
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 45 |
index d00b4f94fe5..cdbeed6484b 100644 |
| 46 |
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 47 |
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild |
| 48 |
@@ -1,8 +1,9 @@ |
| 49 |
-# Copyright 1999-2016 Gentoo Foundation |
| 50 |
+# Copyright 1999-2020 Gentoo Authors |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
|
| 53 |
-EAPI=6 |
| 54 |
-inherit toolchain-funcs eutils |
| 55 |
+EAPI=7 |
| 56 |
+ |
| 57 |
+inherit toolchain-funcs |
| 58 |
|
| 59 |
DESCRIPTION="very nice backgammon game for X" |
| 60 |
HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html" |
| 61 |
@@ -11,19 +12,23 @@ SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz" |
| 62 |
LICENSE="GPL-2" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~amd64 ~x86" |
| 65 |
-IUSE="" |
| 66 |
|
| 67 |
-RDEPEND="x11-libs/libXaw" |
| 68 |
-DEPEND="${RDEPEND} |
| 69 |
+RDEPEND=" |
| 70 |
+ x11-libs/libX11 |
| 71 |
+ x11-libs/libXaw |
| 72 |
+ x11-libs/libXt" |
| 73 |
+DEPEND="${RDEPEND}" |
| 74 |
+BDEPEND=" |
| 75 |
app-text/rman |
| 76 |
x11-misc/imake" |
| 77 |
|
| 78 |
-S=${WORKDIR}/${P}a |
| 79 |
+S="${WORKDIR}/${P}a" |
| 80 |
|
| 81 |
PATCHES=( |
| 82 |
- "${FILESDIR}/${P}-broken.patch" |
| 83 |
- "${FILESDIR}/${P}-config.patch" |
| 84 |
- "${FILESDIR}/gcc33.patch" |
| 85 |
+ "${FILESDIR}"/${P}-broken.patch |
| 86 |
+ "${FILESDIR}"/${P}-config.patch |
| 87 |
+ "${FILESDIR}"/gcc33.patch |
| 88 |
+ "${FILESDIR}"/${P}-glibc-2.32.patch |
| 89 |
) |
| 90 |
|
| 91 |
src_configure() { |
| 92 |
@@ -34,7 +39,7 @@ src_compile() { |
| 93 |
env PATH=".:${PATH}" emake \ |
| 94 |
EXTRA_LDOPTIONS="${LDFLAGS}" \ |
| 95 |
CDEBUGFLAGS="${CFLAGS}" \ |
| 96 |
- CC=$(tc-getCC) |
| 97 |
+ CC="$(tc-getCC)" |
| 98 |
} |
| 99 |
|
| 100 |
pkg_postinst() { |
Archives