From a3c6ded562c1cf57ede6a42fe9b36e4c64826b7f Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 19 2021 06:12:17 +0000 Subject: Apply patch gpm-1.20.1-weak-wgetch.patch patch_name: gpm-1.20.1-weak-wgetch.patch present_in_specfile: true --- diff --git a/configure.ac.footer b/configure.ac.footer index 89a4cd9..a3a2b10 100644 --- a/configure.ac.footer +++ b/configure.ac.footer @@ -129,7 +129,7 @@ No|no|N|n) SHARED_LIBS=-lc ;; AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) else :; fi done - SHARED_LIBS="$LIBS $TERMLIBS -lc" + SHARED_LIBS="-lc" LIBS=$SAVELIBS ;; esac diff --git a/src/lib/libcurses.c b/src/lib/libcurses.c index e7ebf84..814cce5 100644 --- a/src/lib/libcurses.c +++ b/src/lib/libcurses.c @@ -41,7 +41,12 @@ #endif /* HAVE_NCURSES_CURSES_H */ #endif /* HAVE_NCURSES_H */ -#define GET(win) ((win) ? wgetch(win) : getch()) +/* If win != NULL, it must have been created by ncurses anyway. + Avoid circular library dependencies. */ +#pragma weak wgetch +#pragma weak stdscr + +#define GET(win) ((win && wgetch) ? wgetch(win) : getch()) int Gpm_Wgetch(WINDOW *win) {