pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
protobuf: add my half-finished, half-baked update
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun Jul 16 19:58:23 2023 +0200
Changeset: 540476b440f9dbe15b6b15ad9a8065650ac01877
Modified Files:
protobuf/Makefile
protobuf/buildlink3.mk
protobuf/distinfo
Added Files:
protobuf/PLIST.new
Removed Files:
protobuf/patches/patch-configure
protobuf/patches/patch-third__party_googletest_googlemock_configure
Log Message:
protobuf: add my half-finished, half-baked update
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=540476b440f9dbe15b6b15ad9a8065650ac01877
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
protobuf/Makefile | 27 ++-
protobuf/PLIST.new | 236 +++++++++++++++++++++
protobuf/buildlink3.mk | 4 +-
protobuf/distinfo | 8 +-
protobuf/patches/patch-configure | 15 --
...ch-third__party_googletest_googlemock_configure | 24 ---
6 files changed, 254 insertions(+), 60 deletions(-)
diffs:
diff --git a/protobuf/Makefile b/protobuf/Makefile
index cd6dc41477..551f23b239 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: Makefile,v 1.65 2022/12/16 10:22:57 adam Exp $
#
# When updating this, please also update devel/py-protobuf
#
@@ -7,8 +7,8 @@
# from before and after, and do a recursive PKGREVISION
# bump if necessary
-DISTNAME= protobuf-cpp-3.21.12
-PKGNAME= ${DISTNAME:S/-cpp//}
+DISTNAME= protobuf-22.3
+PKGNAME= ${DISTNAME:S/protobuf-/protobuf-3./}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=protocolbuffers/}
GITHUB_PROJECT= protobuf
@@ -20,25 +20,22 @@ HOMEPAGE= https://github.com/protocolbuffers/protobuf
COMMENT= Google protocol buffers
LICENSE= modified-bsd
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-cpp//}
+USE_LANGUAGES= c c++14
-USE_LANGUAGES= c c++11
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in
-PKGCONFIG_OVERRIDE+= protobuf.pc.in
-TEST_TARGET= check
+CMAKE_ARGS+= -Dprotobuf_ABSL_PROVIDER=package
+CMAKE_ARGS+= -Dprotobuf_BUILD_SHARED_LIBS=ON
+# requires googletest to be checked out in third_party/googletest
+CMAKE_ARGS+= -Dprotobuf_BUILD_TESTS=OFF
-# false positive: the Makefile generates bash programs
-CHECK_PORTABILITY_SKIP= benchmarks/Makefile.in
# the [[ command will skip a test that would otherwise run
CHECK_PORTABILITY_SKIP+= src/google/protobuf/compiler/zip_output_unittest.sh
-SET_LIBDIR= yes
+# configure: error: *** A compiler with support for C++11 language features is required.
+GCC_REQD+= 4.8
-# included in third_party
+.include "../../devel/cmake/build.mk"
#.include "../../devel/googletest/buildlink3.mk"
+.include "../../devel/abseil/buildlink3.mk"
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/protobuf/PLIST.new b/protobuf/PLIST.new
new file mode 100644
index 0000000000..ed462bf9a6
--- /dev/null
+++ b/protobuf/PLIST.new
@@ -0,0 +1,236 @@
+@comment $NetBSD$
+bin/protoc
+bin/protoc-22.3.0
+include/google/protobuf/any.h
+include/google/protobuf/any.pb.h
+include/google/protobuf/any.proto
+include/google/protobuf/api.pb.h
+include/google/protobuf/api.proto
+include/google/protobuf/arena.h
+include/google/protobuf/arena_align.h
+include/google/protobuf/arena_allocation_policy.h
+include/google/protobuf/arena_cleanup.h
+include/google/protobuf/arena_config.h
+include/google/protobuf/arenastring.h
+include/google/protobuf/arenaz_sampler.h
+include/google/protobuf/compiler/code_generator.h
+include/google/protobuf/compiler/command_line_interface.h
+include/google/protobuf/compiler/cpp/enum.h
+include/google/protobuf/compiler/cpp/extension.h
+include/google/protobuf/compiler/cpp/field.h
+include/google/protobuf/compiler/cpp/field_generators/generators.h
+include/google/protobuf/compiler/cpp/file.h
+include/google/protobuf/compiler/cpp/generator.h
+include/google/protobuf/compiler/cpp/helpers.h
+include/google/protobuf/compiler/cpp/message.h
+include/google/protobuf/compiler/cpp/message_layout_helper.h
+include/google/protobuf/compiler/cpp/names.h
+include/google/protobuf/compiler/cpp/options.h
+include/google/protobuf/compiler/cpp/padding_optimizer.h
+include/google/protobuf/compiler/cpp/parse_function_generator.h
+include/google/protobuf/compiler/cpp/service.h
+include/google/protobuf/compiler/cpp/tracker.h
+include/google/protobuf/compiler/csharp/csharp_doc_comment.h
+include/google/protobuf/compiler/csharp/csharp_enum.h
+include/google/protobuf/compiler/csharp/csharp_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_field_base.h
+include/google/protobuf/compiler/csharp/csharp_generator.h
+include/google/protobuf/compiler/csharp/csharp_helpers.h
+include/google/protobuf/compiler/csharp/csharp_map_field.h
+include/google/protobuf/compiler/csharp/csharp_message.h
+include/google/protobuf/compiler/csharp/csharp_message_field.h
+include/google/protobuf/compiler/csharp/csharp_options.h
+include/google/protobuf/compiler/csharp/csharp_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_reflection_class.h
+include/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
+include/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
+include/google/protobuf/compiler/csharp/csharp_source_generator_base.h
+include/google/protobuf/compiler/csharp/csharp_wrapper_field.h
+include/google/protobuf/compiler/csharp/names.h
+include/google/protobuf/compiler/importer.h
+include/google/protobuf/compiler/java/context.h
+include/google/protobuf/compiler/java/doc_comment.h
+include/google/protobuf/compiler/java/enum.h
+include/google/protobuf/compiler/java/enum_field.h
+include/google/protobuf/compiler/java/enum_field_lite.h
+include/google/protobuf/compiler/java/enum_lite.h
+include/google/protobuf/compiler/java/extension.h
+include/google/protobuf/compiler/java/extension_lite.h
+include/google/protobuf/compiler/java/field.h
+include/google/protobuf/compiler/java/file.h
+include/google/protobuf/compiler/java/generator.h
+include/google/protobuf/compiler/java/generator_factory.h
+include/google/protobuf/compiler/java/helpers.h
+include/google/protobuf/compiler/java/kotlin_generator.h
+include/google/protobuf/compiler/java/map_field.h
+include/google/protobuf/compiler/java/map_field_lite.h
+include/google/protobuf/compiler/java/message.h
+include/google/protobuf/compiler/java/message_builder.h
+include/google/protobuf/compiler/java/message_builder_lite.h
+include/google/protobuf/compiler/java/message_field.h
+include/google/protobuf/compiler/java/message_field_lite.h
+include/google/protobuf/compiler/java/message_lite.h
+include/google/protobuf/compiler/java/message_serialization.h
+include/google/protobuf/compiler/java/name_resolver.h
+include/google/protobuf/compiler/java/names.h
+include/google/protobuf/compiler/java/options.h
+include/google/protobuf/compiler/java/primitive_field.h
+include/google/protobuf/compiler/java/primitive_field_lite.h
+include/google/protobuf/compiler/java/service.h
+include/google/protobuf/compiler/java/shared_code_generator.h
+include/google/protobuf/compiler/java/string_field.h
+include/google/protobuf/compiler/java/string_field_lite.h
+include/google/protobuf/compiler/objectivec/enum.h
+include/google/protobuf/compiler/objectivec/enum_field.h
+include/google/protobuf/compiler/objectivec/extension.h
+include/google/protobuf/compiler/objectivec/field.h
+include/google/protobuf/compiler/objectivec/file.h
+include/google/protobuf/compiler/objectivec/generator.h
+include/google/protobuf/compiler/objectivec/helpers.h
+include/google/protobuf/compiler/objectivec/import_writer.h
+include/google/protobuf/compiler/objectivec/line_consumer.h
+include/google/protobuf/compiler/objectivec/map_field.h
+include/google/protobuf/compiler/objectivec/message.h
+include/google/protobuf/compiler/objectivec/message_field.h
+include/google/protobuf/compiler/objectivec/names.h
+include/google/protobuf/compiler/objectivec/nsobject_methods.h
+include/google/protobuf/compiler/objectivec/oneof.h
+include/google/protobuf/compiler/objectivec/options.h
+include/google/protobuf/compiler/objectivec/primitive_field.h
+include/google/protobuf/compiler/objectivec/text_format_decode_data.h
+include/google/protobuf/compiler/parser.h
+include/google/protobuf/compiler/php/names.h
+include/google/protobuf/compiler/php/php_generator.h
+include/google/protobuf/compiler/plugin.h
+include/google/protobuf/compiler/plugin.pb.h
+include/google/protobuf/compiler/plugin.proto
+include/google/protobuf/compiler/python/generator.h
+include/google/protobuf/compiler/python/helpers.h
+include/google/protobuf/compiler/python/pyi_generator.h
+include/google/protobuf/compiler/retention.h
+include/google/protobuf/compiler/ruby/ruby_generator.h
+include/google/protobuf/compiler/scc.h
+include/google/protobuf/compiler/subprocess.h
+include/google/protobuf/compiler/zip_writer.h
+include/google/protobuf/descriptor.h
+include/google/protobuf/descriptor.pb.h
+include/google/protobuf/descriptor.proto
+include/google/protobuf/descriptor_database.h
+include/google/protobuf/duration.pb.h
+include/google/protobuf/duration.proto
+include/google/protobuf/dynamic_message.h
+include/google/protobuf/empty.pb.h
+include/google/protobuf/empty.proto
+include/google/protobuf/endian.h
+include/google/protobuf/explicitly_constructed.h
+include/google/protobuf/extension_set.h
+include/google/protobuf/extension_set_inl.h
+include/google/protobuf/field_access_listener.h
+include/google/protobuf/field_mask.pb.h
+include/google/protobuf/field_mask.proto
+include/google/protobuf/generated_enum_reflection.h
+include/google/protobuf/generated_enum_util.h
+include/google/protobuf/generated_message_bases.h
+include/google/protobuf/generated_message_reflection.h
+include/google/protobuf/generated_message_tctable_decl.h
+include/google/protobuf/generated_message_tctable_gen.h
+include/google/protobuf/generated_message_tctable_impl.h
+include/google/protobuf/generated_message_util.h
+include/google/protobuf/has_bits.h
+include/google/protobuf/implicit_weak_message.h
+include/google/protobuf/inlined_string_field.h
+include/google/protobuf/io/coded_stream.h
+include/google/protobuf/io/gzip_stream.h
+include/google/protobuf/io/io_win32.h
+include/google/protobuf/io/printer.h
+include/google/protobuf/io/strtod.h
+include/google/protobuf/io/tokenizer.h
+include/google/protobuf/io/zero_copy_sink.h
+include/google/protobuf/io/zero_copy_stream.h
+include/google/protobuf/io/zero_copy_stream_impl.h
+include/google/protobuf/io/zero_copy_stream_impl_lite.h
+include/google/protobuf/json/internal/descriptor_traits.h
+include/google/protobuf/json/internal/lexer.h
+include/google/protobuf/json/internal/message_path.h
+include/google/protobuf/json/internal/parser.h
+include/google/protobuf/json/internal/parser_traits.h
+include/google/protobuf/json/internal/unparser.h
+include/google/protobuf/json/internal/unparser_traits.h
+include/google/protobuf/json/internal/untyped_message.h
+include/google/protobuf/json/internal/writer.h
+include/google/protobuf/json/internal/zero_copy_buffered_stream.h
+include/google/protobuf/json/json.h
+include/google/protobuf/map.h
+include/google/protobuf/map_entry.h
+include/google/protobuf/map_entry_lite.h
+include/google/protobuf/map_field.h
+include/google/protobuf/map_field_inl.h
+include/google/protobuf/map_field_lite.h
+include/google/protobuf/map_type_handler.h
+include/google/protobuf/message.h
+include/google/protobuf/message_lite.h
+include/google/protobuf/metadata.h
+include/google/protobuf/metadata_lite.h
+include/google/protobuf/parse_context.h
+include/google/protobuf/port.h
+include/google/protobuf/port_def.inc
+include/google/protobuf/port_undef.inc
+include/google/protobuf/reflection.h
+include/google/protobuf/reflection_internal.h
+include/google/protobuf/reflection_ops.h
+include/google/protobuf/repeated_field.h
+include/google/protobuf/repeated_ptr_field.h
+include/google/protobuf/serial_arena.h
+include/google/protobuf/service.h
+include/google/protobuf/source_context.pb.h
+include/google/protobuf/source_context.proto
+include/google/protobuf/string_block.h
+include/google/protobuf/struct.pb.h
+include/google/protobuf/struct.proto
+include/google/protobuf/stubs/callback.h
+include/google/protobuf/stubs/common.h
+include/google/protobuf/stubs/platform_macros.h
+include/google/protobuf/stubs/port.h
+include/google/protobuf/stubs/status_macros.h
+include/google/protobuf/text_format.h
+include/google/protobuf/thread_safe_arena.h
+include/google/protobuf/timestamp.pb.h
+include/google/protobuf/timestamp.proto
+include/google/protobuf/type.pb.h
+include/google/protobuf/type.proto
+include/google/protobuf/unknown_field_set.h
+include/google/protobuf/util/delimited_message_util.h
+include/google/protobuf/util/field_comparator.h
+include/google/protobuf/util/field_mask_util.h
+include/google/protobuf/util/json_util.h
+include/google/protobuf/util/message_differencer.h
+include/google/protobuf/util/time_util.h
+include/google/protobuf/util/type_resolver.h
+include/google/protobuf/util/type_resolver_util.h
+include/google/protobuf/wire_format.h
+include/google/protobuf/wire_format_lite.h
+include/google/protobuf/wrappers.pb.h
+include/google/protobuf/wrappers.proto
+include/utf8_range.h
+include/utf8_validity.h
+lib/cmake/protobuf/protobuf-config-version.cmake
+lib/cmake/protobuf/protobuf-config.cmake
+lib/cmake/protobuf/protobuf-generate.cmake
+lib/cmake/protobuf/protobuf-module.cmake
+lib/cmake/protobuf/protobuf-options.cmake
+lib/cmake/protobuf/protobuf-targets-noconfig.cmake
+lib/cmake/protobuf/protobuf-targets.cmake
+lib/cmake/utf8_range/utf8_range-config.cmake
+lib/cmake/utf8_range/utf8_range-targets-noconfig.cmake
+lib/cmake/utf8_range/utf8_range-targets.cmake
+lib/libprotobuf-lite.so
+lib/libprotobuf-lite.so.22.3.0
+lib/libprotobuf.so
+lib/libprotobuf.so.22.3.0
+lib/libprotoc.so
+lib/libprotoc.so.22.3.0
+lib/libutf8_range.a
+lib/libutf8_validity.a
+lib/pkgconfig/protobuf-lite.pc
+lib/pkgconfig/protobuf.pc
diff --git a/protobuf/buildlink3.mk b/protobuf/buildlink3.mk
index e651bd576a..e45dc13c84 100644
--- a/protobuf/buildlink3.mk
+++ b/protobuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2021/11/11 12:02:46 kim Exp $
BUILDLINK_TREE+= protobuf
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.0.0
BUILDLINK_ABI_DEPENDS.protobuf+= protobuf>=3.19.0nb1
BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf
+GCC_REQD+= 4.8
+
.include "../../devel/zlib/buildlink3.mk"
.endif # PROTOBUF_BUILDLINK3_MK
diff --git a/protobuf/distinfo b/protobuf/distinfo
index 65ece217a8..dcd284d39a 100644
--- a/protobuf/distinfo
+++ b/protobuf/distinfo
@@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.72 2022/12/16 10:22:57 adam Exp $
-BLAKE2s (protobuf-cpp-3.21.12.tar.gz) = 4d0f9f8861cbef58480bcf3852604dda335839aae4a41cee0c59b5f95a82609b
-SHA512 (protobuf-cpp-3.21.12.tar.gz) = 2307d405bee7a20fa11a04b27f3345304dae5bbcdadc3ff2099a6d5facd55951c4e158ae99d8d07bbfdfdb3fabc84ddc5b60fec06912d70e5655d6bed04fa873
-Size (protobuf-cpp-3.21.12.tar.gz) = 4842303 bytes
-SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
-SHA1 (patch-third__party_googletest_googlemock_configure) = 9afd8358eef2dffe7639ca70081f60535c116855
+BLAKE2s (protobuf-22.3.tar.gz) = e95d5f9d0976d14639a042dce94d9046f11bf1b02aa0f293a8a40456a986bef9
+SHA512 (protobuf-22.3.tar.gz) = f28dd0333d96e739eb3e1a1ab0da640ef168e9967973531f206d798f98e2c76fb040ffd61a2009204826a8815a2604b678d74ab7f7b17e01f04a712efb39b9b9
+Size (protobuf-22.3.tar.gz) = 4919899 bytes
diff --git a/protobuf/patches/patch-configure b/protobuf/patches/patch-configure
deleted file mode 100644
index 50e8ba781c..0000000000
--- a/protobuf/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.6 2021/06/09 04:57:10 adam Exp $
-
-Disable Solaris ISA selection.
-
---- configure.orig 2021-06-08 14:11:47.000000000 +0000
-+++ configure
-@@ -7640,7 +7640,7 @@ fi
- fi
-
- case $host_os in
-- *solaris*)
-+ *notsolaris*)
- for ac_prog in isainfo
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/protobuf/patches/patch-third__party_googletest_googlemock_configure b/protobuf/patches/patch-third__party_googletest_googlemock_configure
deleted file mode 100644
index 7e72970986..0000000000
--- a/protobuf/patches/patch-third__party_googletest_googlemock_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.2 2021/10/06 08:09:19 adam Exp $
-
-Fix shell portability issues.
-
---- third_party/googletest/googlemock/configure.orig 2021-10-05 18:30:06.000000000 +0000
-+++ third_party/googletest/googlemock/configure
-@@ -17329,7 +17329,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
- HAVE_PTHREADS_TRUE=
- HAVE_PTHREADS_FALSE='#'
- else
-@@ -17361,7 +17361,7 @@ else $as_nop
- enable_external_gtest=yes
- fi
-
--if test "x$with_gtest" == "xno"
-+if test "x$with_gtest" = "xno"
- then :
- as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow
Home |
Main Index |
Thread Index |
Old Index