From b993d29d78d84efda7004a87e4c5da6701e5251f Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Fri, 28 Oct 2022 08:55:27 +0800
Subject: [PATCH] improve proto to support win arm (#1580)

* improve proto to support win arm

* fix patch
---
 packages/p/protobuf-c/patches/1.3.1/342.patch | 23 +++++++++++++++++++
 packages/p/protobuf-c/xmake.lua               |  5 +++-
 packages/p/protobuf-cpp/xmake.lua             |  3 +++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 packages/p/protobuf-c/patches/1.3.1/342.patch

diff --git a/packages/p/protobuf-c/patches/1.3.1/342.patch b/packages/p/protobuf-c/patches/1.3.1/342.patch
new file mode 100644
index 000000000..ccbc370a0
--- /dev/null
+++ b/packages/p/protobuf-c/patches/1.3.1/342.patch
@@ -0,0 +1,23 @@
+From 080724364a5aad61728f8eba57677467bf329088 Mon Sep 17 00:00:00 2001
+From: storyun <joowoni91@gmail.com>
+Date: Wed, 19 Sep 2018 11:34:48 +0900
+Subject: [PATCH] Invalid namespace
+
+google::protobuf::message::Reflaction is not exist namespace.
+---
+ t/generated-code2/cxx-generate-packed-data.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc
+index 4fd3e252..0865d2e4 100644
+--- a/t/generated-code2/cxx-generate-packed-data.cc
++++ b/t/generated-code2/cxx-generate-packed-data.cc
+@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void)
+ static void dump_test_unknown_fields (void)
+ {
+   EmptyMess mess;
+-  const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
++  const google::protobuf::Reflection *reflection = mess.GetReflection();
+   google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
+ 
+ #if GOOGLE_PROTOBUF_VERSION >= 2001000
diff --git a/packages/p/protobuf-c/xmake.lua b/packages/p/protobuf-c/xmake.lua
index 23cee3920..94e37c3eb 100644
--- a/packages/p/protobuf-c/xmake.lua
+++ b/packages/p/protobuf-c/xmake.lua
@@ -9,7 +9,7 @@ package("protobuf-c")
     -- fix "error: no type named 'Reflection' in 'google::protobuf::Message'"
     -- see https://github.com/protobuf-c/protobuf-c/pull/342
     -- and https://github.com/protobuf-c/protobuf-c/issues/356
-    add_patches("1.3.1", "https://github.com/protobuf-c/protobuf-c/pull/342.patch", "050306bae86af55f90606613d3c362c3c93af779aa6be3e639c6a1df3c228c87")
+    add_patches("1.3.1", path.join(os.scriptdir(), "patches", "1.3.1", "342.patch"), "ab78f9eeff2840cacf5b6b143d284e50e43166ec2cbfa78cd47fd8db1e387c6d")
 
     add_deps("protobuf-cpp")
     if is_plat("windows") then
@@ -64,6 +64,9 @@ package("protobuf-c")
     end)
 
     on_test(function (package)
+        if package:is_cross() then
+            return
+        end
         io.writefile("test.proto", [[
             syntax = "proto3";
             package test;
diff --git a/packages/p/protobuf-cpp/xmake.lua b/packages/p/protobuf-cpp/xmake.lua
index c09e73565..6b475951b 100644
--- a/packages/p/protobuf-cpp/xmake.lua
+++ b/packages/p/protobuf-cpp/xmake.lua
@@ -62,6 +62,9 @@ package("protobuf-cpp")
     end)
 
     on_test(function (package)
+        if package:is_cross() then
+            return
+        end
         io.writefile("test.proto", [[
             syntax = "proto3";
             package test;