diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /sys-process/htop/files | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'sys-process/htop/files')
-rw-r--r-- | sys-process/htop/files/htop-2.0.2-tinfo.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/sys-process/htop/files/htop-2.0.2-tinfo.patch b/sys-process/htop/files/htop-2.0.2-tinfo.patch deleted file mode 100644 index 4a536c0251a1..000000000000 --- a/sys-process/htop/files/htop-2.0.2-tinfo.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- htop-2.0.2/configure.ac -+++ htop-2.0.2/configure.ac -@@ -185,32 +185,36 @@ - - AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") - if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], -- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], -- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -- missing_libraries="$missing_libraries libncursesw" -- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -- )))))) -+ PKG_CHECK_MODULES([NCURSES], [ncursesw],[ -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], -+ HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], -+ HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -+ missing_libraries="$missing_libraries libncursesw" -+ AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) -+ )))))) - -- AC_CHECK_HEADERS([ncursesw/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ AC_CHECK_HEADERS([ncursesw/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ ]) - else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], -- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], -- missing_libraries="$missing_libraries libncurses" -- )))) -+ PKG_CHECK_MODULES([NCURSES], [ncurses],[ -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], -+ HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], -+ missing_libraries="$missing_libraries libncurses" -+ )))) - -- AC_CHECK_HEADERS([curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/curses.h],[:], -- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ AC_CHECK_HEADERS([curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/curses.h],[:], -+ [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], -+ [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) -+ ]) - fi - - if test "$my_htop_platform" = "freebsd"; then ---- htop-2.0.2/Makefile.am -+++ htop-2.0.2/Makefile.am -@@ -85,6 +85,8 @@ - BUILT_SOURCES = $(myhtopheaders) $(myhtopplatheaders) - htop_SOURCES = $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources) config.h - -+htop_LDADD = $(NCURSES_LIBS) -+ - target: - echo $(htop_SOURCES) - |