Merge pull request #200 from regro-cf-autotick-bot/25.1_hba5848

libprotobuf v25.1
conda-forge · Jan 21, 2024 · 85b0dea · 85b0dea
2 parents 9624c8d + b0bf986
commit 85b0dea
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 14 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 # keep this without major version to let the bot pick it up
-{% set version = "24.4" %}
+{% set version = "25.1" %}
 # protobuf doesn't add the major version in the tag, it's defined per language in
 # https://github.com/protocolbuffers/protobuf/blob/main/version.json
 {% set major = "4" %}
@@ -12,14 +12,15 @@ package:
 
 source:
   - url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
-    sha256: 616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8
+    sha256: 9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42
     patches:
       - patches/0001-use-consistent-cmake-location.patch
       - patches/0002-set-static-lib-extension-on-windows.patch
       - patches/0003-always-look-for-shared-abseil-builds.patch
       # grpc_cpp_java_plugin links against otherwise internal symbols
       - patches/0004-Export-functions-in-google-compiler-java-names.patch
       - patches/0005-do-not-install-vendored-gmock.patch
+      - patches/0006-Fix-getting-env-variables-on-windows.patch
 
 build:
   number: 0

diff --git a/recipe/patches/0006-Fix-getting-env-variables-on-windows.patch b/recipe/patches/0006-Fix-getting-env-variables-on-windows.patch
@@ -0,0 +1,31 @@
+From c54edc4ac169b2196d91ff6f6728cbefe5ae61c2 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Fri, 19 Jan 2024 19:14:50 -0600
+Subject: [PATCH] Fix getting env variables on windows
+
+---
+ src/google/protobuf/compiler/mock_code_generator.cc | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc
+index d7057a1e6..8b6742687 100644
+--- a/src/google/protobuf/compiler/mock_code_generator.cc
++++ b/src/google/protobuf/compiler/mock_code_generator.cc
+@@ -73,7 +73,13 @@ static constexpr absl::string_view kSecondInsertionPoint =
+     "  # @@protoc_insertion_point(second_mock_insertion_point) is here\n";
+
+ MockCodeGenerator::MockCodeGenerator(absl::string_view name) : name_(name) {
+-  absl::string_view key = getenv("TEST_CASE");
++  char* c_key = getenv("TEST_CASE");
++  if (c_key == NULL) {
++    // In Windows, setting 'TEST_CASE=' is equivalent to unsetting
++    // and therefore c_key can be NULL
++    return;
++  }
++  absl::string_view key(c_key);
+   if (key == "no_editions") {
+     suppressed_features_ |= CodeGenerator::FEATURE_SUPPORTS_EDITIONS;
+   } else if (key == "invalid_features") {
+-- 
+2.42.0
+