rpm/gpm
SHA256
1
0
Fork 0
forked from pool/gpm
Code Pull Requests Activity

Accepting request 315782 from Base:System

Browse Source 
- Make libgpm able to handle ncurses ABI 6

OBS-URL: https://build.opensuse.org/request/show/315782
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpm?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2015-07-21 11:24:33 +00:00 committed by Git OBS Bridge
commit 64083058f4
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpm-weak-wgetch.patch
View File

@ -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.orig 2012-10-26 23:21:38.000000000 +0200
+++ src/lib/libcurses.c 2013-04-16 12:26:55.834390599 +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_CURSES_H */
#endif /* HAVE_NCURSES_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. +/* If win != NULL, it must have been created by ncurses anyway.
+ Avoid circular library dependencies. */ + Avoid circular library dependencies. */
+#pragma weak wgetch +#pragma weak wgetch
+#if defined(NCURSES_VERSION_MAJOR) && (NCURSES_VERSION_MAJOR > 5)
+#pragma weak _nc_stdscr
+#else
+#pragma weak stdscr +#pragma weak stdscr
+#endif
+ +
+#define GET(win) ((win && wgetch) ? wgetch(win) : getch()) +#define GET(win) ((win && wgetch) ? wgetch(win) : getch())

5
gpm.changes
View File

@ -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 Tue Apr 14 16:15:49 UTC 2015 - jengelh@inai.de

2
gpm.spec
View File

@ -122,7 +122,7 @@ cp %{S:2} %{S:3} %{S:4} .
#export SUSE_ASNEEDED=0 #export SUSE_ASNEEDED=0
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
autoreconf -fi autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM" \ CFLAGS="$RPM_OPT_FLAGS -DQUIET_LIBGPM -D_REENTRANT" \
%configure --disable-static \ %configure --disable-static \
--sysconfdir=/etc/gpm --sysconfdir=/etc/gpm
make CC="%{__cc}" %{?_smp_mflags} make CC="%{__cc}" %{?_smp_mflags}