Received: by mail.netbsd.org (Postfix, from userid 605) id AE73884D6F; Thu, 14 May 2020 19:06:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 37A4784D66 for ; Thu, 14 May 2020 19:06:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id m4ll665FP0wt for ; Thu, 14 May 2020 19:06:55 +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 7348E84D2A for ; Thu, 14 May 2020 19:06:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70400FB27; Thu, 14 May 2020 19:06:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158948321520330" MIME-Version: 1.0 Date: Thu, 14 May 2020 19:06:55 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/editors/kakoune To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200514190655.70400FB27@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. --_----------=_158948321520330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu May 14 19:06:55 UTC 2020 Modified Files: pkgsrc/editors/kakoune: distinfo pkgsrc/editors/kakoune/patches: patch-src_Makefile Added Files: pkgsrc/editors/kakoune/patches: patch-src_commands.cc patch-src_insert__completer.cc patch-src_normal.cc patch-src_string__utils.cc Log Message: Resolve various template matching issues when building with clang and don't require relaxed instanciation. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/kakoune/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/kakoune/patches/patch-src_Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/editors/kakoune/patches/patch-src_commands.cc \ pkgsrc/editors/kakoune/patches/patch-src_insert__completer.cc \ pkgsrc/editors/kakoune/patches/patch-src_normal.cc \ pkgsrc/editors/kakoune/patches/patch-src_string__utils.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158948321520330 Content-Disposition: inline Content-Length: 6885 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/kakoune/distinfo diff -u pkgsrc/editors/kakoune/distinfo:1.4 pkgsrc/editors/kakoune/distinfo:1.5 --- pkgsrc/editors/kakoune/distinfo:1.4 Sun Mar 22 10:45:10 2020 +++ pkgsrc/editors/kakoune/distinfo Thu May 14 19:06:55 2020 @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.4 2020/03/22 10:45:10 nia Exp $ +$NetBSD: distinfo,v 1.5 2020/05/14 19:06:55 joerg Exp $ SHA1 (kakoune-2020.01.16.tar.bz2) = bb207f38942251b923935898dd40d9ca475444dd RMD160 (kakoune-2020.01.16.tar.bz2) = 98c7ed0c9cd77cb73426853a0a92c468a9d27bbb SHA512 (kakoune-2020.01.16.tar.bz2) = c7b5b2790f3ecaf3a94b72e1d2f75fbbde8a7e8d3696f8a633439eb39a7331809d7fc13290bc781350fd6efe4cd823625438fe719f99bf18cfaff8a9a5773156 Size (kakoune-2020.01.16.tar.bz2) = 478509 bytes -SHA1 (patch-src_Makefile) = 669a6da452be1f9cd58848819d7ae70013cefeb8 +SHA1 (patch-src_Makefile) = efdae51f3ae0389c1d6ce39dfe35c95c890ad0be +SHA1 (patch-src_commands.cc) = 0904deb1b4d14ffc73d4182a61c12f0de82186fa SHA1 (patch-src_event__manager.cc) = 8666702d13d416fdb7b7cbaf55615b736f7b09a8 SHA1 (patch-src_file.cc) = 490872503d1f5b73281095aa7552f6c8819a7969 +SHA1 (patch-src_insert__completer.cc) = 993dc13309483d9a7191f0d9f0cb7e76d6429a2b +SHA1 (patch-src_normal.cc) = ca7fc93d78bd85614a905a0b945a4bbb7c45ab69 +SHA1 (patch-src_string__utils.cc) = f232d13f3e39124058354c6f9d20ff2936f58ba9 Index: pkgsrc/editors/kakoune/patches/patch-src_Makefile diff -u pkgsrc/editors/kakoune/patches/patch-src_Makefile:1.2 pkgsrc/editors/kakoune/patches/patch-src_Makefile:1.3 --- pkgsrc/editors/kakoune/patches/patch-src_Makefile:1.2 Sun Mar 22 10:35:44 2020 +++ pkgsrc/editors/kakoune/patches/patch-src_Makefile Thu May 14 19:06:55 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_Makefile,v 1.2 2020/03/22 10:35:44 nia Exp $ +$NetBSD: patch-src_Makefile,v 1.3 2020/05/14 19:06:55 joerg Exp $ Do not force -O3 or -g. @@ -12,7 +12,7 @@ Do not force -O3 or -g. suffix := .opt else $(error debug should be either yes or no) -@@ -90,7 +89,7 @@ else +@@ -90,11 +89,11 @@ else LDFLAGS += -rdynamic endif @@ -21,3 +21,8 @@ Do not force -O3 or -g. compiler := $(shell $(CXX) --version) ifneq (,$(findstring clang,$(compiler))) +- CXXFLAGS += -frelaxed-template-template-args ++# CXXFLAGS += -frelaxed-template-template-args + else ifneq (,$(findstring GCC,$(compiler))) + CXXFLAGS += -Wno-init-list-lifetime + endif Added files: Index: pkgsrc/editors/kakoune/patches/patch-src_commands.cc diff -u /dev/null pkgsrc/editors/kakoune/patches/patch-src_commands.cc:1.1 --- /dev/null Thu May 14 19:06:55 2020 +++ pkgsrc/editors/kakoune/patches/patch-src_commands.cc Thu May 14 19:06:55 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_commands.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $ + +--- src/commands.cc.orig 2020-05-11 00:38:19.003563913 +0000 ++++ src/commands.cc +@@ -1962,7 +1962,7 @@ const CommandDesc eval_string_cmd = { + ScopedSetBool disable_hoooks(context.hooks_disabled(), no_hooks); + + if (parser.get_switch("verbatim")) +- CommandManager::instance().execute_single_command(parser | gather(), context, shell_context); ++ CommandManager::instance().execute_single_command(parser | gather>(), context, shell_context); + else + CommandManager::instance().execute(join(parser, ' ', false), context, shell_context); + }); Index: pkgsrc/editors/kakoune/patches/patch-src_insert__completer.cc diff -u /dev/null pkgsrc/editors/kakoune/patches/patch-src_insert__completer.cc:1.1 --- /dev/null Thu May 14 19:06:55 2020 +++ pkgsrc/editors/kakoune/patches/patch-src_insert__completer.cc Thu May 14 19:06:55 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-src_insert__completer.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $ + +--- src/insert_completer.cc.orig 2020-05-11 00:26:58.591197327 +0000 ++++ src/insert_completer.cc +@@ -15,7 +15,7 @@ + #include "option_types.hh" + #include "utf8_iterator.hh" + #include "user_interface.hh" +- ++#include "ranges.hh" + #include + #include + +@@ -119,7 +119,7 @@ InsertCompletion complete_word(const Sel + auto& word_db = get_word_db(buffer); + Vector matches = word_db.find_matching(prefix) + | transform([&](auto& m) { return RankedMatchAndBuffer{m, &buffer}; }) +- | gather(); ++ | gather>(); + // Remove words that are being edited + for (auto& word_count : sel_word_counts) + { Index: pkgsrc/editors/kakoune/patches/patch-src_normal.cc diff -u /dev/null pkgsrc/editors/kakoune/patches/patch-src_normal.cc:1.1 --- /dev/null Thu May 14 19:06:55 2020 +++ pkgsrc/editors/kakoune/patches/patch-src_normal.cc Thu May 14 19:06:55 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-src_normal.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $ + +--- src/normal.cc.orig 2020-05-11 00:48:13.234212710 +0000 ++++ src/normal.cc +@@ -646,7 +646,7 @@ void insert_output(Context& context, Nor + return ShellManager::instance().eval( + cmdline, context, content(context.buffer(), sel), + ShellManager::Flags::WaitForStdout).first; +- }) | gather(); ++ }) | gather>(); + + selections.set_main_index(old_main); + selections.insert(ins, mode); Index: pkgsrc/editors/kakoune/patches/patch-src_string__utils.cc diff -u /dev/null pkgsrc/editors/kakoune/patches/patch-src_string__utils.cc:1.1 --- /dev/null Thu May 14 19:06:55 2020 +++ pkgsrc/editors/kakoune/patches/patch-src_string__utils.cc Thu May 14 19:06:55 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-src_string__utils.cc,v 1.1 2020/05/14 19:06:55 joerg Exp $ + +--- src/string_utils.cc.orig 2020-05-11 00:59:12.075369477 +0000 ++++ src/string_utils.cc +@@ -381,7 +381,7 @@ UnitTest test_string{[]() + { + kak_assert(String("youpi ") + "matin" == "youpi matin"); + +- auto wrapped = "wrap this paragraph\n respecting whitespaces and much_too_long_words" | wrap_at(16) | gather(); ++ auto wrapped = "wrap this paragraph\n respecting whitespaces and much_too_long_words" | wrap_at(16) | gather>(); + kak_assert(wrapped.size() == 6); + kak_assert(wrapped[0] == "wrap this"); + kak_assert(wrapped[1] == "paragraph"); +@@ -390,7 +390,7 @@ UnitTest test_string{[]() + kak_assert(wrapped[4] == "much_too_long_wo"); + kak_assert(wrapped[5] == "rds"); + +- auto wrapped2 = "error: unknown type" | wrap_at(7) | gather(); ++ auto wrapped2 = "error: unknown type" | wrap_at(7) | gather>(); + kak_assert(wrapped2.size() == 3); + kak_assert(wrapped2[0] == "error:"); + kak_assert(wrapped2[1] == "unknown"); --_----------=_158948321520330--