4 files changed, 198 insertions, 0 deletions
diff --git a/repo/protobuf/protobuf.xibuild b/repo/protobuf/protobuf.xibuild
new file mode 100644
index 0000000..187f3a0
--- /dev/null
+++ b/repo/protobuf/protobuf.xibuild
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+NAME="protobuf"
+DESC="Library for extensible, efficient structure packing"
+
+MAKEDEPS="zlib autoconf automake libtool"
+
+PKG_VER=3.18.1
+SOURCE="https://github.com/google/protobuf/archive/v$PKG_VER.tar.gz"
+
+ADDITIONAL="
+ruby-fix-cflags.patch
+skip-failing-tests.patch
+trim-rakefile.patch
+"
+
+prepare() {
+	apply_patches
+
+	./autogen.sh
+
+	# symlink tests to the test directory
+	rm -rf third_party/googletest
+}
+
+build() {
+	CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -Wno-error" \
+		./configure --prefix=/usr \
+			--sysconfdir=/etc \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$PKG_DEST" install
+}
diff --git a/repo/protobuf/ruby-fix-cflags.patch b/repo/protobuf/ruby-fix-cflags.patch
new file mode 100644
index 0000000..19fddc4
--- /dev/null
+++ b/repo/protobuf/ruby-fix-cflags.patch
@@ -0,0 +1,16 @@
+Using builder flags
+
+--- a/ruby/ext/google/protobuf_c/extconf.rb	2021-10-05 00:43:33.000000000 +0000
++++ b/ruby/ext/google/protobuf_c/extconf.rb	2021-10-06 12:04:49.732008151 +0000
+@@ -3,9 +3,9 @@
+ require 'mkmf'
+ 
+ if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
+-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
++  $CFLAGS += " -std=gnu99 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
+ else
+-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
++  $CFLAGS += " -std=gnu99 -DNDEBUG"
+ end
+ 
+ 
diff --git a/repo/protobuf/skip-failing-tests.patch b/repo/protobuf/skip-failing-tests.patch
new file mode 100644
index 0000000..72a53d3
--- /dev/null
+++ b/repo/protobuf/skip-failing-tests.patch
@@ -0,0 +1,70 @@
+--- a/src/google/protobuf/any_test.cc	2021-10-05 00:43:33.000000000 +0000
++++ a/src/google/protobuf/any_test.cc	2021-10-06 13:28:22.421480279 +0000
+@@ -60,13 +60,6 @@ TEST(AnyTest, TestPackAndUnpack) {
+   EXPECT_EQ(12345, submessage.int32_value());
+ }
+ 
+-TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {
+-  protobuf_unittest::TestAny submessage;
+-  submessage.mutable_text()->resize(INT_MAX, 'a');
+-  protobuf_unittest::TestAny message;
+-  EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
+-}
+-
+ TEST(AnyTest, TestUnpackWithTypeMismatch) {
+   protobuf_unittest::TestAny payload;
+   payload.set_int32_value(13);
+--- a/src/google/protobuf/arena_unittest.cc	2021-10-05 00:43:33.000000000 +0000
++++ b/src/google/protobuf/arena_unittest.cc	2021-10-06 13:28:39.268149040 +0000
+@@ -1361,11 +1361,11 @@ TEST(ArenaTest, SpaceAllocated_and_Used)
+   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());
+ }
+ 
+@@ -1404,11 +1404,11 @@ TEST(ArenaTest, BlockSizeSmallerThanAllo
+ 
+     *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());
+   }
+ }
+ 
+--- a/src/google/protobuf/io/zero_copy_stream_unittest.cc	2021-10-05 00:43:33.000000000 +0000
++++ b/src/google/protobuf/io/zero_copy_stream_unittest.cc	2021-10-06 13:28:58.238151398 +0000
+@@ -717,21 +717,6 @@ TEST_F(IoTest, StringIo) {
+   }
+ }
+ 
+-// Verifies that outputs up to kint32max can be created.
+-TEST_F(IoTest, LargeOutput) {
+-  std::string str;
+-  StringOutputStream output(&str);
+-  void* unused_data;
+-  int size;
+-  // Repeatedly calling Next should eventually grow the buffer to kint32max.
+-  do {
+-    EXPECT_TRUE(output.Next(&unused_data, &size));
+-  } while (str.size() < std::numeric_limits<int>::max());
+-  // Further increases should be possible.
+-  output.Next(&unused_data, &size);
+-  EXPECT_GT(size, 0);
+-}
+-
+ 
+ // To test files, we create a temporary file, write, read, truncate, repeat.
+ TEST_F(IoTest, FileIo) {
diff --git a/repo/protobuf/trim-rakefile.patch b/repo/protobuf/trim-rakefile.patch
new file mode 100644
index 0000000..ebc98d5
--- /dev/null
+++ b/repo/protobuf/trim-rakefile.patch
@@ -0,0 +1,74 @@
+--- a/ruby/Rakefile	2021-10-06 10:20:37.207462826 +0000
++++ b/ruby/Rakefile	2021-10-06 10:26:17.086024004 +0000
+@@ -1,6 +1,4 @@
+ require "rubygems"
+-require "rubygems/package_task"
+-require "rake/extensiontask" unless RUBY_PLATFORM == "java"
+ require "rake/testtask"
+ 
+ spec = Gem::Specification.load("google-protobuf.gemspec")
+@@ -66,64 +64,12 @@ unless ENV['IN_DOCKER'] == 'true'
+   end
+ end
+ 
+-if RUBY_PLATFORM == "java"
+-  if `which mvn` == ''
+-    raise ArgumentError, "maven needs to be installed"
+-  end
+-  task :clean do
+-    system("mvn --batch-mode clean")
+-  end
+-
+-  task :compile do
+-    system("mvn --batch-mode package")
+-  end
+-else
+-  Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
+-    unless RUBY_PLATFORM =~ /darwin/
+-      # TODO: also set "no_native to true" for mac if possible. As is,
+-      # "no_native" can only be set if the RUBY_PLATFORM doing
+-      # cross-compilation is contained in the "ext.cross_platform" array.
+-      ext.no_native = true
+-    end
+-    ext.ext_dir = "ext/google/protobuf_c"
+-    ext.lib_dir = "lib/google"
+-    ext.cross_compile = true
+-    ext.cross_platform = [
+-      'x86-mingw32', 'x64-mingw32',
+-      'x86_64-linux', 'x86-linux',
+-      'universal-darwin'
+-    ]
+-  end
+-
+-  task 'gem:windows' do
+-    require 'rake_compiler_dock'
+-    ['x86-mingw32', 'x64-mingw32', 'x86_64-linux', 'x86-linux'].each do |plat|
+-      RakeCompilerDock.sh <<-"EOT", platform: plat
+-        bundle && \
+-        IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
+-      EOT
+-    end
+-  end
+-
+-  if RUBY_PLATFORM =~ /darwin/
+-    task 'gem:native' do
+-      system "rake genproto"
+-      system "rake cross native gem RUBY_CC_VERSION=3.0.0:2.7.0:2.6.0:2.5.1:2.4.0:2.3.0"
+-    end
+-  else
+-    task 'gem:native' => [:genproto, 'gem:windows']
+-  end
+-end
+-
+ task :genproto => genproto_output
+ 
+ task :clean do
+   sh "rm -f #{genproto_output.join(' ')}"
+ end
+ 
+-Gem::PackageTask.new(spec) do |pkg|
+-end
+-
+ Rake::TestTask.new(:test => [:build, :genproto]) do |t|
+   t.test_files = FileList["tests/*.rb"].exclude("tests/gc_test.rb", "tests/common_tests.rb")
+ end