CVS commit: pkgsrc/devel/protobuf

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun  4 09:30:54 UTC 2024

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST

Log Message:
protobuf: disable libupb for the time being as it breaks grpc build


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/protobuf/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/protobuf/Makefile
diff -u pkgsrc/devel/protobuf/Makefile:1.77 pkgsrc/devel/protobuf/Makefile:1.78
--- pkgsrc/devel/protobuf/Makefile:1.77 Wed May 29 16:02:15 2024
+++ pkgsrc/devel/protobuf/Makefile      Tue Jun  4 09:30:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2024/05/29 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.78 2024/06/04 09:30:53 adam Exp $
 #
 # When updating this, please also update devel/py-protobuf.
 #
@@ -9,6 +9,7 @@
 # require a recursive revbump.
 
 DISTNAME=      protobuf-27.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}
 GITHUB_PROJECT=        protobuf
@@ -26,6 +27,8 @@ USE_LANGUAGES=                c c++
 FORCE_CXX_STD=         c++14
 
 CMAKE_ARGS+=   -Dprotobuf_ABSL_PROVIDER=package
+# FIXME: Currently libupd makes net/grpc build fail.
+CMAKE_ARGS+=   -Dprotobuf_BUILD_LIBUPB=OFF
 CMAKE_ARGS+=   -Dprotobuf_BUILD_SHARED_LIBS=ON
 # requires googletest to be checked out in third_party/googletest
 CMAKE_ARGS+=   -Dprotobuf_BUILD_TESTS=OFF

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.24 pkgsrc/devel/protobuf/PLIST:1.25
--- pkgsrc/devel/protobuf/PLIST:1.24    Wed May 29 16:02:15 2024
+++ pkgsrc/devel/protobuf/PLIST Tue Jun  4 09:30:53 2024
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST,v 1.24 2024/05/29 16:02:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2024/06/04 09:30:53 adam Exp $
 bin/protoc
 bin/protoc-${PKGVERSION}.0
-bin/protoc-gen-upb
-bin/protoc-gen-upb-27.0.0
-bin/protoc-gen-upb_minitable
-bin/protoc-gen-upb_minitable-27.0.0
-bin/protoc-gen-upbdefs
-bin/protoc-gen-upbdefs-27.0.0
 include/google/protobuf/any.h
 include/google/protobuf/any.pb.h
 include/google/protobuf/any.proto
@@ -150,8 +144,6 @@ include/google/protobuf/cpp_features.pro
 include/google/protobuf/descriptor.h
 include/google/protobuf/descriptor.pb.h
 include/google/protobuf/descriptor.proto
-include/google/protobuf/descriptor.upb.h
-include/google/protobuf/descriptor.upb_minitable.h
 include/google/protobuf/descriptor_database.h
 include/google/protobuf/descriptor_legacy.h
 include/google/protobuf/descriptor_lite.h
@@ -260,115 +252,6 @@ include/google/protobuf/wire_format_lite
 include/google/protobuf/wrappers.pb.h
 include/google/protobuf/wrappers.proto
 include/java/core/src/main/resources/google/protobuf/java_features.proto
-include/upb/base/descriptor_constants.h
-include/upb/base/internal/endian.h
-include/upb/base/internal/log2.h
-include/upb/base/status.h
-include/upb/base/status.hpp
-include/upb/base/string_view.h
-include/upb/base/upcast.h
-include/upb/generated_code_support.h
-include/upb/hash/common.h
-include/upb/hash/int_table.h
-include/upb/hash/str_table.h
-include/upb/json/decode.h
-include/upb/json/encode.h
-include/upb/lex/atoi.h
-include/upb/lex/round_trip.h
-include/upb/lex/strtod.h
-include/upb/lex/unicode.h
-include/upb/mem/alloc.h
-include/upb/mem/arena.h
-include/upb/mem/arena.hpp
-include/upb/mem/internal/arena.h
-include/upb/message/accessors.h
-include/upb/message/array.h
-include/upb/message/compare.h
-include/upb/message/compat.h
-include/upb/message/copy.h
-include/upb/message/internal/accessors.h
-include/upb/message/internal/array.h
-include/upb/message/internal/compare_unknown.h
-include/upb/message/internal/extension.h
-include/upb/message/internal/map.h
-include/upb/message/internal/map_entry.h
-include/upb/message/internal/map_sorter.h
-include/upb/message/internal/message.h
-include/upb/message/internal/tagged_ptr.h
-include/upb/message/internal/types.h
-include/upb/message/map.h
-include/upb/message/map_gencode_util.h
-include/upb/message/message.h
-include/upb/message/tagged_ptr.h
-include/upb/message/value.h
-include/upb/mini_descriptor/build_enum.h
-include/upb/mini_descriptor/decode.h
-include/upb/mini_descriptor/internal/base92.h
-include/upb/mini_descriptor/internal/decoder.h
-include/upb/mini_descriptor/internal/encode.h
-include/upb/mini_descriptor/internal/encode.hpp
-include/upb/mini_descriptor/internal/modifiers.h
-include/upb/mini_descriptor/internal/wire_constants.h
-include/upb/mini_descriptor/link.h
-include/upb/mini_table/enum.h
-include/upb/mini_table/extension.h
-include/upb/mini_table/extension_registry.h
-include/upb/mini_table/field.h
-include/upb/mini_table/file.h
-include/upb/mini_table/internal/enum.h
-include/upb/mini_table/internal/extension.h
-include/upb/mini_table/internal/field.h
-include/upb/mini_table/internal/file.h
-include/upb/mini_table/internal/message.h
-include/upb/mini_table/internal/size_log2.h
-include/upb/mini_table/internal/sub.h
-include/upb/mini_table/message.h
-include/upb/mini_table/sub.h
-include/upb/port/atomic.h
-include/upb/port/def.inc
-include/upb/port/undef.inc
-include/upb/port/vsnprintf_compat.h
-include/upb/reflection/common.h
-include/upb/reflection/def.h
-include/upb/reflection/def.hpp
-include/upb/reflection/def_pool.h
-include/upb/reflection/def_type.h
-include/upb/reflection/enum_def.h
-include/upb/reflection/enum_reserved_range.h
-include/upb/reflection/enum_value_def.h
-include/upb/reflection/extension_range.h
-include/upb/reflection/field_def.h
-include/upb/reflection/file_def.h
-include/upb/reflection/internal/def_pool.h
-include/upb/reflection/internal/desc_state.h
-include/upb/reflection/internal/enum_def.h
-include/upb/reflection/internal/enum_reserved_range.h
-include/upb/reflection/internal/enum_value_def.h
-include/upb/reflection/internal/extension_range.h
-include/upb/reflection/internal/field_def.h
-include/upb/reflection/internal/file_def.h
-include/upb/reflection/internal/message_def.h
-include/upb/reflection/internal/message_reserved_range.h
-include/upb/reflection/internal/method_def.h
-include/upb/reflection/internal/oneof_def.h
-include/upb/reflection/internal/service_def.h
-include/upb/reflection/internal/upb_edition_defaults.h
-include/upb/reflection/message.h
-include/upb/reflection/message.hpp
-include/upb/reflection/message_def.h
-include/upb/reflection/message_reserved_range.h
-include/upb/reflection/method_def.h
-include/upb/reflection/oneof_def.h
-include/upb/reflection/service_def.h
-include/upb/text/encode.h
-include/upb/util/def_to_proto.h
-include/upb/util/required_fields.h
-include/upb/wire/decode.h
-include/upb/wire/encode.h
-include/upb/wire/eps_copy_input_stream.h
-include/upb/wire/internal/decode_fast.h
-include/upb/wire/reader.h
-include/upb/wire/types.h
 include/upb_generator/mangle.h
 include/utf8_range.h
 include/utf8_validity.h
@@ -388,7 +271,6 @@ lib/libprotobuf.so
 lib/libprotobuf.so.${PKGVERSION}.0
 lib/libprotoc.so
 lib/libprotoc.so.${PKGVERSION}.0
-lib/libupb.a
 lib/libutf8_range.a
 lib/libutf8_validity.a
 lib/pkgconfig/protobuf-lite.pc