[pkgsrc/trunk]: pkgsrc/sysutils/lnav Deal with pcre changes.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ab38379151c
branches:  trunk
changeset: 345979:8ab38379151c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 22 22:30:08 2019 +0000

description:
Deal with pcre changes.

diffstat:

 sysutils/lnav/distinfo                                        |   4 ++-
 sysutils/lnav/patches/patch-src_sql__util.cc                  |  13 +++++++++++
 sysutils/lnav/patches/patch-src_string-extension-functions.cc |  13 +++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (50 lines):

diff -r dcd278dfdc5b -r 8ab38379151c sysutils/lnav/distinfo
--- a/sysutils/lnav/distinfo    Sun Dec 22 22:29:39 2019 +0000
+++ b/sysutils/lnav/distinfo    Sun Dec 22 22:30:08 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2019/12/22 22:30:08 joerg Exp $
 
 SHA1 (lnav-0.7.3.tar.bz2) = 561d440bde7461db7f4dfbfbf3ce47fc58aeccf1
 RMD160 (lnav-0.7.3.tar.bz2) = 8b1795ed44448dd1eb11a51c2a89816ba1634899
@@ -8,4 +8,6 @@
 SHA1 (patch-src_grep__proc.cc) = f8d23f8c2abf8d99ae27d71dedd9d76ff4ad4a87
 SHA1 (patch-src_log__format.hh) = 14b081db5e839da23dedac624a571a9cc5dffef8
 SHA1 (patch-src_pretty__printer.hh) = fa28e901539fdddfb69875d39efe6f1c74b83b0d
+SHA1 (patch-src_sql__util.cc) = dba6791ce6651c19a8623d49b654a41b570fc5ea
+SHA1 (patch-src_string-extension-functions.cc) = cf6bc9d2f8dd3a79c77b9ae31cf15098b5569124
 SHA1 (patch-src_test__override.c) = 67c3fa4785a75eae1bfc8a9ed725276b37eca4ec
diff -r dcd278dfdc5b -r 8ab38379151c sysutils/lnav/patches/patch-src_sql__util.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/lnav/patches/patch-src_sql__util.cc      Sun Dec 22 22:30:08 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_sql__util.cc,v 1.1 2019/12/22 22:30:08 joerg Exp $
+
+--- src/sql_util.cc.orig       2019-12-22 20:08:53.128898781 +0000
++++ src/sql_util.cc
+@@ -40,6 +40,8 @@
+ #include "lnav_log.hh"
+ #include "lnav_util.hh"
+ 
++using pcrecpp::string;
++
+ /**
+  * Copied from -- http://www.sqlite.org/lang_keywords.html
+  */
diff -r dcd278dfdc5b -r 8ab38379151c sysutils/lnav/patches/patch-src_string-extension-functions.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/lnav/patches/patch-src_string-extension-functions.cc     Sun Dec 22 22:30:08 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_string-extension-functions.cc,v 1.1 2019/12/22 22:30:08 joerg Exp $
+
+--- src/string-extension-functions.cc.orig     2019-12-22 19:53:29.706785775 +0000
++++ src/string-extension-functions.cc
+@@ -141,7 +141,7 @@ void regexp_replace(sqlite3_context *ctx
+         return;
+ 
+     {
+-        string dest(str);
++        pcrecpp::string dest(str);
+         reobj->GlobalReplace(repl, &dest);
+         sqlite3_result_text(ctx, dest.c_str(), dest.length(), SQLITE_TRANSIENT);
+         return;