Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change source for utilities/watch, gain UTF-8
- Loading branch information
Showing
8 changed files
with
218 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
components/sysutils/watch/patches/01-disable-utilities.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| Disable all utilities but watch. | ||
|
|
||
| --- procps-ng-3.3.15/Makefile.am.~1~ 2018-05-19 23:35:23.067591570 +0000 | ||
| +++ procps-ng-3.3.15/Makefile.am 2019-02-16 15:13:07.738914886 +0000 | ||
| @@ -30,24 +30,13 @@ transform = | ||
|
|
||
| if !CYGWIN | ||
| transform += s/pscommand/ps/; $(program_transform_name) | ||
| -sbin_PROGRAMS = \ | ||
| - sysctl | ||
| +sbin_PROGRAMS = | ||
| else | ||
| transform += s/pscommand/procps/; $(program_transform_name) | ||
| endif | ||
|
|
||
| if !CYGWIN | ||
| -bin_PROGRAMS = \ | ||
| - ps/pscommand \ | ||
| - free \ | ||
| - pgrep \ | ||
| - pkill \ | ||
| - pmap \ | ||
| - pwdx \ | ||
| - tload \ | ||
| - uptime \ | ||
| - vmstat \ | ||
| - w | ||
| +bin_PROGRAMS = | ||
| else | ||
| usrbin_exec_PROGRAMS += \ | ||
| ps/pscommand \ | ||
| @@ -63,15 +52,7 @@ endif | ||
| lib_LTLIBRARIES = \ | ||
| proc/libprocps.la | ||
|
|
||
| -dist_man_MANS = \ | ||
| - free.1 \ | ||
| - pgrep.1 \ | ||
| - pkill.1 \ | ||
| - pmap.1 \ | ||
| - uptime.1 \ | ||
| - vmstat.8 \ | ||
| - w.1 \ | ||
| - ps/procps.1 | ||
| +dist_man_MANS = | ||
|
|
||
| if !CYGWIN | ||
| dist_man_MANS += \ | ||
| @@ -133,9 +114,7 @@ endif | ||
| if WITH_NCURSES | ||
| if !CYGWIN | ||
| bin_PROGRAMS += \ | ||
| - slabtop \ | ||
| - watch \ | ||
| - top/top | ||
| + watch | ||
| else | ||
| usrbin_exec_PROGRAMS += \ | ||
| watch \ | ||
| @@ -143,8 +122,7 @@ usrbin_exec_PROGRAMS += \ | ||
| endif | ||
|
|
||
| dist_man_MANS += \ | ||
| - watch.1 \ | ||
| - top/top.1 | ||
| + watch.1 | ||
| watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c | ||
| watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS) | ||
| watch_CFLAGS = @WATCH_NCURSES_CFLAGS@ | ||
| @@ -197,8 +175,7 @@ pwdx_SOURCES = pwdx.c lib/fileutils.c | ||
| pwdx_LDADD= $(CYGWINFLAGS) | ||
| sysctl_SOURCES = \ | ||
| sysctl.c \ | ||
| - lib/fileutils.c \ | ||
| - procio.c | ||
| + lib/fileutils.c | ||
| endif | ||
| tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c | ||
| uptime_SOURCES = uptime.c lib/fileutils.c | ||
| @@ -224,8 +201,7 @@ endif | ||
|
|
||
| proc_libprocps_la_LDFLAGS = \ | ||
| -version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \ | ||
| - -no-undefined \ | ||
| - -Wl,--version-script=$(top_srcdir)/proc/libprocps.sym | ||
| + -no-undefined | ||
|
|
||
| proc_libprocps_la_SOURCES = \ | ||
| proc/alloc.c \ | ||
| @@ -246,7 +222,6 @@ proc_libprocps_la_SOURCES = \ | ||
| proc/sig.h \ | ||
| proc/slab.c \ | ||
| proc/slab.h \ | ||
| - proc/sysinfo.c \ | ||
| proc/sysinfo.h \ | ||
| proc/version.c \ | ||
| proc/version.h \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- procps-ng-3.3.15/watch.c 2018-05-17 13:23:41.674211668 +0000 | ||
| +++ procps-ng-3.3.15/watch.c.new 2019-02-16 13:33:09.738837084 +0000 | ||
| @@ -53,7 +53,7 @@ | ||
| # include <wchar.h> | ||
| # include <wctype.h> | ||
| #endif /* WITH_WATCH8BIT */ | ||
| -#include <ncurses.h> | ||
| +#include <ncurses/ncurses.h> | ||
|
|
||
| #ifdef FORCE_8BIT | ||
| # undef isprint |
11 changes: 11 additions & 0 deletions
11
components/sysutils/watch/patches/03-fix-config.h-inclusion.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- procps-ng-3.3.15/include/nls.h 2016-11-23 21:51:08.822649334 +0000 | ||
| +++ procps-ng-3.3.15/include/nls.h.new 2019-02-16 13:31:20.987876156 +0000 | ||
| @@ -6,7 +6,7 @@ | ||
| #define PROCPS_NG_NLS_H | ||
|
|
||
| /* programs issuing textdomain() need PACKAGE string */ | ||
| -#include "../config.h" | ||
| +#include "config.h" | ||
|
|
||
| /* programs issuing bindtextdomain() also need LOCALEDIR string */ | ||
| #ifndef LOCALEDIR |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters