* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/files/
@ 2021-09-17 2:34 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-09-17 2:34 UTC (permalink / raw
To: gentoo-commits
commit: f17ed8064ed6dd14f538007df9ff93b51dc0543b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 02:33:29 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 02:33:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17ed806
app-admin/lnav: tidy patches
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../lnav/files/lnav-0.10.0-disable-remote-tests.patch | 4 ++--
app-admin/lnav/files/lnav-0.10.0-disable-tests.patch | 4 ++--
app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch | 9 ---------
app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch | 9 ---------
app-admin/lnav/files/lnav-0.9.0-bug786456.patch | 10 ----------
app-admin/lnav/files/lnav-0.9.0-bug792582.patch | 15 ---------------
6 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
index 2177cc1adf3..5e8c80fb90a 100644
--- a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
@@ -1,5 +1,5 @@
---- lnav-0.10.0/test/test_remote.sh
-+++ lnav-0.10.0/test/test_remote.sh
+--- a/test/test_remote.sh
++++ b/test/test_remote.sh
@@ -76,38 +76,38 @@
error: unable to open file: nonexistent-host: -- failed to ssh to host: ...
EOF
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
index 48a7e9b8cd4..c7a49d45f1d 100644
--- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
@@ -3,8 +3,8 @@
# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911
# logfile: Flaky. Fails some times and not others. i.e. Race condition
# tui: Can hang the build
---- lnav-0.10.0/test/Makefile.am
-+++ lnav-0.10.0/test/Makefile.am
+--- a/test/Makefile.am
++++ b/test/Makefile.am
@@ -355,14 +355,14 @@
test_cli.sh \
test_cmds.sh \
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
index 47aef6d593d..d2f26a436ff 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:23:56 -0800
Subject: [PATCH] [tests] fix test to make it insensitive to the current date
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/test_sql.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_sql.sh b/test/test_sql.sh
-index c7480ecc..bbb98dce 100644
--- a/test/test_sql.sh
+++ b/test/test_sql.sh
@@ -1012,13 +1012,13 @@ EOF
@@ -31,6 +25,3 @@ index c7480ecc..bbb98dce 100644
EOF
---
-2.31.1
-
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
index 58aa7264a0d..83380fae4d8 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:26:57 -0800
Subject: [PATCH] [tests] update another date-sensitive test
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/test_sql.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_sql.sh b/test/test_sql.sh
-index bbb98dce..22941c2a 100644
--- a/test/test_sql.sh
+++ b/test/test_sql.sh
@@ -1023,11 +1023,11 @@ EOF
@@ -27,6 +21,3 @@ index bbb98dce..22941c2a 100644
EOF
# Create a dummy database for the next couple of tests to consume.
---
-2.31.1
-
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
index e77dd17854e..0d3ab64282c 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch
@@ -7,16 +7,6 @@ Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile
Fixes #864
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++---
- src/base/result.h | 1 +
- src/logfile.hh | 13 +
- src/optional.hpp | 45 +++-
- src/pcrepp/pcrepp.hh | 1 +
- 5 files changed, 482 insertions(+), 40 deletions(-)
-
-diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
-index 2c18e49c..9413da62 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -1,5 +1,5 @@
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
index 9059712242a..125f86b57a6 100644
--- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
+++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
@@ -7,14 +7,6 @@ Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible
Fixes #806
Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- src/highlighter.cc | 4 +++-
- src/logfile_sub_source.cc | 17 ++++++++++-------
- src/view_curses.cc | 9 ++++++---
- 3 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/highlighter.cc b/src/highlighter.cc
-index 24aafebd..110ca03f 100644
--- a/src/highlighter.cc
+++ b/src/highlighter.cc
@@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const
@@ -28,8 +20,6 @@ index 24aafebd..110ca03f 100644
}
sa.emplace_back(lr, &view_curses::VC_STYLE, attrs);
-diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc
-index 14e87002..dce0d4ae 100644
--- a/src/logfile_sub_source.cc
+++ b/src/logfile_sub_source.cc
@@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv,
@@ -68,8 +58,6 @@ index 14e87002..dce0d4ae 100644
}
lr.lr_start = 0;
-diff --git a/src/view_curses.cc b/src/view_curses.cc
-index 4a36a3ad..2456d53d 100644
--- a/src/view_curses.cc
+++ b/src/view_curses.cc
@@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window,
@@ -92,6 +80,3 @@ index 4a36a3ad..2456d53d 100644
attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start);
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/files/
@ 2023-04-28 19:19 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2023-04-28 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 80b9a121f8340c66f7862b8098c2976aa1bf8983
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Apr 28 19:03:37 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 19:19:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b9a121
app-admin/lnav: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30800
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/lnav-0.11.0-conditional-ssh-keygen.patch | 34 ----------------------
1 file changed, 34 deletions(-)
diff --git a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
deleted file mode 100644
index a0396182b8af..000000000000
--- a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b16833392b74826f8cd437675fc29e4a0b88efcd Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sun, 4 Sep 2022 00:03:33 -0400
-Subject: [PATCH] Only build ssh keys when needed
-
-I believe the test/remote folder only needs to be setup for
-test/test_remote.sh. Prior to this commit, it was being built during
-make, rather than just during make check. This commit adjusts things so
-that the test/remote folder is only generated during make check, and
-only when test/test_remote.sh is being executed.
-
-Fixes #1040
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index fd09a656..457f3cb0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -478,7 +478,7 @@ DISTCLEANFILES = \
- empty \
- scripts-empty
-
--all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
-+test_remote.sh.log: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
-
- distclean-local:
- $(RM_V)rm -rf remote remote-tmp not:a:remote:dir
---
-2.37.2
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-28 19:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-17 2:34 [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-28 19:19 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox