Control: severity -1 serious
Control: tags -1 + patch
Hi,
See attached (git-am formatted) patch. Commit message should hopefully
be enough description (or feel free to ask).
Regards,
Andreas Henriksson
>From bdc22d5044c67f05c491853ca6cac8703cb56068 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas.henriks...@endian.se>
Date: Mon, 18 Sep 2017 17:25:39 +0200
Subject: [PATCH] Re-add Gpm_Wgetch symbol and fix 050_dont_link_libcurses
patch
This partially reverts commit b1fe06b841ccb22707245ba83d2146abf7e0dbe9
"Make it compile again independently of libncurses5-dev being installed"
This symbol should be available no matter what, since it has been
before and is unconditionally available in lib/libcurses.c.
Also fix up debian/patches/050_dont_link_libcurses to unconditionally
include libcurses.o in the build (as obviously intended as the
source file is patched to build without (n)curses).
Closes: #873568
---
debian/libgpm2.symbols | 1 +
debian/patches/050_dont_link_libcurses | 25 +++++++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/debian/libgpm2.symbols b/debian/libgpm2.symbols
index 22a69f1..f877d10 100644
--- a/debian/libgpm2.symbols
+++ b/debian/libgpm2.symbols
@@ -15,6 +15,7 @@ libgpm.so.2 libgpm2 #MINVER#
Gpm_RaiseRoi@Base 1.20.7
Gpm_Repeat@Base 1.20.7
Gpm_UseRoi@Base 1.20.7
+ Gpm_Wgetch@Base 1.20.7
Gpm_cnt_digits@Base 1.20.7
Gpm_get_console@Base 1.20.7
Gpm_x_high_y@Base 1.20.7
diff --git a/debian/patches/050_dont_link_libcurses b/debian/patches/050_dont_link_libcurses
index 76487a6..47a05a7 100644
--- a/debian/patches/050_dont_link_libcurses
+++ b/debian/patches/050_dont_link_libcurses
@@ -11,16 +11,25 @@ Description: Don't link against libcurses
AC_CHECK_HEADERS(sys/sysmacros.h linux/major.h linux/tty.h)
# Required headers
-@@ -90,7 +90,7 @@
+@@ -86,16 +86,7 @@
+ AC_ARG_WITH(curses,
+ [ --without-curses disable curses support even if curses found])
- case $with_curses in
- No|no|N|n) : ;;
+-CURSES_OBJS=
+-
+-case $with_curses in
+-No|no|N|n) : ;;
- *) if test ${ac_cv_header_ncurses_h} = yes ||
-+ *) if : || test ${ac_cv_header_ncurses_h} = yes ||
- test ${ac_cv_header_ncurses_curses_h} = yes ||
- test ${ac_cv_header_curses_h} = yes ; then
- CURSES_OBJS=lib/libcurses.o ; fi ;;
-@@ -112,6 +112,7 @@
+- test ${ac_cv_header_ncurses_curses_h} = yes ||
+- test ${ac_cv_header_curses_h} = yes ; then
+- CURSES_OBJS=lib/libcurses.o ; fi ;;
+-esac
+-
++CURSES_OBJS=lib/libcurses.o
+
+ ITZ_CHECK_TYPE(__u32,linux/types.h)
+ if test ${itz_cv_type___u32} = yes || test ${ac_cv_type___u32} = yes ; then
+@@ -112,6 +103,7 @@
AC_CHECK_FUNCS(vsyslog syslog)
AC_FUNC_ALLOCA
--
2.11.0
