*protobuf: update to 24.4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *protobuf: update to 24.4
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Thu, 02 Nov 2023 12:12:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Thu Nov 2 13:12:15 2023 +0100
Changeset:	f63eb5cfae060ec6951a86fee4ce64c84a428ad4

Modified Files:
	protobuf/Makefile
	protobuf/PLIST
	protobuf/buildlink3.mk
	protobuf/distinfo
	py-protobuf/Makefile
	py-protobuf/PLIST
	py-protobuf/distinfo

Log Message:
*protobuf: update to 24.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f63eb5cfae060ec6951a86fee4ce64c84a428ad4

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

diffstat:
 protobuf/Makefile      |  2 +-
 protobuf/PLIST         |  8 +++++++-
 protobuf/buildlink3.mk |  4 ++--
 protobuf/distinfo      |  6 +++---
 py-protobuf/Makefile   | 20 +++++---------------
 py-protobuf/PLIST      | 32 +++++++++++++++++---------------
 py-protobuf/distinfo   |  6 +++---
 7 files changed, 38 insertions(+), 40 deletions(-)

diffs:
diff --git a/protobuf/Makefile b/protobuf/Makefile
index 3560dd866a..a39c50cc61 100644
--- a/protobuf/Makefile
+++ b/protobuf/Makefile
@@ -7,7 +7,7 @@
 # from before and after, and do a recursive PKGREVISION
 # bump if necessary
 
-DISTNAME=	protobuf-23.4
+DISTNAME=	protobuf-24.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=protocolbuffers/}
 GITHUB_PROJECT=	protobuf
diff --git a/protobuf/PLIST b/protobuf/PLIST
index f117e6c8be..f0cea07340 100644
--- a/protobuf/PLIST
+++ b/protobuf/PLIST
@@ -10,7 +10,6 @@ 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/allowlists/allowlist.h
@@ -120,11 +119,14 @@ include/google/protobuf/compiler/rust/naming.h
 include/google/protobuf/compiler/scc.h
 include/google/protobuf/compiler/subprocess.h
 include/google/protobuf/compiler/zip_writer.h
+include/google/protobuf/cpp_features.pb.h
+include/google/protobuf/cpp_features.proto
 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/descriptor_legacy.h
+include/google/protobuf/descriptor_visitor.h
 include/google/protobuf/duration.pb.h
 include/google/protobuf/duration.proto
 include/google/protobuf/dynamic_message.h
@@ -134,6 +136,7 @@ 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/feature_resolver.h
 include/google/protobuf/field_access_listener.h
 include/google/protobuf/field_mask.pb.h
 include/google/protobuf/field_mask.proto
@@ -148,6 +151,8 @@ 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/internal_message_util.h
+include/google/protobuf/internal_visibility.h
 include/google/protobuf/io/coded_stream.h
 include/google/protobuf/io/gzip_stream.h
 include/google/protobuf/io/io_win32.h
@@ -184,6 +189,7 @@ 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/raw_ptr.h
 include/google/protobuf/reflection.h
 include/google/protobuf/reflection_internal.h
 include/google/protobuf/reflection_mode.h
diff --git a/protobuf/buildlink3.mk b/protobuf/buildlink3.mk
index fd0f1a0007..bee57ab322 100644
--- a/protobuf/buildlink3.mk
+++ b/protobuf/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	protobuf
 .if !defined(PROTOBUF_BUILDLINK3_MK)
 PROTOBUF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.protobuf+=	protobuf>=23.4
-BUILDLINK_ABI_DEPENDS.protobuf+=	protobuf>=23.4
+BUILDLINK_API_DEPENDS.protobuf+=	protobuf>=24.4
+BUILDLINK_ABI_DEPENDS.protobuf+=	protobuf>=24.4
 BUILDLINK_PKGSRCDIR.protobuf?=		../../devel/protobuf
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/protobuf/distinfo b/protobuf/distinfo
index d12f4e8fee..ce00eb3e24 100644
--- a/protobuf/distinfo
+++ b/protobuf/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.72 2022/12/16 10:22:57 adam Exp $
 
-BLAKE2s (protobuf-23.4.tar.gz) = 03299f155923e73aebfaca1feeea8f7d18a506d8c8b795105a94d167a4ecb62e
-SHA512 (protobuf-23.4.tar.gz) = b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
-Size (protobuf-23.4.tar.gz) = 5043507 bytes
+BLAKE2s (protobuf-24.4.tar.gz) = 24c808cbdca22e4d21a9cac1cd68809b8f8800828d4fe99b0517aadf81e55e69
+SHA512 (protobuf-24.4.tar.gz) = 52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315
+Size (protobuf-24.4.tar.gz) = 5180235 bytes
diff --git a/py-protobuf/Makefile b/py-protobuf/Makefile
index ff0e8bf477..d0264fca48 100644
--- a/py-protobuf/Makefile
+++ b/py-protobuf/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.65 2023/03/29 09:34:09 wiz Exp $
 
