From nobody Sun Sep 15 20:25:25 2024 X-Original-To: dev-commits-ports-main@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 4X6KKy6BLNz5Wy0f; Sun, 15 Sep 2024 20:25:26 +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 4X6KKy1M8Hz4PD3; Sun, 15 Sep 2024 20:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726431926; 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=PnIHNFsvNAHZ7Nyff9+XtPVGmk6wtynYiiqlrEc/boo=; b=w/CSVtBFQaux14a3lOhYtXRGJMXtCly2iMd+G5bhw1hqh29LKK6fZUM8GCpy+WEfuxaGyV DkmzSPkm+b4kb8UE6nISdBWPZB0lEGR0SyTRhQYavrW/f4v5W5t4W9o5oLhRAqTHI6zNrr GwXwooVjeHabp+WhkC/FCeq9Jq2kvRJ7AL0Z3PdadpifOsv7Y9uj9t2qmnUXdHpGuHK9bH 36RUt88RLuOEK/ODnsTPKySIDMdICJMJWpYhCSXrkuYmbMhmKfVdo+dPFvziTfWoKePELn avdTXzUFKoSSe1LJSyk6hqVqB6w3ek1jtXSvaeIsaxdQAl1TjbBBmy0sb6PVuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726431926; a=rsa-sha256; cv=none; b=oZnV3ROKu2K1qJdTdGUDm/rbpNZxPpLsYsEMcqASnW6QDAsprWwJVOU4Am5UNo3Hkk1p31 0xR21pdpzP7oyfS7RmF2q3aUdKEoZYA9GRJh+VoiHBFD0ePzvH95WlOPxkax7VoOzIcwqB zrTWZ2ybVtwuCsOtpP6PEE1MSfFR3nItZ0NME2vMOK8TjZ3wl2KZ44gLX6UtXclydjo7w/ NFPOmyy31jFJHNK/atuZtXuNHgsOaUb/+xRqikPYBIJgM5Co/jKgNQTWTThEbj/aChLJOq iZZlFk6shlWaFfkdJe7N+fWRtyYvJUtF7hgiXAZ2c3omPZt74fsPoxsn0o+7nQ== 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=1726431926; 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=PnIHNFsvNAHZ7Nyff9+XtPVGmk6wtynYiiqlrEc/boo=; b=cwJt7OS0HRmPr6gaTM7wvrBkqLmTMxpj/xkxDU//YwZaQUxyin3bvG9oHmR6fPkAf8vU4O K6AkvTaVdt1LU7hjqraSy3c9VE6oIdtaEExMtvZzDZcPVR5oQA9U8o/E7S9o1Yt4VILci6 GVGcIxNADVwAiHMm5twcgGkal4s2rJk9LGFvK2EYNw5gRyR26sRTGM58aPTDjtdo4lHknO FBSlWNpJo2zTuRtk/GmOdgtJH3U9lhjd063neQuTrK/edg5HPpozBC74y3v+60JWxJBAZE Xz9WeyZhOZjNQHNcyG+MuV3xtWqCUgjOQKx4Ul3SPZl8UZkI6IALBhAhlM+4Sw== 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 4X6KKy0RFkzQP0; Sun, 15 Sep 2024 20:25:26 +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 48FKPPvL017769; Sun, 15 Sep 2024 20:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FKPPAP017766; Sun, 15 Sep 2024 20:25:25 GMT (envelope-from git) Date: Sun, 15 Sep 2024 20:25:25 GMT Message-Id: <202409152025.48FKPPAP017766@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: 0271587bb894 - main - math/py-or-tools: Fix build with protobuf 26+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 0271587bb8943559081b9d96c7e5d2a6ddd117c1 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0271587bb8943559081b9d96c7e5d2a6ddd117c1 commit 0271587bb8943559081b9d96c7e5d2a6ddd117c1 Author: Po-Chuan Hsieh AuthorDate: 2024-09-15 20:03:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-15 20:11:53 +0000 math/py-or-tools: Fix build with protobuf 26+ --- math/py-or-tools/files/patch-protobuf | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/math/py-or-tools/files/patch-protobuf b/math/py-or-tools/files/patch-protobuf new file mode 100644 index 000000000000..f8fa931455b5 --- /dev/null +++ b/math/py-or-tools/files/patch-protobuf @@ -0,0 +1,49 @@ +Obtained from: https://github.com/google/or-tools/commit/4cbd27dae94609e1c9413e4c4614c250758f9d9e + https://github.com/google/or-tools/commit/516a777f55e66caf70c27ad7e81f7d8850d36079 + +--- 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