commit 66d21f27ae93e1528d316116e6beaae78de190a8
from: tb <tb@openbsd.org>
date: Wed Jan 29 15:01:13 2025 UTC

Update lnav to 0.12.3 to fix bulid with llvm 19

ok sthen

commit - 01568861b12e704a67425d091c86f5861024ccd1
commit + 66d21f27ae93e1528d316116e6beaae78de190a8
blob - ca66d424326cae0863092ebf6b74cbe5b8000ec8
blob + a4b1dedac2c995392653beea5196edbadb779128
--- sysutils/lnav/Makefile
+++ sysutils/lnav/Makefile
@@ -2,7 +2,7 @@ BROKEN-sparc64 =	error: #error "unknown CPU architectu
 
 COMMENT =	log file navigator
 
-V =		0.12.2
+V =		0.12.3
 DISTNAME =	lnav-${V}
 EXTRACT_SUFX =	.tar.bz2
 
blob - c3db0f796da4a4fc6b95a2b3b2364ca4b0372797
blob + 6cec538478cab9f66c615915f7ba8aeef4b3acb0
--- sysutils/lnav/distinfo
+++ sysutils/lnav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lnav-0.12.2.tar.bz2) = WQnbsiSf0jvGddWjjzKMGCnj2AGYGCNOJ2uK8d6ZrtY=
-SIZE (lnav-0.12.2.tar.bz2) = 3074504
+SHA256 (lnav-0.12.3.tar.bz2) = prF7p33r+hBpn7XU6DvK0OEyJ3c56llY47gMLdyZk6E=
+SIZE (lnav-0.12.3.tar.bz2) = 3126396
blob - bd246b1aabd79891871948514c5762e859901a9f
blob + 349ba4e1b9b1b918f2bc69b776d2ad6aebae7748
--- sysutils/lnav/patches/patch-TESTS_ENVIRONMENT_in
+++ sysutils/lnav/patches/patch-TESTS_ENVIRONMENT_in
@@ -1,7 +1,7 @@
 Index: TESTS_ENVIRONMENT.in
 --- TESTS_ENVIRONMENT.in.orig
 +++ TESTS_ENVIRONMENT.in
