summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-01-09 16:16:01 +0000
committerSam James <sam@gentoo.org>2021-01-09 16:16:04 +0000
commit4398db24f18f4f220edf10f546edbe2e9e9e8ff0 (patch)
treeae18906cec3341dc6bbf4b7358f530505722fec2 /games-mud/powwow/files
parentprofiles/targets/desktop: remove obsolete entry for libpcap (diff)
downloadgentoo-4398db24f18f4f220edf10f546edbe2e9e9e8ff0.tar.gz
gentoo-4398db24f18f4f220edf10f546edbe2e9e9e8ff0.tar.bz2
gentoo-4398db24f18f4f220edf10f546edbe2e9e9e8ff0.zip
games-mud/powwow: bump to 1.22.22
Closes: https://bugs.gentoo.org/716584 Closes: https://bugs.gentoo.org/690452 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-mud/powwow/files')
-rw-r--r--games-mud/powwow/files/powwow-1.2.22-linking.patch39
-rw-r--r--games-mud/powwow/files/powwow-1.2.22-musl-termios.patch24
2 files changed, 63 insertions, 0 deletions
diff --git a/games-mud/powwow/files/powwow-1.2.22-linking.patch b/games-mud/powwow/files/powwow-1.2.22-linking.patch
new file mode 100644
index 00000000000..e9dc39177bf
--- /dev/null
+++ b/games-mud/powwow/files/powwow-1.2.22-linking.patch
@@ -0,0 +1,39 @@
+* Fix ncurses/tinfo linking: https://bugs.gentoo.org/690452
+
+* Fix underlinking (refresh of old patch by hasufell@):
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Feb 18 02:25:38 UTC 2013
+Subject: fix underlinking
+https://bugs.gentoo.org/show_bug.cgi?id=454928
+--- a/configure.ac
++++ b/configure.ac
+@@ -93,10 +93,7 @@ AC_PROG_LN_S
+ AC_CHECK_FUNC(lrand48,,AC_DEFINE(USE_RANDOM))
+
+ if test "x${enable_vt100}" != "xyes"; then
+- AC_SEARCH_LIBS(initscr,[ncurses curses], [], [
+- if test "x${enable_vt100}" = "xno" ; then
+- AC_MSG_ERROR([*** curses libraries not found])
+- fi])
++ PKG_CHECK_MODULES([ncurses], [ncurses])
+ fi
+
+ # Dynamic modules
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,8 @@ bin_PROGRAMS = powwow powwow-muc powwow-movieplay
+ powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \
+ utils.c main.c tcp.c list.c map.c tty.c \
+ ptr.c
+-powwow_LDFLAGS = @dl_ldflags@
++powwow_LDADD = @dl_ldflags@ @ncurses_LIBS@
++powwow_muc_LDADD = @ncurses_LIBS@
+ powwowdir = $(pkgincludedir)
+ powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \
+ utils.h main.h tcp.h list.h map.h tty.h \
+@@ -26,4 +26,4 @@ catrw_SOURCES = catrw.c
+ EXTRA_DIST = plugtest.c
+
+ plugtest.so: plugtest.c
+- gcc -shared -o plugtest.so plugtest.c
++ $(CC) $(CFLAGS) -shared -o plugtest.so plugtest.c
diff --git a/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch
new file mode 100644
index 00000000000..4cab065d27b
--- /dev/null
+++ b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch
@@ -0,0 +1,24 @@
+diff --git a/src/follow.c b/src/follow.c
+index 09456c9..b3363e8 100644
+--- a/src/follow.c
++++ b/src/follow.c
+@@ -26,7 +26,6 @@
+ * many warnings, but seems to be necessary at times. works anyway.
+ */
+ # include <termios.h>
+-# include <termio.h>
+ # endif
+ /* #else USE_SGTTY */
+ #endif
+diff --git a/src/tty.c b/src/tty.c
+index 104c780..0d76554 100644
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -44,7 +44,6 @@
+ * many warnings, but seems to be necessary at times. works anyway.
+ */
+ # include <termios.h>
+-# include <termio.h>
+ # endif
+ /* #else USE_SGTTY */
+ #endif