aboutsummaryrefslogtreecommitdiff
path: root/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch
blob: c25da3b278fb9fd334d371f72b9f34ca5c606143 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
Don't assume ncursesw headers are in ../usr/include/ncursesw/..
On a pure build/system without legacy ncurses that may not be true.
Since we're using pkg-config let it provide the correct include path.

Status: contacted one of the maintainers on sf.net
(ticket submission closed to the public, no other way of contacting them).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Bernd: Rebased for version 3.3.11]

diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
--- procps-ng-3.3.10.orig/configure.ac	2015-04-07 19:21:55.729819952 -0300
+++ procps-ng-3.3.10/configure.ac	2015-04-07 19:32:09.511706653 -0300
@@ -138,7 +138,8 @@
   ])
   AM_CONDITIONAL(WITH_NCURSES, true)
   if test "$enable_watch8bit" = yes; then
-    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
+    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
+    [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
       AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
                    [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
     ])
@@ -148,6 +149,7 @@
 fi
 AC_SUBST([NCURSES_LIBS])
 AC_SUBST([WATCH_NCURSES_LIBS])
+AC_SUBST([WATCH_NCURSES_CFLAGS])
 
 AC_ARG_WITH([systemd],
   [AS_HELP_STRING([--with-systemd], [enable systemd support])],
diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
--- procps-ng-3.3.10.orig/Makefile.am	2015-04-07 19:21:55.655817434 -0300
+++ procps-ng-3.3.10/Makefile.am	2015-04-07 19:32:54.516238136 -0300
@@ -97,6 +97,7 @@
 slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
 watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
 watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
 top_top_SOURCES = \
 	top/top.h \
 	top/top.c \
diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
--- procps-ng-3.3.10.orig/watch.c	2015-04-07 19:21:55.707819203 -0300
+++ procps-ng-3.3.10/watch.c	2015-04-07 19:22:27.323895083 -0300
@@ -51,10 +51,8 @@
 #ifdef WITH_WATCH8BIT
 # include <wchar.h>
 # include <wctype.h>
-# include <ncursesw/ncurses.h>
-#else
-# include <ncurses.h>
 #endif	/* WITH_WATCH8BIT */
+#include <ncurses.h>
 
 #ifdef FORCE_8BIT
 # undef isprint