Merge pull request #237 from xhochy/28.2

libprotobuf 28.2

.ci_support/linux_64_.yaml

@@ -1,3 +1,5 @@
+ace:
+- 8.0.1
 c_compiler:
 - gcc
 c_compiler_version:
@@ -22,6 +24,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 target_platform:
 - linux-64
 zip_keys:

.ci_support/linux_aarch64_.yaml

@@ -1,5 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+ace:
+- 8.0.1
 c_compiler:
 - gcc
 c_compiler_version:
@@ -26,6 +28,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 target_platform:
 - linux-aarch64
 zip_keys:

.ci_support/linux_ppc64le_.yaml

@@ -1,3 +1,5 @@
+ace:
+- 8.0.1
 c_compiler:
 - gcc
 c_compiler_version:
@@ -22,6 +24,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 target_platform:
 - linux-ppc64le
 zip_keys:

.ci_support/osx_64_.yaml

@@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
 MACOSX_SDK_VERSION:
 - '10.13'
+ace:
+- 8.0.1
 c_compiler:
 - clang
 c_compiler_version:
@@ -22,6 +24,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 macos_machine:
 - x86_64-apple-darwin13.4.0
 target_platform:

.ci_support/osx_arm64_.yaml

@@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
 MACOSX_SDK_VERSION:
 - '11.0'
+ace:
+- 8.0.1
 c_compiler:
 - clang
 c_compiler_version:
@@ -22,6 +24,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:

.ci_support/win_64_.yaml

@@ -1,3 +1,5 @@
+ace:
+- 8.0.1
 c_compiler:
 - vs2019
 c_stdlib:
@@ -12,6 +14,8 @@ jsoncpp:
 - 1.9.6
 libabseil:
 - '20240722'
+libprotobuf:
+- 5.27.5
 target_platform:
 - win-64
 zlib:

recipe/meta.yaml

@@ -1,5 +1,5 @@
 # keep this without major version to let the bot pick it up
-{% set version = "27.5" %}
+{% set version = "28.2" %}
 # 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 = "5" %}
@@ -20,20 +20,19 @@ package:
 
 source:
   - url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
-    sha256: 79cc6d09d02706c5a73e900ea842b5b3dae160f371b6654774947fe781851423
+    sha256: b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db
     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
+      - patches/0001-set-static-lib-extension-on-windows.patch
+      - patches/0002-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/0003-Export-functions-in-google-compiler-java-names.patch
+      - patches/0004-do-not-install-vendored-gmock.patch
       # skip annoyingly flaky test on windows, see
       # https://github.com/protocolbuffers/protobuf/issues/8645
-      - patches/0006-disable-MapImplTest.RandomOrdering-due-to-flakiness.patch      # [win]
+      - patches/0005-disable-MapImplTest.RandomOrdering-due-to-flakiness.patch      # [win]
 
 build:
-  number: 2
+  number: 0
 
 outputs:
   - name: libprotobuf

recipe/patches/0002-set-static-lib-extension-on-windows.patch → recipe/patches/0001-set-static-lib-extension-on-windows.patch

@@ -1,17 +1,17 @@
-From a629ae7b73682fbaea118129a7635975c70eb6dd Mon Sep 17 00:00:00 2001
+From 7e42d50fd7d3acf137ac7ff7be709c05d06c7f8e Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sun, 4 Sep 2022 10:57:08 +0200
-Subject: [PATCH 2/6] set static lib extension on windows
+Subject: [PATCH 1/5] set static lib extension on windows
 
 ---
  CMakeLists.txt | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a4e678..75b0536 100644
+index b269fff..615fba8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -339,6 +339,12 @@ else ()
+@@ -342,6 +342,12 @@ else ()
    endif ()
  endif ()
 

recipe/patches/0003-always-look-for-shared-abseil-builds.patch → recipe/patches/0002-always-look-for-shared-abseil-builds.patch

@@ -1,7 +1,7 @@
-From ce5bee54d8f6cb52ac550c6e06828912afd79561 Mon Sep 17 00:00:00 2001
+From f5b56d5232dce108e4904f6cb66c67a4b2389772 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sat, 13 May 2023 22:43:45 +1100
-Subject: [PATCH 3/6] always look for shared abseil builds
+Subject: [PATCH 2/5] always look for shared abseil builds
 
 ---
  cmake/abseil-cpp.cmake | 2 +-

recipe/patches/0004-Export-functions-in-google-compiler-java-names.patch → recipe/patches/0003-Export-functions-in-google-compiler-java-names.patch

@@ -1,17 +1,17 @@
-From 06d16c4022e1dab98eca5f36b643946b4c866aef Mon Sep 17 00:00:00 2001
+From a1a3810d0e86448e0efa9067d06865207c4035d8 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <[email protected]>
 Date: Wed, 14 Jun 2023 11:36:55 +0200
-Subject: [PATCH 4/6] Export functions in google::compiler::java::names
+Subject: [PATCH 3/5] Export functions in google::compiler::java::names
 
 ---
- src/google/protobuf/compiler/java/names.h | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
+ src/google/protobuf/compiler/java/names.h | 26 +++++++++++------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/src/google/protobuf/compiler/java/names.h b/src/google/protobuf/compiler/java/names.h
-index d6402fc..a4e89dd 100644
+index c2eb34c..426742a 100644
 --- a/src/google/protobuf/compiler/java/names.h
 +++ b/src/google/protobuf/compiler/java/names.h
-@@ -41,73 +41,73 @@ namespace java {
+@@ -41,35 +41,35 @@ namespace java {
  //
  // Returns:
  //   The fully-qualified Java class name.
@@ -52,6 +52,22 @@ index d6402fc..a4e89dd 100644
                              Options options = {});
 
  // Requires:
+@@ -77,51 +77,51 @@ std::string FileJavaPackage(const FileDescriptor* descriptor,
+ //
+ // Returns:
+ //   Java package directory.
+-std::string JavaPackageDirectory(const FileDescriptor* file);
++PROTOC_EXPORT std::string JavaPackageDirectory(const FileDescriptor* file);
+
+ // Requires:
+ //   descriptor != NULL
+ //
+ // Returns:
+ //   The unqualified Java class name.
+-std::string FileClassName(const FileDescriptor* file);
++PROTOC_EXPORT std::string FileClassName(const FileDescriptor* file);
+
+ // Requires:
  //   descriptor != NULL
  // Returns:
  //   Capitalized camel case field name.

recipe/patches/0005-do-not-install-vendored-gmock.patch → recipe/patches/0004-do-not-install-vendored-gmock.patch

@@ -1,7 +1,7 @@
-From 20407e25e5187a88ba2ea579d725ac357b1b6907 Mon Sep 17 00:00:00 2001
+From 07c82abcecf368d838c2cb7238e748cae5e2188f Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Wed, 9 Aug 2023 14:06:35 +1100
-Subject: [PATCH 5/6] do not install vendored gmock
+Subject: [PATCH 4/5] do not install vendored gmock
 
 ---
  cmake/install.cmake | 7 -------

recipe/patches/0006-disable-MapImplTest.RandomOrdering-due-to-flakiness.patch → recipe/patches/0005-disable-MapImplTest.RandomOrdering-due-to-flakiness.patch

@@ -1,18 +1,18 @@
-From 44d5fabfe3bf688df482653bacc7e0b03e93a797 Mon Sep 17 00:00:00 2001
+From 5e664bba6f15971b559219876e68b731c895ce53 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Tue, 20 Feb 2024 22:21:55 +1100
-Subject: [PATCH 6/6] disable MapImplTest.RandomOrdering due to flakiness
+Subject: [PATCH 5/5] disable MapImplTest.RandomOrdering due to flakiness
 
 see https://google.github.io/googletest/advanced.html#temporarily-disabling-tests
 ---
  src/google/protobuf/map_test.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/google/protobuf/map_test.inc b/src/google/protobuf/map_test.inc
-index fe66d9c..3bb8df7 100644
+index 4b75234..0a6a356 100644
 --- a/src/google/protobuf/map_test.inc
 +++ b/src/google/protobuf/map_test.inc
-@@ -1349,7 +1349,7 @@ bool MapOrderingIsRandom(int a, int b) {
+@@ -1350,7 +1350,7 @@ bool MapOrderingIsRandom(int a, int b) {
 
  // This test verifies that the iteration order is reasonably random even for
  // small maps.