From nobody Sun Sep 15 20:25:23 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X6KKw6DVRz5WxpJ; Sun, 15 Sep 2024 20:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X6KKw0VGSz4PKT; Sun, 15 Sep 2024 20:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726431924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oN58T9T0MBJyiWnQNQvBy9S0ZPq84qHGmb4sV69QBFo=; b=QcO2bmDk26XB8dimETnNRBFUrDTdoPzuRqHJN+xFLgdFw3Eb/H/68kVS05gpfA2xq2TC42 saAWwmsuEggNSCgEV8dMvINH8iP9/Ywje+yYvby/lDj3AzYIJ6o7pzaNvzLGuWfknvlH2h ivIQWHTlMsKh2FLqjyXdqzoOIQGMeSb+SbCrR9J8mhLrTCY8q/dQQ8zEPzghneQUeVZ+qF gy9Bz73ELmlSyfoNZveR2RPBMcgroMOn0cg35m2Brnd8Ky/c9DhMCpQV+6+eTN5n2fHCjv RW0CCa+7/BAbUJ04BFpY3qVmzAmmJ4qUX3HvIlc+AXH3JeKu7FF18LI8R5paqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726431924; a=rsa-sha256; cv=none; b=FQFMnXd1OCztt1WRfugSdrTDkp081TeXGFlOanaut5EV+gmULN3S9PZnXrqzBCvD+omkxw fVQ7No7E8PkFjuq9UAalJmAJ46hYO8yKoUI/97i6FBWGzlNL+AlVem+tfhzKv9oZdE/Og0 63URo2xd0fWVlA4sEUcTTbDMrhQZyNMN4LGtRpRzSAU/BDi0gtznyRKBMq04/Kp8xgrgku +8lqtcFovlUNQxR3iiJUkNT5z9rXGGi5+mFXLUgrDMHvHk4tfGqEzNlV1lPQQhpbSjUkXb UIxsxCP9/IBIE9s80binSAslcXVV74rN0e2VO6qgnjVVx6M8rQVF/jteYEhenA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726431924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oN58T9T0MBJyiWnQNQvBy9S0ZPq84qHGmb4sV69QBFo=; b=OMIfL0s3aK7q8BoFFsWgFuBQ2RTTnjUrNzHYbmOyDJNJc/OQf/Vhg+Zf2G92cF9X5d84Sk W84+0WwcTrxlZ02OPQfdEV5AS3ov3l0AX5SXpu1MizqS89D0pRBN14FtKPl7DdMchVC3tF z9wNGzkNMSl4psd1JMgLrb1hnp6dzWXGhQLuIFzdCawkjgal54X/V5HJycBl8XlPt2tgQB s4jb3g55i0VpohfER6XZQHgeCO494zIEV2WDRvZD6mcxi7fUUVklCXMo74Jg+m84Qb9Ew6 1G6Ye1+kNKNqQ59vd9B1feq43BQy8twdbGusKj6pP8PMqNnh8DQLW6tPBJMVIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X6KKv5tdJzQTV; Sun, 15 Sep 2024 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FKPNtc017686; Sun, 15 Sep 2024 20:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FKPNQZ017683; Sun, 15 Sep 2024 20:25:23 GMT (envelope-from git) Date: Sun, 15 Sep 2024 20:25:23 GMT Message-Id: <202409152025.48FKPNQZ017683@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5af723cd1493 - main - math/or-tools: Fix build with protobuf 26+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5af723cd1493d19113585c731ee85d339dcd5779 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5af723cd1493d19113585c731ee85d339dcd5779 commit 5af723cd1493d19113585c731ee85d339dcd5779 Author: Po-Chuan Hsieh AuthorDate: 2024-09-15 20:03:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-15 20:11:53 +0000 math/or-tools: Fix build with protobuf 26+ --- math/or-tools/files/patch-protobuf | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/math/or-tools/files/patch-protobuf b/math/or-tools/files/patch-protobuf new file mode 100644 index 000000000000..1556807c41e2 --- /dev/null +++ b/math/or-tools/files/patch-protobuf @@ -0,0 +1,46 @@ +--- ortools/base/file.cc.orig 2023-11-13 09:51:25 UTC ++++ ortools/base/file.cc +@@ -224,7 +224,8 @@ class NoOpErrorCollector : public google::protobuf::io + namespace { + class NoOpErrorCollector : public google::protobuf::io::ErrorCollector { + public: +- void AddError(int line, int column, const std::string& message) override {} ++ void RecordError(int /*line*/, int /*column*/, ++ absl::string_view /*message*/) override {} + }; + } // namespace + +--- ortools/util/file_util.cc.orig 2023-11-13 09:51:25 UTC ++++ ortools/util/file_util.cc +@@ -137,7 +137,7 @@ bool WriteProtoToFile(absl::string_view filename, + case ProtoWriteFormat::kJson: { + google::protobuf::util::JsonPrintOptions options; + options.add_whitespace = true; +- options.always_print_primitive_fields = true; ++ options.always_print_fields_with_no_presence = true; + options.preserve_proto_field_names = true; + if (!google::protobuf::util::MessageToJsonString(proto, &output_string, + options) +--- ortools/util/parse_proto.cc.orig 2023-11-13 09:51:25 UTC ++++ ortools/util/parse_proto.cc +@@ -36,11 +36,16 @@ class TextFormatErrorCollector : public google::protob + TextFormatErrorCollector() = default; + ~TextFormatErrorCollector() override = default; + +- void AddError(int line, int column, const std::string& message) override { +- collected_errors_.push_back({false, line, column, message}); ++ void RecordError(const int line, const int column, ++ absl::string_view message) override { ++ collected_errors_.push_back( ++ {/*warning=*/false, line, column, std::string(message)}); + } +- void AddWarning(int line, int column, const std::string& message) override { +- collected_errors_.push_back({true, line, column, message}); ++ ++ void RecordWarning(const int line, const int column, ++ absl::string_view message) override { ++ collected_errors_.push_back( ++ {/*warning=*/true, line, column, std::string(message)}); + } + + // Returns a string listing each collected error. When an error is associated