From 655286cee3e109b4105c0638474ab5c78ec0f215 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Tue, 21 Dec 2021 08:17:57 +0900 Subject: [PATCH] new package: lnav --- packages/lnav/Makefile.am.patch | 11 ++++++++ packages/lnav/build.sh | 20 +++++++++++++++ packages/lnav/src-ghc-filesystem.hpp.patch | 11 ++++++++ packages/lnav/src-grep_proc.cc.patch | 11 ++++++++ packages/lnav/src-line_buffer.cc.patch | 14 +++++++++++ packages/lnav/src-lnav.cc.patch | 29 ++++++++++++++++++++++ 6 files changed, 96 insertions(+) create mode 100644 packages/lnav/Makefile.am.patch create mode 100644 packages/lnav/build.sh create mode 100644 packages/lnav/src-ghc-filesystem.hpp.patch create mode 100644 packages/lnav/src-grep_proc.cc.patch create mode 100644 packages/lnav/src-line_buffer.cc.patch create mode 100644 packages/lnav/src-lnav.cc.patch diff --git a/packages/lnav/Makefile.am.patch b/packages/lnav/Makefile.am.patch new file mode 100644 index 000000000..5fc5cfd30 --- /dev/null +++ b/packages/lnav/Makefile.am.patch @@ -0,0 +1,11 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + + ACLOCAL_AMFLAGS = -I . + +-SUBDIRS = src test ++SUBDIRS = src + + noinst_SCRIPTS = TESTS_ENVIRONMENT + diff --git a/packages/lnav/build.sh b/packages/lnav/build.sh new file mode 100644 index 000000000..b5cf429d5 --- /dev/null +++ b/packages/lnav/build.sh @@ -0,0 +1,20 @@ +TERMUX_PKG_HOMEPAGE=https://lnav.org/ +TERMUX_PKG_DESCRIPTION="An advanced log file viewer for the small-scale" +TERMUX_PKG_LICENSE="BSD 2-Clause" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=0.10.1 +TERMUX_PKG_SRCURL=https://github.com/tstack/lnav/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=4af855a463493105ae0746fc0da80304a689b5394eb6abfeede4dd843127c8bc +TERMUX_PKG_DEPENDS="libandroid-glob, libarchive, libbz2, libcurl, ncurses, pcre, readline, sqlite, zlib" + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--disable-system-paths +ac_cv_header_execinfo_h=no +" + +termux_step_pre_configure() { + autoreconf -fi + + CPPFLAGS+=" -D_PATH_VARTMP=\\\"$TERMUX_PREFIX/tmp\\\"" + LDFLAGS+=" -landroid-glob" +} diff --git a/packages/lnav/src-ghc-filesystem.hpp.patch b/packages/lnav/src-ghc-filesystem.hpp.patch new file mode 100644 index 000000000..aae1c72cf --- /dev/null +++ b/packages/lnav/src-ghc-filesystem.hpp.patch @@ -0,0 +1,11 @@ +--- a/src/ghc/filesystem.hpp ++++ b/src/ghc/filesystem.hpp +@@ -4884,7 +4884,7 @@ + return path(temp_path); + } + } +- return path("/tmp"); ++ return path("@TERMUX_PREFIX@/tmp"); + #endif + } + diff --git a/packages/lnav/src-grep_proc.cc.patch b/packages/lnav/src-grep_proc.cc.patch new file mode 100644 index 000000000..fbd12d6c5 --- /dev/null +++ b/packages/lnav/src-grep_proc.cc.patch @@ -0,0 +1,11 @@ +--- a/src/grep_proc.cc ++++ b/src/grep_proc.cc +@@ -163,7 +163,7 @@ + if (setvbuf(stdout, outbuf, _IOFBF, BUFSIZ * 2) < 0) { + perror("setvbuf"); + } +- lnav_log_file = make_optional_from_nullable(fopen("/tmp/lnav.grep.err", "a")); ++ lnav_log_file = make_optional_from_nullable(fopen("@TERMUX_PREFIX@/tmp/lnav.grep.err", "a")); + line_value.reserve(BUFSIZ * 2); + while (!this->gp_queue.empty()) { + LineType start_line = this->gp_queue.front().first; diff --git a/packages/lnav/src-line_buffer.cc.patch b/packages/lnav/src-line_buffer.cc.patch new file mode 100644 index 000000000..17233377e --- /dev/null +++ b/packages/lnav/src-line_buffer.cc.patch @@ -0,0 +1,14 @@ +--- a/src/line_buffer.cc ++++ b/src/line_buffer.cc +@@ -104,9 +104,9 @@ + + lock_hack() + { +- char lockname[64]; ++ char lockname[] = "@TERMUX_PREFIX@/tmp/lnav.XXXXXXXXXXXXXXXXXXXX.lck"; + +- snprintf(lockname, sizeof(lockname), "/tmp/lnav.%d.lck", getpid()); ++ snprintf(lockname, sizeof(lockname), "@TERMUX_PREFIX@/tmp/lnav.%d.lck", getpid()); + this->lh_fd = open(lockname, O_CREAT | O_RDWR, 0600); + log_perror(fcntl(this->lh_fd, F_SETFD, FD_CLOEXEC)); + unlink(lockname); diff --git a/packages/lnav/src-lnav.cc.patch b/packages/lnav/src-lnav.cc.patch new file mode 100644 index 000000000..1b153d2da --- /dev/null +++ b/packages/lnav/src-lnav.cc.patch @@ -0,0 +1,29 @@ +--- a/src/lnav.cc ++++ b/src/lnav.cc +@@ -149,7 +149,7 @@ + #include "archive_manager.hh" + + #ifndef SYSCONFDIR +-#define SYSCONFDIR "/usr/etc" ++#define SYSCONFDIR "@TERMUX_PREFIX@/etc" + #endif + + using namespace std; +@@ -2098,7 +2098,7 @@ + #endif + + lnav_data.ld_debug_log_name = "/dev/null"; +- lnav_data.ld_config_paths.emplace_back("/etc/lnav"); ++ lnav_data.ld_config_paths.emplace_back("@TERMUX_PREFIX@/etc/lnav"); + lnav_data.ld_config_paths.emplace_back(SYSCONFDIR "/lnav"); + lnav_data.ld_config_paths.emplace_back(lnav::paths::dotlnav()); + while ((c = getopt(argc, argv, "hHarRCc:I:iuf:d:nNqtw:vVW")) != -1) { +@@ -2363,7 +2363,7 @@ + * so that it will try the default path. + */ + setenv("TERMINFO_DIRS", +- "/usr/share/terminfo:/lib/terminfo:/usr/share/lib/terminfo", ++ "@TERMUX_PREFIX@/share/terminfo:@TERMUX_PREFIX@/lib/terminfo:@TERMUX_PREFIX@/etc/terminfo", + 0); + + {