package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch

   1 Don't assume ncursesw headers are in ../usr/include/ncursesw/..
   2 On a pure build/system without legacy ncurses that may not be true.
   3 Since we're using pkg-config let it provide the correct include path.
   4
   5 Status: contacted one of the maintainers on sf.net
   6 (ticket submission closed to the public, no other way of contacting them).
   7
   8 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
   9 [Bernd: Rebased for version 3.3.11]
  10
  11 diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
  12 --- procps-ng-3.3.10.orig/configure.ac  2015-04-07 19:21:55.729819952 -0300
  13 +++ procps-ng-3.3.10/configure.ac       2015-04-07 19:32:09.511706653 -0300
  14 @@ -138,7 +138,8 @@
  15    ])
  16    AM_CONDITIONAL(WITH_NCURSES, true)
  17    if test "$enable_watch8bit" = yes; then
  18 -    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
  19 +    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
  20 +    [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
  21        AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
  22                     [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
  23      ])
  24 @@ -148,6 +149,7 @@
  25  fi
  26  AC_SUBST([NCURSES_LIBS])
  27  AC_SUBST([WATCH_NCURSES_LIBS])
  28 +AC_SUBST([WATCH_NCURSES_CFLAGS])
  29
  30  AC_ARG_WITH([systemd],
  31    [AS_HELP_STRING([--with-systemd], [enable systemd support])],
  32 diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
  33 --- procps-ng-3.3.10.orig/Makefile.am   2015-04-07 19:21:55.655817434 -0300
  34 +++ procps-ng-3.3.10/Makefile.am        2015-04-07 19:32:54.516238136 -0300
  35 @@ -97,6 +97,7 @@
  36  slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
  37  watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
  38  watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
  39 +watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
  40  top_top_SOURCES = \
  41         top/top.h \
  42         top/top.c \
  43 diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
  44 --- procps-ng-3.3.10.orig/watch.c       2015-04-07 19:21:55.707819203 -0300
  45 +++ procps-ng-3.3.10/watch.c    2015-04-07 19:22:27.323895083 -0300
  46 @@ -51,10 +51,8 @@
  47  #ifdef WITH_WATCH8BIT
  48  # include <wchar.h>
  49  # include <wctype.h>
  50 -# include <ncursesw/ncurses.h>
  51 -#else
  52 -# include <ncurses.h>
  53  #endif /* WITH_WATCH8BIT */
  54 +#include <ncurses.h>
  55
  56  #ifdef FORCE_8BIT
  57  # undef isprint