Attachment 228327 Details for Bug 258847 – Patch to 0.10.0

[patch] Patch to 0.10.0

patch-sysutils-lnav (text/plain), 2.79 KB, created by Thomas Hurst on 2021-10-01 15:34:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2021-10-01 15:34:36 UTC

Size: 2.79 KB

patch

obsolete

>diff --git sysutils/lnav/Makefile sysutils/lnav/Makefile
>index e06fb260aa31..ef0822af6cca 100644
>--- sysutils/lnav/Makefile
>+++ sysutils/lnav/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Thomas Hurst <tom@hur.st>
> 
> PORTNAME=	lnav
>-PORTVERSION=	0.9.0
>+PORTVERSION=	0.10.0
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/tstack/${PORTNAME}/releases/download/v${PORTVERSION}/
> 
>@@ -10,6 +10,8 @@ COMMENT=	Terminal based log file navigator
> 
> LICENSE=	BSD2CLAUSE
> 
>+BROKEN_i386=	see https://github.com/tstack/lnav/issues/781
>+
> LIB_DEPENDS=	libpcrecpp.so:devel/pcre
> 
> USES=		autoreconf compiler:c++14-lang gmake ncurses readline sqlite tar:bz2
>diff --git sysutils/lnav/distinfo sysutils/lnav/distinfo
>index ea3eae7852ad..7222e80d1883 100644
>--- sysutils/lnav/distinfo
>+++ sysutils/lnav/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1601099244
>-SHA256 (lnav-0.9.0.tar.bz2) = 9ba2c9c745d1479ec0eed0201cba7fdb223fc0489c50b20a54af3d2a1b2ae550
>-SIZE (lnav-0.9.0.tar.bz2) = 877288
>+TIMESTAMP = 1633033418
>+SHA256 (lnav-0.10.0.tar.bz2) = 91b17a2d655283bb081e1f236afe2171cef58695e75c6ef7a89d55bfab0493be
>+SIZE (lnav-0.10.0.tar.bz2) = 1365009
>diff --git sysutils/lnav/files/patch-src_logfile.cc sysutils/lnav/files/patch-src_logfile.cc
>deleted file mode 100644
>index fbad7c3c686e..000000000000
>--- sysutils/lnav/files/patch-src_logfile.cc
>+++ /dev/null
>@@ -1,37 +0,0 @@
>---- src/logfile.cc.orig	2020-09-09 16:17:12 UTC
>-+++ src/logfile.cc
>-@@ -323,10 +323,13 @@ logfile::rebuild_result_t logfile::rebuild_index()
>- 
>-             this->lf_line_buffer.clear();
>-             if (!this->lf_index.empty()) {
>--                off_t check_line_off = this->lf_index.back().get_offset();
>-+                auto last_line = this->lf_index.end();
>-+                --last_line;
>-+                off_t check_line_off = last_line->get_offset();
>-+                auto last_length = ssize_t(this->line_length(last_line, false));
>- 
>-                 auto read_result = this->lf_line_buffer.read_range({
>--                    check_line_off, this->lf_index_size - check_line_off
>-+                    check_line_off, last_length
>-                 });
>- 
>-                 if (read_result.isErr()) {
>-@@ -553,7 +556,7 @@ filesystem::path logfile::get_path() const
>- 
>- size_t logfile::line_length(logfile::iterator ll, bool include_continues)
>- {
>--    iterator next_line = ll;
>-+    auto next_line = ll;
>-     size_t retval;
>- 
>-     if (!include_continues && this->lf_next_line_cache) {
>-@@ -570,6 +573,9 @@ size_t logfile::line_length(logfile::iterator ll, bool
>- 
>-     if (next_line == this->end()) {
>-         retval = this->lf_index_size - ll->get_offset();
>-+        if (retval > line_buffer::MAX_LINE_BUFFER_SIZE) {
>-+            retval = line_buffer::MAX_LINE_BUFFER_SIZE;
>-+        }
>-         if (retval > 0 && !this->lf_partial_line) {
>-             retval -= 1;
>-         }

Actions: View | Diff

Attachments on bug 258847: 228327 | 229113