CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 4 Dec 2022 17:38:45 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Dec  4 17:38:45 UTC 2022

Modified Files:
        pkgsrc/devel/protobuf: Makefile distinfo
        pkgsrc/devel/py-protobuf: Makefile PLIST distinfo
Removed Files:
        pkgsrc/devel/py-protobuf: PLIST.py311

Log Message:
protobuf py-protobuf: updated to [34].21.10

Protocol Buffers v21.10

Java

Use bit-field int values in buildPartial to skip work on unset groups of fields.
Mark nested builder as clean after clear is called

UPB

Fix UPB_LIKELY() for 32-bit Windows builds; update protobuf_deps to point to the current upb 21.x

Other

Add public modifiers to kotlin code


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/py-protobuf/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/py-protobuf/PLIST.py311
cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/py-protobuf/distinfo

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.63 pkgsrc/devel/protobuf/Makefile:1.64
--- pkgsrc/devel/protobuf/Makefile:1.63 Fri Oct 28 08:36:05 2022
+++ pkgsrc/devel/protobuf/Makefile      Sun Dec  4 17:38:45 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2022/10/28 08:36:05 adam Exp $
+# $NetBSD: Makefile,v 1.64 2022/12/04 17:38:45 adam Exp $
 #
 # When updating this, please also update devel/py-protobuf
 #
@@ -7,7 +7,7 @@
 # from before and after, and do a recursive PKGREVISION
 # bump if necessary
 
-DISTNAME=      protobuf-cpp-3.21.9
+DISTNAME=      protobuf-cpp-3.21.10
 PKGNAME=       ${DISTNAME:S/-cpp//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.70 pkgsrc/devel/protobuf/distinfo:1.71
--- pkgsrc/devel/protobuf/distinfo:1.70 Fri Oct 28 08:36:05 2022
+++ pkgsrc/devel/protobuf/distinfo      Sun Dec  4 17:38:45 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.70 2022/10/28 08:36:05 adam Exp $
+$NetBSD: distinfo,v 1.71 2022/12/04 17:38:45 adam Exp $
 
-BLAKE2s (protobuf-cpp-3.21.9.tar.gz) = 2cfd3c79de0ad63bc892d06053181ddf342f10bad7285428e281decacc542844
-SHA512 (protobuf-cpp-3.21.9.tar.gz) = 0ca95bc37acf6f6ac90834931ed9a73e1181b7994cc331b759312b8c252d6d7e6b81c62ab87b2c2777e6b0f7a55bcc3b2555ac270326f7890555088e6c50c803
-Size (protobuf-cpp-3.21.9.tar.gz) = 4836811 bytes
+BLAKE2s (protobuf-cpp-3.21.10.tar.gz) = 8e820f4f77eaba8c029e7ab2f990cc0860ea276ef0eaafb071951507ee886504
+SHA512 (protobuf-cpp-3.21.10.tar.gz) = 3194c4789f58db429110323ee206404247848f4c45720b19074ba2de5240ad5c48f494add114e4d429dcf96081563db12cb7436be646f43b5d15f2b44bb1586e
+Size (protobuf-cpp-3.21.10.tar.gz) = 4852077 bytes
 SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
 SHA1 (patch-third__party_googletest_googlemock_configure) = 9afd8358eef2dffe7639ca70081f60535c116855

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.61 pkgsrc/devel/py-protobuf/Makefile:1.62
--- pkgsrc/devel/py-protobuf/Makefile:1.61      Fri Nov 25 13:13:54 2022
+++ pkgsrc/devel/py-protobuf/Makefile   Sun Dec  4 17:38:45 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2022/11/25 13:13:54 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2022/12/04 17:38:45 adam Exp $
 
-DISTNAME=      protobuf-4.21.9
+DISTNAME=      protobuf-4.21.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/protobuf/}
@@ -14,29 +14,19 @@ USE_LANGUAGES+=     c c++11
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-MAKE_ENV+=             PROTOC=${PREFIX}/bin/protoc
-PYSETUPBUILDARGS=      --cpp_implementation
-PYSETUPINSTALLARGS=    --cpp_implementation
+MAKE_ENV+=     PROTOC=${PREFIX}/bin/protoc
+PLIST_VARS+=   cpp
 
 .include "../../lang/python/pyversion.mk"
