From 169e85d98e62decdaa6fe5bb9eb56146a5136afe Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 14 Jun 2023 18:38:06 +0000 Subject: [PATCH 1/2] updated v23.3 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a86af78..3febc8e 100644 --- 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 = "23.2" %} +{% set version = "23.3" %} # 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,7 +12,7 @@ package: source: - url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 0b0395d34e000f1229679e10d984ed7913078f3dd7f26cf0476467f5e65716f4 + sha256: 4e176116949be52b0408dfd24f8925d1eb674a781ae242a75296b17a1c721395 patches: - patches/0001-use-consistent-cmake-location.patch - patches/0002-set-static-lib-extension-on-windows.patch @@ -28,7 +28,7 @@ source: - patches/0009-Export-functions-in-google-compiler-java-names.patch build: - number: 5 + number: 0 outputs: - name: libprotobuf From 183fa4f61ef15b7375f28ad26e518c73b66a4c29 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 15 Jun 2023 16:34:59 +1100 Subject: [PATCH 2/2] rebase patches --- recipe/meta.yaml | 6 +- .../0001-use-consistent-cmake-location.patch | 9 +- ...-set-static-lib-extension-on-windows.patch | 9 +- ...tion-of-system-provided-jsoncpp-1257.patch | 11 +- ...always-look-for-shared-abseil-builds.patch | 13 +- ...-be-more-lenient-with-abseil-version.patch | 9 +- ...tions-in-google-compiler-java-names.patch} | 9 +- ...at-workaround-for-DOMAIN-macro-12903.patch | 244 ------------------ ...g-PROTOBUF_EXPORT-for-public-symbols.patch | 32 --- ..._dll-target-name-when-using-find_pac.patch | 51 ---- 10 files changed, 22 insertions(+), 371 deletions(-) rename recipe/patches/{0009-Export-functions-in-google-compiler-java-names.patch => 0006-Export-functions-in-google-compiler-java-names.patch} (94%) delete mode 100644 recipe/patches/0006-feat-workaround-for-DOMAIN-macro-12903.patch delete mode 100644 recipe/patches/0007-fix-missing-PROTOBUF_EXPORT-for-public-symbols.patch delete mode 100644 recipe/patches/0008-CMake-Fix-abseil_dll-target-name-when-using-find_pac.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3febc8e..0543195 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,12 +20,8 @@ source: - patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch - patches/0004-always-look-for-shared-abseil-builds.patch - patches/0005-be-more-lenient-with-abseil-version.patch - # backports from https://github.com/protocolbuffers/protobuf/pull/12987 (3 commits) - - patches/0006-feat-workaround-for-DOMAIN-macro-12903.patch - - patches/0007-fix-missing-PROTOBUF_EXPORT-for-public-symbols.patch - - patches/0008-CMake-Fix-abseil_dll-target-name-when-using-find_pac.patch # grpc_cpp_java_plugin links against otherwise internal symbols - - patches/0009-Export-functions-in-google-compiler-java-names.patch + - patches/0006-Export-functions-in-google-compiler-java-names.patch build: number: 0 diff --git a/recipe/patches/0001-use-consistent-cmake-location.patch b/recipe/patches/0001-use-consistent-cmake-location.patch index b6edd06..f3e603d 100644 --- a/recipe/patches/0001-use-consistent-cmake-location.patch +++ b/recipe/patches/0001-use-consistent-cmake-location.patch @@ -1,14 +1,14 @@ -From 09c7fc2f822ce64ed95b69cd190b36878f96d9e0 Mon Sep 17 00:00:00 2001 +From 1a0df0ca9e8d5320556ca15ed1685d578a98500c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:48:04 +0200 -Subject: [PATCH 1/9] use consistent cmake location +Subject: [PATCH 1/6] use consistent cmake location --- cmake/install.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cmake/install.cmake b/cmake/install.cmake -index e7eb210..24d7a3e 100644 +index e7eb2103b..24d7a3ec9 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -84,15 +84,9 @@ set(_install_cmakedir_desc "Directory relative to CMAKE_INSTALL to install the c @@ -30,6 +30,3 @@ index e7eb210..24d7a3e 100644 set(CMAKE_BUILD_CMAKEDIR "${CMAKE_CURRENT_BINARY_DIR}/${protobuf_CMAKE_SUBDIR}" CACHE STRING "${_build_cmakedir_desc}") mark_as_advanced(protobuf_CMAKE_SUBDIR) mark_as_advanced(CMAKE_BUILD_CMAKEDIR) --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0002-set-static-lib-extension-on-windows.patch b/recipe/patches/0002-set-static-lib-extension-on-windows.patch index 7e5faf8..b339525 100644 --- a/recipe/patches/0002-set-static-lib-extension-on-windows.patch +++ b/recipe/patches/0002-set-static-lib-extension-on-windows.patch @@ -1,14 +1,14 @@ -From 9153376cb056ac871eb4dfb4e8a89f5ae07c2ab8 Mon Sep 17 00:00:00 2001 +From 8e995af87c7cc4ac02f573dc10364765b7b0adfb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Sep 2022 10:57:08 +0200 -Subject: [PATCH 2/9] set static lib extension on windows +Subject: [PATCH 2/6] set static lib extension on windows --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fb018b..61e9ac3 100644 +index dc09f63db..d0015b799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,6 +371,12 @@ else () @@ -24,6 +24,3 @@ index 1fb018b..61e9ac3 100644 # Ensure we have a protoc executable and protobuf libraries if we need one if (protobuf_BUILD_TESTS OR protobuf_BUILD_CONFORMANCE OR protobuf_BUILD_EXAMPLES) if (NOT DEFINED protobuf_PROTOC_EXE) --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch b/recipe/patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch index 76c5249..2f71fa7 100644 --- a/recipe/patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch +++ b/recipe/patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch @@ -1,7 +1,7 @@ -From b016914542095d63cf9e52378390540273c42407 Mon Sep 17 00:00:00 2001 +From e29e3dc895a1dcd60d0a955dbc63f848a0c14e66 Mon Sep 17 00:00:00 2001 From: Mike Rochefort Date: Mon, 1 May 2023 09:34:17 -0700 -Subject: [PATCH 3/9] Enable the selection of system provided jsoncpp (#12577) +Subject: [PATCH 3/6] Enable the selection of system provided jsoncpp (#12577) Allows the use of an external `jsoncpp` library to be used. Replicates the model used by `abseil-cpp` as a "package" or "module" to the `protobuf_JSONCPP_PROVIDER` option. @@ -17,7 +17,7 @@ PiperOrigin-RevId: 528492610 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61e9ac3..3db1d0e 100644 +index d0015b799..ae0fd1c64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -332,6 +332,9 @@ endif (protobuf_UNICODE) @@ -31,7 +31,7 @@ index 61e9ac3..3db1d0e 100644 include(${protobuf_SOURCE_DIR}/cmake/gtest.cmake) endif (protobuf_BUILD_TESTS) diff --git a/cmake/conformance.cmake b/cmake/conformance.cmake -index 61ac25a..6ba9050 100644 +index 61ac25a0d..6ba9050af 100644 --- a/cmake/conformance.cmake +++ b/cmake/conformance.cmake @@ -1,12 +1,15 @@ @@ -73,6 +73,3 @@ index 61ac25a..6ba9050 100644 +else() + target_link_libraries(conformance_test_runner jsoncpp) +endif() --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0004-always-look-for-shared-abseil-builds.patch b/recipe/patches/0004-always-look-for-shared-abseil-builds.patch index d1f6428..902da1d 100644 --- a/recipe/patches/0004-always-look-for-shared-abseil-builds.patch +++ b/recipe/patches/0004-always-look-for-shared-abseil-builds.patch @@ -1,14 +1,14 @@ -From a70dac74e264567943e07e8753330505c4413cda Mon Sep 17 00:00:00 2001 +From 137cfa12dbc793c2358e8048dde9b35d4e77292d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 13 May 2023 22:43:45 +1100 -Subject: [PATCH 4/9] always look for shared abseil builds +Subject: [PATCH 4/6] always look for shared abseil builds --- cmake/abseil-cpp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index e7bfb2b..32310f5 100644 +index b50fb89e6..b07e63f26 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -37,7 +37,7 @@ elseif(protobuf_ABSL_PROVIDER STREQUAL "package") @@ -18,8 +18,5 @@ index e7bfb2b..32310f5 100644 -if (BUILD_SHARED_LIBS AND MSVC) +if (MSVC) # On MSVC Abseil is bundled into a single DLL. - set(protobuf_ABSL_USED_TARGETS abseil_dll) - --- -2.39.2 (Apple Git-143) - + # This condition is necessary as of abseil 20230125.3 when abseil is consumed via add_subdirectory, + # the abseil_dll target is named abseil_dll, while if abseil is consumed via find_package, the target diff --git a/recipe/patches/0005-be-more-lenient-with-abseil-version.patch b/recipe/patches/0005-be-more-lenient-with-abseil-version.patch index 559337b..1849555 100644 --- a/recipe/patches/0005-be-more-lenient-with-abseil-version.patch +++ b/recipe/patches/0005-be-more-lenient-with-abseil-version.patch @@ -1,7 +1,7 @@ -From 58bde6be0e9e355ca5b1219ea1d7313cda8a27d1 Mon Sep 17 00:00:00 2001 +From 905908b06fdc6a30c395d4648af67cf5cb5afe67 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 18 May 2023 09:02:21 +1100 -Subject: [PATCH 5/9] be more lenient with abseil version +Subject: [PATCH 5/6] be more lenient with abseil version we carry the patch for the only pertinent difference between .2 & .3 anyway @@ -10,7 +10,7 @@ between .2 & .3 anyway 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc -index 18d7ccf..90f58f6 100644 +index 644bb87e0..94755d9fa 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -216,7 +216,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and @@ -22,6 +22,3 @@ index 18d7ccf..90f58f6 100644 "Protobuf only supports Abseil version 20230125.3 and newer."); // Future versions of protobuf will include breaking changes to some APIs. --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0009-Export-functions-in-google-compiler-java-names.patch b/recipe/patches/0006-Export-functions-in-google-compiler-java-names.patch similarity index 94% rename from recipe/patches/0009-Export-functions-in-google-compiler-java-names.patch rename to recipe/patches/0006-Export-functions-in-google-compiler-java-names.patch index 3d23bc4..08a7512 100644 --- a/recipe/patches/0009-Export-functions-in-google-compiler-java-names.patch +++ b/recipe/patches/0006-Export-functions-in-google-compiler-java-names.patch @@ -1,14 +1,14 @@ -From e22594d73a25056925cd56a02ea7fd447b86cb75 Mon Sep 17 00:00:00 2001 +From d84ed5304325e4321a3c86c255a87868f72eb371 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 14 Jun 2023 11:36:55 +0200 -Subject: [PATCH 9/9] Export functions in google::compiler::java::names +Subject: [PATCH 6/6] Export functions in google::compiler::java::names --- src/google/protobuf/compiler/java/names.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/google/protobuf/compiler/java/names.h b/src/google/protobuf/compiler/java/names.h -index ddfc8e6..f26004c 100644 +index ddfc8e65d..f26004cd7 100644 --- a/src/google/protobuf/compiler/java/names.h +++ b/src/google/protobuf/compiler/java/names.h @@ -63,67 +63,67 @@ namespace java { @@ -89,6 +89,3 @@ index ddfc8e6..f26004c 100644 } // namespace java --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0006-feat-workaround-for-DOMAIN-macro-12903.patch b/recipe/patches/0006-feat-workaround-for-DOMAIN-macro-12903.patch deleted file mode 100644 index 016fe98..0000000 --- a/recipe/patches/0006-feat-workaround-for-DOMAIN-macro-12903.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 622565b7d67dcec1fd4c7da71f60d092ec320bd3 Mon Sep 17 00:00:00 2001 -From: Carlos O'Ryan -Date: Fri, 26 May 2023 10:10:47 -0700 -Subject: [PATCH 6/9] feat: workaround for `DOMAIN` macro (#12903) - -This is a macro on some (older) versions of GCC, and macOS, and Windows. Sigh. I moved the `#undef` block to a common section. I also took the opportunity to add a regression test for all these macros that need to be `#undef`'d. - -Part of the work for googleapis/google-cloud-cpp#8125 - -Closes #12903 - -PiperOrigin-RevId: 535649278 ---- - src/file_lists.cmake | 1 + - src/google/protobuf/BUILD.bazel | 2 + - src/google/protobuf/port_def.inc | 22 +++-- - src/google/protobuf/port_undef.inc | 12 ++- - .../protobuf/unittest_proto3_bad_macros.proto | 98 +++++++++++++++++++ - 5 files changed, 123 insertions(+), 12 deletions(-) - create mode 100644 src/google/protobuf/unittest_proto3_bad_macros.proto - -diff --git a/src/file_lists.cmake b/src/file_lists.cmake -index da030df..8b48f6b 100644 ---- a/src/file_lists.cmake -+++ b/src/file_lists.cmake -@@ -666,6 +666,7 @@ set(protobuf_test_protos_files - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto -+ ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_bad_macros.proto - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto - ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_retention.proto -diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel -index 77ed230..91827d9 100644 ---- a/src/google/protobuf/BUILD.bazel -+++ b/src/google/protobuf/BUILD.bazel -@@ -645,6 +645,7 @@ filegroup( - "unittest_proto3.proto", - "unittest_proto3_arena.proto", - "unittest_proto3_arena_lite.proto", -+ "unittest_proto3_bad_macros.proto", - "unittest_proto3_lite.proto", - "unittest_proto3_optional.proto", - "unittest_retention.proto", -@@ -702,6 +703,7 @@ proto_library( - "unittest_proto3.proto", - "unittest_proto3_arena.proto", - "unittest_proto3_arena_lite.proto", -+ "unittest_proto3_bad_macros.proto", - "unittest_proto3_lite.proto", - "unittest_proto3_optional.proto", - "unittest_retention.proto", -diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc -index 90f58f6..24278ab 100644 ---- a/src/google/protobuf/port_def.inc -+++ b/src/google/protobuf/port_def.inc -@@ -888,11 +888,18 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 2), - #undef PACKAGE - #endif - --// autoheader defines this in some circumstances --#ifdef PACKAGE --#define PROTOBUF_DID_UNDEF_PACKAGE --#pragma push_macro("PACKAGE") --#undef PACKAGE -+// a few common headers define this -+#ifdef PACKED -+#define PROTOBUF_DID_UNDEF_PACKED -+#pragma push_macro("PACKED") -+#undef PACKED -+#endif -+ -+// This is a macro on Windows, macOS, and some variants of GCC. -+#ifdef DOMAIN -+#define PROTOBUF_DID_UNDEF_DOMAIN -+#pragma push_macro("DOMAIN") -+#undef DOMAIN - #endif - - // linux is a legacy MACRO defined in most popular C++ standards. -@@ -909,8 +916,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 2), - #undef CREATE_NEW - #pragma push_macro("DELETE") - #undef DELETE --#pragma push_macro("DOMAIN") --#undef DOMAIN - #pragma push_macro("DOUBLE_CLICK") - #undef DOUBLE_CLICK - #pragma push_macro("ERROR") -@@ -968,9 +973,6 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 2), - #endif // _WIN32 - - #ifdef __APPLE__ --// Inconvenient macro names from usr/include/math.h in some macOS SDKs. --#pragma push_macro("DOMAIN") --#undef DOMAIN - // Inconvenient macro names from /usr/include/mach/boolean.h in some macOS SDKs. - #pragma push_macro("TRUE") - #undef TRUE -diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc -index e9eae06..cee6f8b 100644 ---- a/src/google/protobuf/port_undef.inc -+++ b/src/google/protobuf/port_undef.inc -@@ -128,6 +128,16 @@ - #undef PROTOBUF_DID_UNDEF_PACKAGE - #endif - -+#ifdef PROTOBUF_DID_UNDEF_PACKED -+#pragma pop_macro("PACKED") -+#undef PROTOBUF_DID_UNDEF_PACKED -+#endif -+ -+#ifdef PROTOBUF_DID_UNDEF_DOMAIN -+#pragma pop_macro("DOMAIN") -+#undef PROTOBUF_DID_UNDEF_DOMAIN -+#endif -+ - #ifdef PROTOBUF_DID_UNDEF_LINUX - #pragma pop_macro("linux") - #endif -@@ -135,7 +145,6 @@ - #ifdef _WIN32 - #pragma pop_macro("CREATE_NEW") - #pragma pop_macro("DELETE") --#pragma pop_macro("DOMAIN") - #pragma pop_macro("DOUBLE_CLICK") - #pragma pop_macro("ERROR") - #pragma pop_macro("ERROR_BUSY") -@@ -166,7 +175,6 @@ - #endif - - #ifdef __APPLE__ --#pragma pop_macro("DOMAIN") - #pragma pop_macro("TRUE") - #pragma pop_macro("FALSE") - #pragma pop_macro("UID_MAX") -diff --git a/src/google/protobuf/unittest_proto3_bad_macros.proto b/src/google/protobuf/unittest_proto3_bad_macros.proto -new file mode 100644 -index 0000000..7d245b5 ---- /dev/null -+++ b/src/google/protobuf/unittest_proto3_bad_macros.proto -@@ -0,0 +1,98 @@ -+// Protocol Buffers - Google's data interchange format -+// Copyright 2023 Google Inc. All rights reserved. -+// https://developers.google.com/protocol-buffers/ -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions are -+// met: -+// -+// * Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// * Redistributions in binary form must reproduce the above -+// copyright notice, this list of conditions and the following disclaimer -+// in the documentation and/or other materials provided with the -+// distribution. -+// * Neither the name of Google Inc. nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+syntax = "proto3"; -+ -+package protobuf_unittest; -+ -+option csharp_namespace = "ProtobufUnittest"; -+option java_multiple_files = true; -+option java_package = "com.google.protobuf.testing.proto"; -+ -+// `google/protobuf/port_def.inc` #undef's a number of inconvenient macros -+// defined in system headers under varying circumstances. The code generated -+// from this file will not compile if those `#undef` calls are accidentally -+// removed. -+ -+// This generates `GID_MAX`, which is a macro in some circumstances. -+enum GID { -+ GID_UNUSED = 0; -+} -+ -+// This generates `UID_MAX`, which is a mcro in some circumstances. -+enum UID { -+ UID_UNUSED = 0; -+} -+ -+// Just a container for bad macro names. Some of these do not follow the normal -+// naming conventions, this is intentional, we just want to trigger a build -+// failure if the macro is left defined. -+enum BadNames { -+ // autoheader defines this in some circumstances. -+ PACKAGE = 0; -+ // The comment says "a few common headers define this". -+ PACKED = 1; -+ // Defined in many Linux system headers. -+ linux = 2; -+ // This is often a macro in ``. -+ DOMAIN = 3; -+ // These are defined in both Windows and macOS headers. -+ TRUE = 4; -+ FALSE = 5; -+ // Sometimes defined in Windows system headers. -+ CREATE_NEW = 6; -+ DELETE = 7; -+ DOUBLE_CLICK = 8; -+ ERROR = 9; -+ ERROR_BUSY = 10; -+ ERROR_INSTALL_FAILED = 11; -+ ERROR_NOT_FOUND = 12; -+ GetClassName = 13; -+ GetCurrentTime = 14; -+ GetMessage = 15; -+ GetObject = 16; -+ IGNORE = 17; -+ IN = 18; -+ INPUT_KEYBOARD = 19; -+ NO_ERROR = 20; -+ OUT = 21; -+ OPTIONAL = 22; -+ NEAR = 23; -+ NO_DATA = 24; -+ REASON_UNKNOWN = 25; -+ SERVICE_DISABLED = 26; -+ SEVERITY_ERROR = 27; -+ STATUS_PENDING = 28; -+ STRICT = 29; -+ // Sometimed defined in macOS system headers. -+ TYPE_BOOL = 30; -+ // Defined in macOS, Windows, and Linux headers. -+ DEBUG = 31; -+} --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0007-fix-missing-PROTOBUF_EXPORT-for-public-symbols.patch b/recipe/patches/0007-fix-missing-PROTOBUF_EXPORT-for-public-symbols.patch deleted file mode 100644 index 9167e4e..0000000 --- a/recipe/patches/0007-fix-missing-PROTOBUF_EXPORT-for-public-symbols.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ff5ccc100ef05ee0feaee122cccf65e525c05d9a Mon Sep 17 00:00:00 2001 -From: Protobuf Team Bot -Date: Thu, 1 Jun 2023 09:14:48 -0700 -Subject: [PATCH 7/9] fix: missing `PROTOBUF_EXPORT` for public symbols - -PiperOrigin-RevId: 537042088 ---- - src/google/protobuf/io/strtod.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/google/protobuf/io/strtod.h b/src/google/protobuf/io/strtod.h -index 851c8e6..b368e4d 100644 ---- a/src/google/protobuf/io/strtod.h -+++ b/src/google/protobuf/io/strtod.h -@@ -60,12 +60,12 @@ PROTOBUF_EXPORT std::string SimpleFtoa(float value); - - // A locale-independent version of the standard strtod(), which always - // uses a dot as the decimal separator. --double NoLocaleStrtod(const char* str, char** endptr); -+PROTOBUF_EXPORT double NoLocaleStrtod(const char* str, char** endptr); - - // Casts a double value to a float value. If the value is outside of the - // representable range of float, it will be converted to positive or negative - // infinity. --float SafeDoubleToFloat(double value); -+PROTOBUF_EXPORT float SafeDoubleToFloat(double value); - - } // namespace io - } // namespace protobuf --- -2.39.2 (Apple Git-143) - diff --git a/recipe/patches/0008-CMake-Fix-abseil_dll-target-name-when-using-find_pac.patch b/recipe/patches/0008-CMake-Fix-abseil_dll-target-name-when-using-find_pac.patch deleted file mode 100644 index 2e578ad..0000000 --- a/recipe/patches/0008-CMake-Fix-abseil_dll-target-name-when-using-find_pac.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 49e7e77ff46e9811c989f32405b72dc83b020f32 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Mon, 5 Jun 2023 15:01:50 -0700 -Subject: [PATCH 8/9] CMake: Fix abseil_dll target name when using - find_package(absl) (#12978) - -This additional if is necessary as of abseil 20230125.3 when abseil is consumed via add_subdirectory, -the abseil_dll target is named abseil_dll, while if abseil is consumed via find_package, the target is called `absl::abseil_dll` . - -Once https://github.com/abseil/abseil-cpp/pull/1466 is merged and released in the minimum version of abseil required by protobuf, it is possible to always link `absl::abseil_dll` and `absl::abseil_test_dll` and remove the if. - -You may wonder how linking worked at all before when `protobuf_ABSL_PROVIDER STREQUAL "package"`, as `abseil_dll` was not an imported target defined by `find_package(absl)`. The reason behind this is that if a name that is not an imported target is passed to `target_link_libraries`, it is just regarded as a C++ library name. So, in the end the `abseil_dll` library was correctly linked, simply all the transitive usage requirements defined by the `absl::abseil_dll` target were not propagated, that could lead to compilation errors if abseil was compiled with the `ABSL_PROPAGATE_CXX_STD` CMake option enabled. - -Closes #12978 - -COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12978 from traversaro:patch-1 39dd074281161fa0c4be69035d33b41a50e048c2 -PiperOrigin-RevId: 537990391 ---- - cmake/abseil-cpp.cmake | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index 32310f5..b07e63f 100644 ---- a/cmake/abseil-cpp.cmake -+++ b/cmake/abseil-cpp.cmake -@@ -39,9 +39,19 @@ set(_protobuf_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFI - - if (MSVC) - # On MSVC Abseil is bundled into a single DLL. -- set(protobuf_ABSL_USED_TARGETS abseil_dll) -- -- set(protobuf_ABSL_USED_TEST_TARGETS abseil_test_dll) -+ # This condition is necessary as of abseil 20230125.3 when abseil is consumed via add_subdirectory, -+ # the abseil_dll target is named abseil_dll, while if abseil is consumed via find_package, the target -+ # is called absl::abseil_dll -+ # Once https://github.com/abseil/abseil-cpp/pull/1466 is merged and released in the minimum version of -+ # abseil required by protobuf, it is possible to always link absl::abseil_dll and absl::abseil_test_dll -+ # and remove the if -+ if(protobuf_ABSL_PROVIDER STREQUAL "package") -+ set(protobuf_ABSL_USED_TARGETS absl::abseil_dll) -+ set(protobuf_ABSL_USED_TEST_TARGETS absl::abseil_test_dll) -+ else() -+ set(protobuf_ABSL_USED_TARGETS abseil_dll) -+ set(protobuf_ABSL_USED_TEST_TARGETS abseil_test_dll) -+ endif() - else() - set(protobuf_ABSL_USED_TARGETS - absl::absl_check --- -2.39.2 (Apple Git-143) -