1 |
commit: f17ed8064ed6dd14f538007df9ff93b51dc0543b |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 17 02:33:29 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 17 02:33:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17ed806 |
7 |
|
8 |
app-admin/lnav: tidy patches |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../lnav/files/lnav-0.10.0-disable-remote-tests.patch | 4 ++-- |
13 |
app-admin/lnav/files/lnav-0.10.0-disable-tests.patch | 4 ++-- |
14 |
app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch | 9 --------- |
15 |
app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch | 9 --------- |
16 |
app-admin/lnav/files/lnav-0.9.0-bug786456.patch | 10 ---------- |
17 |
app-admin/lnav/files/lnav-0.9.0-bug792582.patch | 15 --------------- |
18 |
6 files changed, 4 insertions(+), 47 deletions(-) |
19 |
|
20 |
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 |
21 |
index 2177cc1adf3..5e8c80fb90a 100644 |
22 |
--- a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch |
23 |
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- lnav-0.10.0/test/test_remote.sh |
26 |
-+++ lnav-0.10.0/test/test_remote.sh |
27 |
+--- a/test/test_remote.sh |
28 |
++++ b/test/test_remote.sh |
29 |
@@ -76,38 +76,38 @@ |
30 |
error: unable to open file: nonexistent-host: -- failed to ssh to host: ... |
31 |
EOF |
32 |
|
33 |
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 |
34 |
index 48a7e9b8cd4..c7a49d45f1d 100644 |
35 |
--- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch |
36 |
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch |
37 |
@@ -3,8 +3,8 @@ |
38 |
# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911 |
39 |
# logfile: Flaky. Fails some times and not others. i.e. Race condition |
40 |
# tui: Can hang the build |
41 |
---- lnav-0.10.0/test/Makefile.am |
42 |
-+++ lnav-0.10.0/test/Makefile.am |
43 |
+--- a/test/Makefile.am |
44 |
++++ b/test/Makefile.am |
45 |
@@ -355,14 +355,14 @@ |
46 |
test_cli.sh \ |
47 |
test_cmds.sh \ |
48 |
|
49 |
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 |
50 |
index 47aef6d593d..d2f26a436ff 100644 |
51 |
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch |
52 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch |
53 |
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:23:56 -0800 |
54 |
Subject: [PATCH] [tests] fix test to make it insensitive to the current date |
55 |
|
56 |
Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
57 |
---- |
58 |
- test/test_sql.sh | 10 +++++----- |
59 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
60 |
- |
61 |
-diff --git a/test/test_sql.sh b/test/test_sql.sh |
62 |
-index c7480ecc..bbb98dce 100644 |
63 |
--- a/test/test_sql.sh |
64 |
+++ b/test/test_sql.sh |
65 |
@@ -1012,13 +1012,13 @@ EOF |
66 |
@@ -31,6 +25,3 @@ index c7480ecc..bbb98dce 100644 |
67 |
EOF |
68 |
|
69 |
|
70 |
--- |
71 |
-2.31.1 |
72 |
- |
73 |
|
74 |
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 |
75 |
index 58aa7264a0d..83380fae4d8 100644 |
76 |
--- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch |
77 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch |
78 |
@@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:26:57 -0800 |
79 |
Subject: [PATCH] [tests] update another date-sensitive test |
80 |
|
81 |
Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
82 |
---- |
83 |
- test/test_sql.sh | 6 +++--- |
84 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
85 |
- |
86 |
-diff --git a/test/test_sql.sh b/test/test_sql.sh |
87 |
-index bbb98dce..22941c2a 100644 |
88 |
--- a/test/test_sql.sh |
89 |
+++ b/test/test_sql.sh |
90 |
@@ -1023,11 +1023,11 @@ EOF |
91 |
@@ -27,6 +21,3 @@ index bbb98dce..22941c2a 100644 |
92 |
EOF |
93 |
|
94 |
# Create a dummy database for the next couple of tests to consume. |
95 |
--- |
96 |
-2.31.1 |
97 |
- |
98 |
|
99 |
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch |
100 |
index e77dd17854e..0d3ab64282c 100644 |
101 |
--- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch |
102 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch |
103 |
@@ -7,16 +7,6 @@ Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile |
104 |
Fixes #864 |
105 |
|
106 |
Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
107 |
---- |
108 |
- m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++--- |
109 |
- src/base/result.h | 1 + |
110 |
- src/logfile.hh | 13 + |
111 |
- src/optional.hpp | 45 +++- |
112 |
- src/pcrepp/pcrepp.hh | 1 + |
113 |
- 5 files changed, 482 insertions(+), 40 deletions(-) |
114 |
- |
115 |
-diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 |
116 |
-index 2c18e49c..9413da62 100644 |
117 |
--- a/m4/ax_cxx_compile_stdcxx.m4 |
118 |
+++ b/m4/ax_cxx_compile_stdcxx.m4 |
119 |
@@ -1,5 +1,5 @@ |
120 |
|
121 |
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch |
122 |
index 9059712242a..125f86b57a6 100644 |
123 |
--- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch |
124 |
+++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch |
125 |
@@ -7,14 +7,6 @@ Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible |
126 |
Fixes #806 |
127 |
|
128 |
Signed-off-by: Randy Barlow <randy@×××××××××××××××××.com> |
129 |
---- |
130 |
- src/highlighter.cc | 4 +++- |
131 |
- src/logfile_sub_source.cc | 17 ++++++++++------- |
132 |
- src/view_curses.cc | 9 ++++++--- |
133 |
- 3 files changed, 19 insertions(+), 11 deletions(-) |
134 |
- |
135 |
-diff --git a/src/highlighter.cc b/src/highlighter.cc |
136 |
-index 24aafebd..110ca03f 100644 |
137 |
--- a/src/highlighter.cc |
138 |
+++ b/src/highlighter.cc |
139 |
@@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const |
140 |
@@ -28,8 +20,6 @@ index 24aafebd..110ca03f 100644 |
141 |
} |
142 |
sa.emplace_back(lr, &view_curses::VC_STYLE, attrs); |
143 |
|
144 |
-diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc |
145 |
-index 14e87002..dce0d4ae 100644 |
146 |
--- a/src/logfile_sub_source.cc |
147 |
+++ b/src/logfile_sub_source.cc |
148 |
@@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv, |
149 |
@@ -68,8 +58,6 @@ index 14e87002..dce0d4ae 100644 |
150 |
} |
151 |
|
152 |
lr.lr_start = 0; |
153 |
-diff --git a/src/view_curses.cc b/src/view_curses.cc |
154 |
-index 4a36a3ad..2456d53d 100644 |
155 |
--- a/src/view_curses.cc |
156 |
+++ b/src/view_curses.cc |
157 |
@@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window, |
158 |
@@ -92,6 +80,3 @@ index 4a36a3ad..2456d53d 100644 |
159 |
|
160 |
attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start); |
161 |
|
162 |
--- |
163 |
-2.31.1 |
164 |
- |