multitail: Bump to 7.0.0

This commit is contained in:
Tee KOBAYASHI 2022-11-13 01:45:50 +09:00 committed by xtkoba
parent dbffa84881
commit a9d4ff6a5c
4 changed files with 64 additions and 5 deletions

View File

@ -0,0 +1,31 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@
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}")
@@ -142,16 +142,16 @@
# install the bin
install(TARGETS multitail DESTINATION bin)
# install the config file
-install(FILES multitail.conf DESTINATION etc RENAME multitail.conf.new)
+install(FILES multitail.conf DESTINATION etc)
# install the manual files
install(FILES multitail.1 DESTINATION share/man/man1)
# install doc files
install(FILES manual.html DESTINATION share/doc/multitail-${VERSION})
-install(FILES license.txt DESTINATION share/doc/multitail-${VERSION})
+install(FILES LICENSE DESTINATION share/doc/multitail-${VERSION})
install(FILES readme.txt DESTINATION share/doc/multitail-${VERSION})
install(FILES thanks.txt DESTINATION share/doc/multitail-${VERSION})
# cp conversion-scripts/* etc/multitail/
-install(DIRECTORY conversion-scripts DESTINATION ect/multitail)
+install(DIRECTORY conversion-scripts DESTINATION etc/multitail)
if(USE_CPPCHECK)

View File

@ -1,14 +1,20 @@
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="GPL-2.0"
TERMUX_PKG_LICENSE="Apache-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=6.5.0
TERMUX_PKG_SRCURL=https://fossies.org/linux/privat/multitail-${TERMUX_PKG_VERSION}.tgz
TERMUX_PKG_SHA256=b29d5e77dfc663c7500f78da67de5d82d35d9417a4741a89a18ce9ee7bdba9ed
TERMUX_PKG_DEPENDS="ncurses, ncurses-ui-libs, libandroid-glob"
TERMUX_PKG_VERSION=7.0.0
TERMUX_PKG_SRCURL=https://github.com/folkertvanheusden/multitail/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=23f85f417a003544be38d0367c1eab09ef90c13d007b36482cf3f8a71f9c8fc5
TERMUX_PKG_DEPENDS="libandroid-glob, ncurses, ncurses-ui-libs"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_CONFFILES="etc/multitail.conf"
termux_step_pre_configure() {
echo "Applying version.diff"
sed "s|@VERSION@|${TERMUX_PKG_VERSION#*:}|g" \
$TERMUX_PKG_BUILDER_DIR/version.diff \
| patch --silent -p1
CFLAGS+=" -DNCURSES_WIDECHAR"
LDFLAGS+=" -landroid-glob"
}

View File

@ -0,0 +1,11 @@
--- a/clipboard.c
+++ b/clipboard.c
@@ -16,7 +16,7 @@
#include "ui.h"
#include "clipboard.h"
-char *clipboard = "/usr/bin/" CLIPBOARD_NAME;
+char *clipboard = "@TERMUX_PREFIX@/bin/" CLIPBOARD_NAME;
void send_to_clipboard_binary(char *what)
{

View File

@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
#=====================
project(multitail LANGUAGES C)
-set(VERSION VERSION=6.4.3)
+set(VERSION @VERSION@)
#=====================
# usage: