Received: by mail.netbsd.org (Postfix, from userid 605) id 5D48984E58; Sun, 22 Dec 2019 22:30:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D869284E3F for ; Sun, 22 Dec 2019 22:30:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id r-XWjEYBUJ5C for ; Sun, 22 Dec 2019 22:30:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5665A84E2E for ; Sun, 22 Dec 2019 22:30:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4E0E1FA97; Sun, 22 Dec 2019 22:30:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1577053808258940" MIME-Version: 1.0 Date: Sun, 22 Dec 2019 22:30:08 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/sysutils/lnav To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20191222223008.4E0E1FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1577053808258940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sun Dec 22 22:30:08 UTC 2019 Modified Files: pkgsrc/sysutils/lnav: distinfo Added Files: pkgsrc/sysutils/lnav/patches: patch-src_sql__util.cc patch-src_string-extension-functions.cc Log Message: Deal with pcre changes. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/lnav/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/lnav/patches/patch-src_sql__util.cc \ pkgsrc/sysutils/lnav/patches/patch-src_string-extension-functions.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1577053808258940 Content-Disposition: inline Content-Length: 2503 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/lnav/distinfo diff -u pkgsrc/sysutils/lnav/distinfo:1.2 pkgsrc/sysutils/lnav/distinfo:1.3 --- pkgsrc/sysutils/lnav/distinfo:1.2 Wed Nov 4 01:32:20 2015 +++ pkgsrc/sysutils/lnav/distinfo Sun Dec 22 22:30:08 2019 @@ -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_data__parser.hh) = 0f976 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 Added files: Index: pkgsrc/sysutils/lnav/patches/patch-src_sql__util.cc diff -u /dev/null pkgsrc/sysutils/lnav/patches/patch-src_sql__util.cc:1.1 --- /dev/null Sun Dec 22 22:30:08 2019 +++ pkgsrc/sysutils/lnav/patches/patch-src_sql__util.cc Sun Dec 22 22:30:08 2019 @@ -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 + */ Index: pkgsrc/sysutils/lnav/patches/patch-src_string-extension-functions.cc diff -u /dev/null pkgsrc/sysutils/lnav/patches/patch-src_string-extension-functions.cc:1.1 --- /dev/null Sun Dec 22 22:30:08 2019 +++ pkgsrc/sysutils/lnav/patches/patch-src_string-extension-functions.cc Sun Dec 22 22:30:08 2019 @@ -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; --_----------=_1577053808258940--