Bladeren bron

Auto-update protobuf-cpp to 27.0 (#4144)

* Update protobuf-cpp to 27.0

* add patch

---------

Co-authored-by: star9029 <[email protected]>
ruki 1 jaar geleden
bovenliggende
commit
b24e1803eb
2 gewijzigde bestanden met toevoegingen van 6 en 16 verwijderingen
  1. 0 13
      packages/p/protobuf-cpp/patches/26.1/use_abseil_links.patch
  2. 6 3
      packages/p/protobuf-cpp/xmake.lua

+ 0 - 13
packages/p/protobuf-cpp/patches/26.1/use_abseil_links.patch

@@ -1,13 +0,0 @@
-diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
-index a4e9d22..5e5d4d5 100644
---- a/cmake/abseil-cpp.cmake
-+++ b/cmake/abseil-cpp.cmake
-@@ -37,7 +37,7 @@ elseif(protobuf_ABSL_PROVIDER STREQUAL "package")
- endif()
- set(_protobuf_FIND_ABSL "if(NOT TARGET absl::strings)\n  find_package(absl CONFIG)\nendif()")
- 
--if (BUILD_SHARED_LIBS AND MSVC)
-+if (FALSE)
-   # On MSVC Abseil is bundled into a single 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

+ 6 - 3
packages/p/protobuf-cpp/xmake.lua

@@ -11,6 +11,8 @@ package("protobuf-cpp")
         end
     end})
 
+    add_versions("27.0", "3e1148db090ff21226c1888ef39fa7bc7790042be21ff4289fd21ce1735f3455")
+    add_versions("26.1", "e15c272392df84ae95797759c685a9225fe5e88838bab3e0650c29239bdfccdd")
     add_versions("3.8.0", "91ea92a8c37825bd502d96af9054064694899c5c7ecea21b8d11b1b5e7e993b5")
 	add_versions("3.12.0", "da826a3c48a9cae879928202d6fe06afb15aaee129e9035d6510cc776ddfa925")
     add_versions("3.12.3", "74da289e0d0c24b2cb097f30fdc09fa30754175fd5ebb34fae4032c6d95d4ce3")
@@ -20,11 +22,9 @@ package("protobuf-cpp")
     add_versions("3.15.8", "093e0dca5277b377c36a48a3633325dca3d92d68ac17d5700a1f7e1c3eca2793")
     add_versions("3.17.3", "fe65f4bfbd6cbb8c23de052f218cbe4ebfeb72c630847e0cca63eb27616c952a")
     add_versions("3.19.4", "a11a262a395f999f9dca83e195cc15b6c23b6d5e74133f8e3250ad0950485da1")
-    add_versions("26.1", "e15c272392df84ae95797759c685a9225fe5e88838bab3e0650c29239bdfccdd")
 
     add_patches("3.17.3", path.join(os.scriptdir(), "patches", "3.17.3", "field_access_listener.patch"), "ac9bdf49611b01e563fe74b2aaf1398214129454c3e18f1198245549eb281e85")
     add_patches("3.19.4", path.join(os.scriptdir(), "patches", "3.19.4", "vs_runtime.patch"), "8e73e585d29f3b9dca3c279df0b11b3ee7651728c07f51381a69e5899b93c367")
-    add_patches("26.1", path.join(os.scriptdir(), "patches", "26.1", "use_abseil_links.patch"), "123e3f4b0c602f3fc0470d58cd1be1837ddf41da070d5299041b5891595b2487")
 
     add_configs("zlib", {description = "Enable zlib", default = false, type = "boolean"})
 
@@ -55,7 +55,10 @@ package("protobuf-cpp")
             os.cd("cmake")
         end
         io.replace("CMakeLists.txt", "set(protobuf_DEBUG_POSTFIX \"d\"", "set(protobuf_DEBUG_POSTFIX \"\"", {plain = true})
-     
+        if package:version():ge("26.1") then
+            io.replace("cmake/abseil-cpp.cmake", "BUILD_SHARED_LIBS AND MSVC", "FALSE", {plain = true})
+        end
+
         local configs = {"-Dprotobuf_BUILD_TESTS=OFF", "-Dprotobuf_BUILD_PROTOC_BINARIES=ON"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))