浏览代码

update and fix protobuf (#531)

* Update xmake.lua

add a new version 3.17.9 for protobuf-cpp

* Update xmake.lua

add new version for protobuf-cpp 3.17.3

* fix 3.17.3 for protobuf

Co-authored-by: snowyWhite <[email protected]>
ruki 4 年之前
父节点
当前提交
0c51068376
共有 2 个文件被更改,包括 27 次插入0 次删除
  1. 24 0
      packages/p/protobuf-cpp/patches/3.17.3/field_access_listener.patch
  2. 3 0
      packages/p/protobuf-cpp/xmake.lua

+ 24 - 0
packages/p/protobuf-cpp/patches/3.17.3/field_access_listener.patch

@@ -0,0 +1,24 @@
+diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
+index cd74dbccf..e6fab3bec 100644
+--- a/cmake/libprotobuf-lite.cmake
++++ b/cmake/libprotobuf-lite.cmake
+@@ -3,7 +3,6 @@ set(libprotobuf_lite_files
+   ${protobuf_source_dir}/src/google/protobuf/arena.cc
+   ${protobuf_source_dir}/src/google/protobuf/arenastring.cc
+   ${protobuf_source_dir}/src/google/protobuf/extension_set.cc
+-  ${protobuf_source_dir}/src/google/protobuf/field_access_listener.cc
+   ${protobuf_source_dir}/src/google/protobuf/generated_enum_util.cc
+   ${protobuf_source_dir}/src/google/protobuf/generated_message_table_driven_lite.cc
+   ${protobuf_source_dir}/src/google/protobuf/generated_message_util.cc
+diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
+index 0f6b5cea7..f5a70becb 100644
+--- a/cmake/libprotobuf.cmake
++++ b/cmake/libprotobuf.cmake
+@@ -11,6 +11,7 @@ set(libprotobuf_files
+   ${protobuf_source_dir}/src/google/protobuf/dynamic_message.cc
+   ${protobuf_source_dir}/src/google/protobuf/empty.pb.cc
+   ${protobuf_source_dir}/src/google/protobuf/extension_set_heavy.cc
++  ${protobuf_source_dir}/src/google/protobuf/field_access_listener.cc
+   ${protobuf_source_dir}/src/google/protobuf/field_mask.pb.cc
+   ${protobuf_source_dir}/src/google/protobuf/generated_message_reflection.cc
+   ${protobuf_source_dir}/src/google/protobuf/generated_message_table_driven.cc

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

@@ -9,6 +9,9 @@ package("protobuf-cpp")
     add_versions("3.13.0", "f7b99f47822b0363175a6751ab59ccaa4ee980bf1198f11a4c3cef162698dde3")
     add_versions("3.14.0", "87d6e96166cf5cafc16f2bcfa91c0b54f48bab38538285bee1b9331d992569fa")
     add_versions("3.15.5", "cdd7d3925240af541a95a4361ab100b703bee3a9df0d7e9e05c069cf2c76a039")
+    add_versions("3.17.3", "fe65f4bfbd6cbb8c23de052f218cbe4ebfeb72c630847e0cca63eb27616c952a")
+
+    add_patches("3.17.3", path.join(os.scriptdir(), "patches", "3.17.3", "field_access_listener.patch"), "ac9bdf49611b01e563fe74b2aaf1398214129454c3e18f1198245549eb281e85")
 
     if is_plat("windows") then
         add_deps("cmake")