diff --git a/gpm-weak-wgetch.patch b/gpm-weak-wgetch.patch index 1999b34..c394956 100644 --- a/gpm-weak-wgetch.patch +++ b/gpm-weak-wgetch.patch @@ -20,7 +20,7 @@ Index: src/lib/libcurses.c =================================================================== --- src/lib/libcurses.c.orig 2012-10-26 23:21:38.000000000 +0200 +++ src/lib/libcurses.c 2013-04-16 12:26:55.834390599 +0200 -@@ -41,7 +41,12 @@ +@@ -41,7 +41,16 @@ #endif /* HAVE_NCURSES_CURSES_H */ #endif /* HAVE_NCURSES_H */ @@ -28,7 +28,11 @@ Index: src/lib/libcurses.c +/* If win != NULL, it must have been created by ncurses anyway. + Avoid circular library dependencies. */ +#pragma weak wgetch ++#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR > 5) ++#pragma weak _nc_stdscr ++#else +#pragma weak stdscr ++#endif + +#define GET(win) ((win && wgetch) ? wgetch(win) : getch()) diff --git a/gpm.changes b/gpm.changes index c18209f..a6619a2 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 9 06:54:11 UTC 2015 - werner@suse.de + +- Make libgpm able to handle ncurses ABI 6 + ------------------------------------------------------------------- Tue Apr 14 16:15:49 UTC 2015 - jengelh@inai.de diff --git a/gpm.spec b/gpm.spec index 18eb6ae..aa9b938 100644 --- a/gpm.spec +++ b/gpm.spec @@ -122,7 +122,7 @@ cp %{S:2} %{S:3} %{S:4} . #export SUSE_ASNEEDED=0 NOCONFIGURE=1 ./autogen.sh autoreconf -fi -CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM" \ +CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM -D_REENTRANT" \ %configure --disable-static \ --sysconfdir=/etc/gpm make CC="%{__cc}" %{?_smp_mflags}