diff --git a/packages/multitail/CMakeLists.txt.patch b/packages/multitail/CMakeLists.txt.patch index c8f67fcdfc4b01..83660e10fa85ad 100644 --- a/packages/multitail/CMakeLists.txt.patch +++ b/packages/multitail/CMakeLists.txt.patch @@ -1,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -49,7 +49,7 @@ +@@ -139,7 +139,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + message(FATAL_ERROR "/usr/local/include/gnu/regex.h missing, did you install libgnuregex?") + endif() + else () +- add_definitions(-DCONFIG_FILE=\"/etc/multitail.conf\") ++ add_definitions(-DCONFIG_FILE=\"@TERMUX_PREFIX@/etc/multitail.conf\") + endif() - - add_definitions(-D_FORTIFY_SOURCE=2) --add_definitions(-DCONFIG_FILE=\"/etc/multitail.conf\") -+add_definitions(-DCONFIG_FILE=\"@TERMUX_PREFIX@/etc/multitail.conf\") - add_definitions(-DVERSION=\"${VERSION}\") - add_definitions(-D${CMAKE_C_PLATFORM_ID}) - message(STATUS "CMAKE_C_PLATFORM_ID=${CMAKE_C_PLATFORM_ID}") + # Set ``CURSES_NEED_NCURSES`` to ``TRUE`` before the @@ -142,7 +142,7 @@ # install the bin install(TARGETS multitail DESTINATION bin) diff --git a/packages/multitail/build.sh b/packages/multitail/build.sh index 3c6ff109efa40d..c583f02cfe0530 100644 --- a/packages/multitail/build.sh +++ b/packages/multitail/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.vanheusden.com/multitail/ TERMUX_PKG_DESCRIPTION="Tool to monitor logfiles and command output in multiple windows in a terminal, colorize, filter and merge" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="7.1.3" +TERMUX_PKG_VERSION="7.1.4" TERMUX_PKG_SRCURL=https://github.com/folkertvanheusden/multitail/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f55732781f7319e137a3ff642a347af1aaf3ed5265ed12526bdd0666d708d805 +TERMUX_PKG_SHA256=96b781a9c22f3518fc25c4f3ce3833ec5069158b2a743a30f7586cd063824704 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_DEPENDS="libandroid-glob, ncurses, ncurses-ui-libs" diff --git a/packages/multitail/mt.c.patch b/packages/multitail/mt.c.patch index abcee2cd0b2474..40d67e81cb6bef 100644 --- a/packages/multitail/mt.c.patch +++ b/packages/multitail/mt.c.patch @@ -1,12 +1,11 @@ -diff -u -r ../multitail-6.2.1/mt.c ./mt.c ---- ../multitail-6.2.1/mt.c 2014-02-16 15:06:54.000000000 +0100 -+++ ./mt.c 2014-06-30 16:43:12.000000000 +0200 -@@ -23,7 +23,7 @@ - #include - #include - #ifndef AIX +--- a/mt.c ++++ b/mt.c +@@ -27,7 +27,7 @@ + #if defined(__FreeBSD__) + #include + #else -#include /* needed on Solaris 8 */ +#include /* needed on Solaris 8 */ + #endif #endif #include - #include diff --git a/packages/multitail/term.c.patch b/packages/multitail/term.c.patch index 013f6458e31bb3..b16e88efba8a87 100644 --- a/packages/multitail/term.c.patch +++ b/packages/multitail/term.c.patch @@ -1,12 +1,11 @@ -diff -u -r ../multitail-6.2.1/term.c ./term.c ---- ../multitail-6.2.1/term.c 2014-02-16 15:06:54.000000000 +0100 -+++ ./term.c 2014-06-30 16:43:51.000000000 +0200 -@@ -16,7 +16,7 @@ - #include - #endif - #ifndef AIX +--- a/term.c ++++ b/term.c +@@ -19,7 +19,7 @@ + #if defined(__FreeBSD__) + #include + #else -#include /* needed on Solaris 8 */ +#include /* needed on Solaris 8 */ + #endif #endif #include - #include