-DISTNAME=	protobuf-4.21.12
+DISTNAME=	protobuf-4.24.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/protobuf/}
@@ -10,24 +10,14 @@ HOMEPAGE=	https://developers.google.com/protocol-buffers/
 COMMENT=	Python bindings for protobuf
 LICENSE=	modified-bsd
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+
 USE_LANGUAGES+=	c c++11
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 MAKE_ENV+=	PROTOC=${PREFIX}/bin/protoc
-PLIST_VARS+=	cpp
-
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYTHON_VERSION} < 311
-# As of 4.21.9, the sources do contain outdated code that only supports Python < 3.11
-# https://github.com/protocolbuffers/protobuf/issues/11031#issuecomment-1321390551
-# Do not use C++ implementation for Python 3.11.
-PYSETUPBUILDARGS=	--cpp_implementation
-PYSETUPINSTALLARGS=	--cpp_implementation
-PLIST.cpp=		yes
-.include "../../devel/protobuf/buildlink3.mk"
-.endif
 
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-protobuf/PLIST b/py-protobuf/PLIST
index 5b9a5c123f..7d05179696 100644
--- a/py-protobuf/PLIST
+++ b/py-protobuf/PLIST
@@ -1,10 +1,5 @@
-@comment $NetBSD: PLIST,v 1.19 2022/12/04 17:38:45 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/${EGG_NAME}-nspkg.pth
+@comment $NetBSD$
+${PYSITELIB}/google/_upb/_message.so
 ${PYSITELIB}/google/protobuf/__init__.py
 ${PYSITELIB}/google/protobuf/__init__.pyc
 ${PYSITELIB}/google/protobuf/__init__.pyo
@@ -44,7 +39,9 @@ ${PYSITELIB}/google/protobuf/field_mask_pb2.pyo
 ${PYSITELIB}/google/protobuf/internal/__init__.py
 ${PYSITELIB}/google/protobuf/internal/__init__.pyc
 ${PYSITELIB}/google/protobuf/internal/__init__.pyo
-${PLIST.cpp}${PYSITELIB}/google/protobuf/internal/_api_implementation.so
+${PYSITELIB}/google/protobuf/internal/_parameterized.py
+${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
+${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
 ${PYSITELIB}/google/protobuf/internal/api_implementation.py
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -66,12 +63,18 @@ ${PYSITELIB}/google/protobuf/internal/enum_type_wrapper.pyo
 ${PYSITELIB}/google/protobuf/internal/extension_dict.py
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyc
 ${PYSITELIB}/google/protobuf/internal/extension_dict.pyo
+${PYSITELIB}/google/protobuf/internal/field_mask.py
+${PYSITELIB}/google/protobuf/internal/field_mask.pyc
+${PYSITELIB}/google/protobuf/internal/field_mask.pyo
 ${PYSITELIB}/google/protobuf/internal/message_listener.py
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyc
 ${PYSITELIB}/google/protobuf/internal/message_listener.pyo
 ${PYSITELIB}/google/protobuf/internal/python_message.py
 ${PYSITELIB}/google/protobuf/internal/python_message.pyc
 ${PYSITELIB}/google/protobuf/internal/python_message.pyo
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.py
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyc
+${PYSITELIB}/google/protobuf/internal/testing_refleaks.pyo
 ${PYSITELIB}/google/protobuf/internal/type_checkers.py
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyc
 ${PYSITELIB}/google/protobuf/internal/type_checkers.pyo
@@ -96,7 +99,6 @@ ${PYSITELIB}/google/protobuf/proto_builder.pyo
 ${PYSITELIB}/google/protobuf/pyext/__init__.py
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyc
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyo
-${PLIST.cpp}${PYSITELIB}/google/protobuf/pyext/_message.so
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.py
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyc
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyo
@@ -136,12 +138,12 @@ ${PYSITELIB}/google/protobuf/unknown_fields.pyo
 ${PYSITELIB}/google/protobuf/util/__init__.py
 ${PYSITELIB}/google/protobuf/util/__init__.pyc
 ${PYSITELIB}/google/protobuf/util/__init__.pyo
-${PYSITELIB}/google/protobuf/util/json_format_pb2.py
-${PYSITELIB}/google/protobuf/util/json_format_pb2.pyc
-${PYSITELIB}/google/protobuf/util/json_format_pb2.pyo
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.py
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.pyc
-${PYSITELIB}/google/protobuf/util/json_format_proto3_pb2.pyo
 ${PYSITELIB}/google/protobuf/wrappers_pb2.py
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyc
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyo
+${PYSITELIB}/protobuf-${PKGVERSION}-py3.12-nspkg.pth
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/namespace_packages.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
diff --git a/py-protobuf/distinfo b/py-protobuf/distinfo
index db05055ce1..14706c2ed6 100644
--- a/py-protobuf/distinfo
+++ b/py-protobuf/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.60 2022/12/16 10:22:57 adam Exp $
 
-BLAKE2s (protobuf-4.21.12.tar.gz) = feed257cc7349da49ba4a63c1b8e5cbb9cb80aae36cd258ad7694732bf43fd9e
-SHA512 (protobuf-4.21.12.tar.gz) = 9e7a9b126e58b8fa16d6c79450cc1e52740df2ab7253c141b2d8e00f3804ba691ee3be18f15aadcc39d56f40a9b1d167a7183a9cec8e68c1ff7f1c4b14ebf9e0
-Size (protobuf-4.21.12.tar.gz) = 220324 bytes
+BLAKE2s (protobuf-4.24.4.tar.gz) = 92a7afe379f7cefb40bc031db8aeba8403999d25ea5f91ec8c30d569f091dcfc
+SHA512 (protobuf-4.24.4.tar.gz) = cf108957e2387bdd5d9400c8c583ae40a0d958235bc6642443e1e34252bfea97ceb63472099755f4ec3b82317706e1b905302e3b68228f7a826d7f91fae0e797
+Size (protobuf-4.24.4.tar.gz) = 383850 bytes
Prev by Date: hs-crypto-api: It's been imported as security/hs-crypto-api. Remove it
Next by Date: *protobuf: remove, used for updating pkgsrc
Previous by Thread: hs-crypto-api: It's been imported as security/hs-crypto-api. Remove it
Next by Thread: *protobuf: remove, used for updating pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index