Skip to content
Snippets Groups Projects
Commit 47e8a352 authored by Krassy Boykinov's avatar Krassy Boykinov Committed by Kevin Daudt
Browse files

main/protobuf: upgrade to 24.4

parent 9f2507fd
No related branches found
No related tags found
1 merge request!51119main/protobuf: upgrade to 24.4
......@@ -2,9 +2,9 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=protobuf
_gemname=google-protobuf
pkgver=23.4
_rubyver=3.23.4
pkgrel=1
pkgver=24.4
_rubyver=3.$pkgver
pkgrel=0
pkgdesc="Library for extensible, efficient structure packing"
url="https://github.com/protocolbuffers/protobuf"
arch="all"
......@@ -158,11 +158,11 @@ lite() {
}
sha512sums="
b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566 protobuf-23.4.tar.gz
52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315 protobuf-24.4.tar.gz
0d46d105a0670ab5cfcb04ed534927a71613234a88efede0b20d426e1caaa708e6ff275a09c5dab7786fe26e69e0882f022b893302e4869006b4ac55fc6172e5 exclude.patch
16b8ee0e50dbb2144ddb83654a63e410b4218e667b6b8b77c7b6f9797508f63c3e8be0f9711841bb6ebbed0883cda2394b219a62b468240f65f4dac418b5a56e protoc-cmake.patch
0cb202a6151ae3746c09e85f2e4ce9abb0d810d4a3c84cb647fde407cf8d13894d3c9b340e06d7a3a85669da1899db265d26d8309d59249f841a40a66e045c83 ruby-fix-cflags.patch
b5070f8e150920c316130ba40f46c66eefddc634844f5d6b8ee11f6824a3707b3e74f68aa0612c16305bf096050214c6120e693225e07e0cea80e68a7830f863 skip-failing-tests.patch
46b6644ccf6e142ef26cddd818466caab2696b685f3865061fe0e45b65cefc5598add4a8479842ca1aae948d37b3c2c6944913c62a00422fa91b694277986c73 skip-failing-tests.patch
850dc1d6fd3ea01f1689fd700ac35e7da0882092ab34c616702e01bdf4b5327b8ab27381ecf291431a94f54c89d31707a4a171929937e880543974cb64f9e685 soversion.patch
13514a456a50d7243baa23fe43586fc4544cda87b9e2a5afe9d2fac8afca8e8853f9b42232c3fff4c5cf2df443af32f944f451daa1d604d80fd03ee4e7abed3e trim-rakefile.patch
"
diff --git a/src/google/protobuf/any_test.cc b/src/google/protobuf/any_test.cc
index 8b544d9..0f27dbe 100644
--- a/src/google/protobuf/any_test.cc
+++ b/src/google/protobuf/any_test.cc
@@ -62,13 +62,6 @@ TEST(AnyTest, TestPackAndUnpack) {
@@ -62,16 +62,6 @@
EXPECT_EQ(12345, submessage.int32_value());
}
-TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {
-#if defined(_MSC_VER) && defined(_M_IX86)
- GTEST_SKIP() << "This toolchain can't allocate that much memory.";
-#endif
- protobuf_unittest::TestAny submessage;
- submessage.mutable_text()->resize(INT_MAX, 'a');
- protobuf_unittest::TestAny message;
......@@ -16,71 +17,55 @@ index 8b544d9..0f27dbe 100644
TEST(AnyTest, TestUnpackWithTypeMismatch) {
protobuf_unittest::TestAny payload;
payload.set_int32_value(13);
diff --git a/src/google/protobuf/arena_unittest.cc b/src/google/protobuf/arena_unittest.cc
index 4832cff..aa45a25 100644
--- a/src/google/protobuf/arena_unittest.cc
+++ b/src/google/protobuf/arena_unittest.cc
@@ -1392,11 +1392,11 @@ TEST(ArenaTest, SpaceAllocated_and_Used) {
@@ -1392,11 +1392,9 @@
options.initial_block_size = arena_block.size();
Arena arena_2(options);
EXPECT_EQ(1024, arena_2.SpaceAllocated());
- EXPECT_EQ(0, arena_2.SpaceUsed());
+// EXPECT_EQ(0, arena_2.SpaceUsed());
EXPECT_EQ(1024, arena_2.Reset());
Arena::CreateArray<char>(&arena_2, 55);
EXPECT_EQ(1024, arena_2.SpaceAllocated());
- EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
+// EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
EXPECT_EQ(1024, arena_2.Reset());
}
@@ -1460,11 +1460,11 @@ TEST(ArenaTest, BlockSizeSmallerThanAllocation) {
@@ -1460,11 +1458,9 @@
*Arena::Create<int64_t>(&arena) = 42;
EXPECT_GE(arena.SpaceAllocated(), 8);
- EXPECT_EQ(8, arena.SpaceUsed());
+// EXPECT_EQ(8, arena.SpaceUsed());
*Arena::Create<int64_t>(&arena) = 42;
EXPECT_GE(arena.SpaceAllocated(), 16);
- EXPECT_EQ(16, arena.SpaceUsed());
+// EXPECT_EQ(16, arena.SpaceUsed());
}
}
diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc
index ccd1c9b..f420da3 100644
--- a/src/google/protobuf/extension_set_unittest.cc
+++ b/src/google/protobuf/extension_set_unittest.cc
@@ -871,17 +871,17 @@ TEST(ExtensionSetTest, SpaceUsedExcludingSelf) {
@@ -779,17 +779,11 @@
} while (0)
TEST_REPEATED_EXTENSIONS_SPACE_USED(int32, int32_t, 101);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(int64, int64_t, 102);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(int64, int64_t, 102);
TEST_REPEATED_EXTENSIONS_SPACE_USED(uint32, uint32_t, 103);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(uint64, uint64_t, 104);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(uint64, uint64_t, 104);
TEST_REPEATED_EXTENSIONS_SPACE_USED(sint32, int32_t, 105);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(sint64, int64_t, 106);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(sint64, int64_t, 106);
TEST_REPEATED_EXTENSIONS_SPACE_USED(fixed32, uint32_t, 107);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(fixed64, uint64_t, 108);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(fixed64, uint64_t, 108);
TEST_REPEATED_EXTENSIONS_SPACE_USED(sfixed32, int32_t, 109);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(sfixed64, int64_t, 110);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(sfixed64, int64_t, 110);
TEST_REPEATED_EXTENSIONS_SPACE_USED(float, float, 111);
- TEST_REPEATED_EXTENSIONS_SPACE_USED(double, double, 112);
+ //TEST_REPEATED_EXTENSIONS_SPACE_USED(double, double, 112);
TEST_REPEATED_EXTENSIONS_SPACE_USED(bool, bool, true);
TEST_REPEATED_EXTENSIONS_SPACE_USED(nested_enum, int,
unittest::TestAllTypes::FOO);
diff --git a/src/google/protobuf/wire_format_unittest.inc b/src/google/protobuf/wire_format_unittest.inc
index 4c7d047..7906cfa 100644
TEST_SCALAR_EXTENSIONS_SPACE_USED(int32, 101);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(int64, 102);
TEST_SCALAR_EXTENSIONS_SPACE_USED(uint32, 103);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(uint64, 104);
TEST_SCALAR_EXTENSIONS_SPACE_USED(sint32, 105);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(sint64, 106);
TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed32, 107);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed64, 108);
TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed32, 109);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed64, 110);
TEST_SCALAR_EXTENSIONS_SPACE_USED(float, 111);
- TEST_SCALAR_EXTENSIONS_SPACE_USED(double, 112);
TEST_SCALAR_EXTENSIONS_SPACE_USED(bool, true);
#undef TEST_SCALAR_EXTENSIONS_SPACE_USED
{
--- a/src/google/protobuf/wire_format_unittest.inc
+++ b/src/google/protobuf/wire_format_unittest.inc
@@ -1537,6 +1537,7 @@ TEST_F(Utf8ValidationTest, ParseRepeatedString) {
@@ -1591,6 +1591,7 @@
// Test the old VerifyUTF8String() function, which may still be called by old
// generated code.
......@@ -88,7 +73,7 @@ index 4c7d047..7906cfa 100644
TEST_F(Utf8ValidationTest, OldVerifyUTF8String) {
std::string data(kInvalidUTF8String);
@@ -1555,7 +1556,7 @@ TEST_F(Utf8ValidationTest, OldVerifyUTF8String) {
@@ -1609,7 +1610,7 @@
WireFormat::SERIALIZE);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment