CVS commit: pkgsrc/devel/protobuf

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Apr 16 09:56:14 UTC 2026

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/protobuf/patches: patch-src_file__lists.cmake

Log Message:
protobuf: install additional includes


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/protobuf/PLIST
cvs rdiff -u -r1.98 -r1.99 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/protobuf/patches/patch-src_file__lists.cmake

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.103 pkgsrc/devel/protobuf/Makefile:1.104
--- pkgsrc/devel/protobuf/Makefile:1.103        Tue Mar 31 17:42:29 2026
+++ pkgsrc/devel/protobuf/Makefile      Thu Apr 16 09:56:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2026/03/31 17:42:29 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2026/04/16 09:56:13 adam Exp $
 #
 # When updating this, please also update devel/py-protobuf.
 #
@@ -9,6 +9,7 @@
 # require a recursive revbump.
 
 DISTNAME=      protobuf-34.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}
 GITHUB_PROJECT=        protobuf
@@ -27,8 +28,6 @@ FORCE_CXX_STD=                c++17
 GCC_REQD+=     13
 
 CMAKE_CONFIGURE_ARGS+= -Dprotobuf_ABSL_PROVIDER=package
-# FIXME: Currently libupd makes net/grpc build fail.
-#CMAKE_CONFIGURE_ARGS+=        -Dprotobuf_BUILD_LIBUPB=OFF
 CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_SHARED_LIBS=ON
 # requires googletest to be checked out in third_party/googletest
 CMAKE_CONFIGURE_ARGS+= -Dprotobuf_BUILD_TESTS=OFF

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.34 pkgsrc/devel/protobuf/PLIST:1.35
--- pkgsrc/devel/protobuf/PLIST:1.34    Thu Mar 26 09:31:53 2026
+++ pkgsrc/devel/protobuf/PLIST Thu Apr 16 09:56:13 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2026/03/26 09:31:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2026/04/16 09:56:13 adam Exp $
 bin/protoc
 bin/protoc-${PKGVERSION}.0
 bin/protoc-gen-upb
@@ -43,6 +43,8 @@ include/google/protobuf/compiler/php/nam
 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/pyi_generator.h
 include/google/protobuf/compiler/retention.h
 include/google/protobuf/compiler/scc.h
 include/google/protobuf/compiler/subprocess.h

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.98 pkgsrc/devel/protobuf/distinfo:1.99
--- pkgsrc/devel/protobuf/distinfo:1.98 Thu Mar 26 09:31:53 2026
+++ pkgsrc/devel/protobuf/distinfo      Thu Apr 16 09:56:13 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.98 2026/03/26 09:31:53 adam Exp $
+$NetBSD: distinfo,v 1.99 2026/04/16 09:56:13 adam Exp $
 
 BLAKE2s (protobuf-34.1.tar.gz) = 21220b49697972be7c839f8ceb3f8ee288519bd91f0eb28c8e79f845e41d693c
 SHA512 (protobuf-34.1.tar.gz) = 7d4baa4becc19b230366257ac0db5c8a41225d5bb427f344b2cb75e555c1af04a8f6c9273cc97b3e35d9d9956775e152a25a273fed6cc6961a6c85621e76d684
 Size (protobuf-34.1.tar.gz) = 7034963 bytes
+SHA1 (patch-src_file__lists.cmake) = 0b693792cefcff5bed559c6abbe9092e4fb1efdc

Added files:

Index: pkgsrc/devel/protobuf/patches/patch-src_file__lists.cmake
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-src_file__lists.cmake:1.1
--- /dev/null   Thu Apr 16 09:56:14 2026
+++ pkgsrc/devel/protobuf/patches/patch-src_file__lists.cmake   Thu Apr 16 09:56:13 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_file__lists.cmake,v 1.1 2026/04/16 09:56:13 adam Exp $
+
+Install additional headers (required by py-grpctio-tools).
+
+--- src/file_lists.cmake.orig  2026-04-16 08:24:30.749155340 +0000
++++ src/file_lists.cmake
+@@ -348,6 +348,8 @@ set(libprotoc_public_hdrs
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/names.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/nsobject_methods.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/names.h
++  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
++  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/retention.h