-
-.if ${PYPKGPREFIX} == py311
-# as of 4.21.9, the sources do contain outdated code that only supports Python < 3.11
+.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
-# use the binary wheel for now, since it does support Python 3.11
-NO_BUILD=      yes
-MASTER_SITES=  https://files.pythonhosted.org/packages/0b/c3/bfe27bff58e895261e5054f38e9f12fcccd67d70ccad66c22ba987b17fc9/
-PLIST_SRC=     PLIST.py311
-.include "../../lang/python/wheel.mk"
-
-post-install:
-.  for f in lib/python3.11/site-packages/google/protobuf/internal/_parameterized.py
-       cd ${DESTDIR}${PREFIX} && \
-       ${SED} -e s",/usr/bin/env python,${PYTHONBIN}," ${f} > ${f}.patched && ${MV} ${f}.patched ${f}
-.  endfor
-.else
-.include "../../lang/python/egg.mk"
+# 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 "../../devel/protobuf/buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-protobuf/PLIST
diff -u pkgsrc/devel/py-protobuf/PLIST:1.18 pkgsrc/devel/py-protobuf/PLIST:1.19
--- pkgsrc/devel/py-protobuf/PLIST:1.18 Mon Jul 18 14:19:52 2022
+++ pkgsrc/devel/py-protobuf/PLIST      Sun Dec  4 17:38:45 2022
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.18 2022/07/18 14:19:52 wiz Exp $
+@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
 ${PYSITELIB}/google/protobuf/__init__.py
 ${PYSITELIB}/google/protobuf/__init__.pyc
 ${PYSITELIB}/google/protobuf/__init__.pyo
@@ -38,7 +44,7 @@ ${PYSITELIB}/google/protobuf/field_mask_
 ${PYSITELIB}/google/protobuf/internal/__init__.py
 ${PYSITELIB}/google/protobuf/internal/__init__.pyc
 ${PYSITELIB}/google/protobuf/internal/__init__.pyo
-${PYSITELIB}/google/protobuf/internal/_api_implementation.so
+${PLIST.cpp}${PYSITELIB}/google/protobuf/internal/_api_implementation.so
 ${PYSITELIB}/google/protobuf/internal/api_implementation.py
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyc
 ${PYSITELIB}/google/protobuf/internal/api_implementation.pyo
@@ -90,7 +96,7 @@ ${PYSITELIB}/google/protobuf/proto_build
 ${PYSITELIB}/google/protobuf/pyext/__init__.py
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyc
 ${PYSITELIB}/google/protobuf/pyext/__init__.pyo
-${PYSITELIB}/google/protobuf/pyext/_message.so
+${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
@@ -139,9 +145,3 @@ ${PYSITELIB}/google/protobuf/util/json_f
 ${PYSITELIB}/google/protobuf/wrappers_pb2.py
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyc
 ${PYSITELIB}/google/protobuf/wrappers_pb2.pyo
-${PYSITELIB}/${EGG_NAME}-nspkg.pth
-${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

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.57 pkgsrc/devel/py-protobuf/distinfo:1.58
--- pkgsrc/devel/py-protobuf/distinfo:1.57      Fri Nov 25 13:13:54 2022
+++ pkgsrc/devel/py-protobuf/distinfo   Sun Dec  4 17:38:45 2022
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.57 2022/11/25 13:13:54 wiz Exp $
+$NetBSD: distinfo,v 1.58 2022/12/04 17:38:45 adam Exp $
 
-BLAKE2s (protobuf-4.21.9-py3-none-any.whl) = 6135497223901c60c861f6a86bd5cda71623a567a82690bdcce07cd95766a708
-SHA512 (protobuf-4.21.9-py3-none-any.whl) = f464fd87bfbdbddfa1f4f0033a5685abc8a71574a1b654ca1a5a910ec8ca2cbae4e09da4ad8d49b8729f5d98c20fbaa8ba49a84d433d27a746d53bef236af3d2
-Size (protobuf-4.21.9-py3-none-any.whl) = 291642 bytes
-BLAKE2s (protobuf-4.21.9.tar.gz) = b41cd82762363d1e82c2fb367fabe3fe712f7d3c0156fb26b348c37f52aa4b08
-SHA512 (protobuf-4.21.9.tar.gz) = 0350869d8abf890997625039c8f83b33d5d3d6a2898d02cb639b1ca78276af8ba0e24866d6cbbb36802ff84a305591f27892743f7d6e142608b5175a2c90f77b
-Size (protobuf-4.21.9.tar.gz) = 220396 bytes
+BLAKE2s (protobuf-4.21.10.tar.gz) = 25048391d81104148f23ab4331ad8b287648711a73df28dce7bdd8fdc9ac62ac
+SHA512 (protobuf-4.21.10.tar.gz) = fdecac8ddb13cb990f38f3102cd345a5c1ef15ebd56fbaa69f9420370679370152cb6629d0c323e84730b1bfdbd47bf7dec3044bbe44acd74265a563fe11b119
+Size (protobuf-4.21.10.tar.gz) = 220276 bytes

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/editors/feathernotes
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/editors/feathernotes
Indexes:

Home | Main Index | Thread Index | Old Index