-@@ -87,7 +87,7 @@ has_errors=""
+@@ -97,7 +97,7 @@ has_errors=""
  #     run_test rktimes -V
  #
  run_test() {
@@ -10,7 +10,7 @@ Index: TESTS_ENVIRONMENT.in
      LAST_TEST=("test: $@")
      echo "${LAST_TEST[@]}"
      export test_num=`expr ${test_num} \+ 1`
-@@ -97,7 +97,7 @@ run_test() {
+@@ -107,7 +107,7 @@ run_test() {
  run_cap_test() {
      LAST_CAP_TEST=("test: $@")
      local full_cmd=$(echo "${LAST_CAP_TEST[@]}" | sed -e "s;${test_dir};{test_dir};g" -e "s;${top_srcdir};{top_srcdir};g")
@@ -19,7 +19,7 @@ Index: TESTS_ENVIRONMENT.in
      echo "${full_cmd}" > ${test_file_base}_${test_hash}.cmd
      "$@" > ${test_file_base}_${test_hash}.out 2> ${test_file_base}_${test_hash}.err
  
-@@ -109,7 +109,7 @@ run_cap_test() {
+@@ -123,7 +123,7 @@ run_cap_test() {
          -e "s;lnav-user-${UID}-work;lnav-user-{uid}-work;g" \
          ${test_file_base}_${test_hash}.out
      echo
blob - b5eb47b22028025b492322e22d9ddb1b024b0952
blob + 5b3f26ccd6d1059dd1776385ea63c625b1c1d9eb
--- sysutils/lnav/patches/patch-configure
+++ sysutils/lnav/patches/patch-configure
@@ -3,7 +3,7 @@ make sure we link with readline from ports
 Index: configure
 --- configure.orig
 +++ configure
-@@ -12480,7 +12480,7 @@ ac_res=$ac_cv_search_readline
+@@ -12914,7 +12914,7 @@ ac_res=$ac_cv_search_readline
  if test "$ac_res" != no
  then :
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
blob - f22022d71c27dc40400d1f054ca42af16737a063
blob + b323321517adcbd74fdaf7aeee8b4b56bf412367
--- sysutils/lnav/patches/patch-src_Makefile_in
+++ sysutils/lnav/patches/patch-src_Makefile_in
@@ -3,7 +3,7 @@ no need to call this bash script
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -2422,9 +2422,6 @@ check-local:
+@@ -2456,9 +2456,6 @@ check-local:
  @HAVE_CHECK_JSONSCHEMA_TRUE@	$(CHECK_JSONSCHEMA) --schemafile $(top_srcdir)/docs/schemas/format-v1.schema.json $(FORMAT_FILES)
  @HAVE_CHECK_JSONSCHEMA_TRUE@	$(CHECK_JSONSCHEMA) --schemafile $(top_srcdir)/docs/schemas/config-v1.schema.json $(CONFIG_FILES)
  
blob - 7c6fc59bec8031a86bc3cd281ad214897bd16c2c
blob + b47283b1292f8ca03bb087dc702b31a69bcf464c
--- sysutils/lnav/patches/patch-src_base_lnav_log_cc
+++ sysutils/lnav/patches/patch-src_base_lnav_log_cc
@@ -3,7 +3,7 @@ fix some 'vfprintf %s NULL'
 Index: src/base/lnav_log.cc
 --- src/base/lnav_log.cc.orig
 +++ src/base/lnav_log.cc
-@@ -229,11 +229,13 @@ log_host_info()
+@@ -228,11 +228,13 @@ log_host_info()
      log_info("  jittarget=%s", jittarget);
      log_info("Environment:");
      log_info("  HOME=%s", getenv("HOME"));
blob - 3d9d8fb1f0483ea849184206ff41e7fd0ae51b4c
blob + 76190ccf5f5277d592cf0d66722f385aa9322f36
--- sysutils/lnav/patches/patch-src_readline_curses_cc
+++ sysutils/lnav/patches/patch-src_readline_curses_cc
@@ -3,7 +3,7 @@ replace use of ptsname_r by ptsname
 Index: src/readline_curses.cc
 --- src/readline_curses.cc.orig
 +++ src/readline_curses.cc
-@@ -840,10 +840,8 @@ readline_curses::start()
+@@ -843,10 +843,8 @@ readline_curses::start()
      this->rc_pty[RCF_MASTER] = openpt_res.unwrap();
      log_perror(grantpt(this->rc_pty[RCF_MASTER]));
      log_perror(unlockpt(this->rc_pty[RCF_MASTER]));
blob - 6474e0349daa01bad14f2244fa23c74d8aa0dc5e
blob + 610457a28bc0313fcb58e5f9d7b667881bb8b9a7
--- sysutils/lnav/patches/patch-src_tailer_Makefile_in
+++ sysutils/lnav/patches/patch-src_tailer_Makefile_in
@@ -3,7 +3,7 @@ reorder includes so that the bundled fmtlib headers ar
 Index: src/tailer/Makefile.in
 --- src/tailer/Makefile.in.orig
 +++ src/tailer/Makefile.in
-@@ -656,9 +656,9 @@ libtailercommon_a_SOURCES = \
+@@ -657,9 +657,9 @@ libtailercommon_a_SOURCES = \
      tailer.c
  
  libtailerpp_a_CPPFLAGS = \
@@ -14,7 +14,7 @@ Index: src/tailer/Makefile.in
      -I$(srcdir)/../third-party \
  	-I$(top_srcdir)/src/third-party/date/include \
  	-I$(top_srcdir)/src/third-party/scnlib/include
-@@ -667,9 +667,9 @@ libtailerpp_a_SOURCES = \
+@@ -668,9 +668,9 @@ libtailerpp_a_SOURCES = \
      tailerpp.cc
  
  libtailerservice_a_CPPFLAGS = \