CVS commit: pkgsrc/devel/protobuf

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 13 12:16:54 UTC 2021

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST distinfo
        pkgsrc/devel/protobuf/patches: patch-src_google_protobuf_port__def.inc

Log Message:
protobuf: updated to 3.17.0

Protocol Buffers v3.17.0

Protocol Compiler

Fix the generated source information for reserved values in Enums.

C++

Fix -Wunused-parameter in map<string, int> fields
Use byteswap.h when building against musl libc
Fix -Wundefined-inline error when using SharedCtor() or SharedDtor()
Fix bug where Descriptor::DebugString() printed proto3 synthetic oneofs.
Provide stable versions of SortAndUnique().
Make sure to cache proto3 optional message fields when they are cleared.
Expose UnsafeArena methods to Reflection.
Use std::string::empty() rather than std::string::size() > 0.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/protobuf/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc

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.44 pkgsrc/devel/protobuf/Makefile:1.45
--- pkgsrc/devel/protobuf/Makefile:1.44 Fri May  7 11:33:01 2021
+++ pkgsrc/devel/protobuf/Makefile      Thu May 13 12:16:54 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2021/05/07 11:33:01 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/05/13 12:16:54 adam Exp $
 
-DISTNAME=      protobuf-cpp-3.16.0
+DISTNAME=      protobuf-cpp-3.17.0
 PKGNAME=       ${DISTNAME:S/-cpp//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.14 pkgsrc/devel/protobuf/PLIST:1.15
--- pkgsrc/devel/protobuf/PLIST:1.14    Sat Nov 14 14:07:40 2020
+++ pkgsrc/devel/protobuf/PLIST Thu May 13 12:16:54 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2020/11/14 14:07:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2021/05/13 12:16:54 adam Exp $
 bin/protoc
 include/google/protobuf/any.h
 include/google/protobuf/any.pb.h
@@ -15,6 +15,7 @@ include/google/protobuf/compiler/csharp/
 include/google/protobuf/compiler/csharp/csharp_names.h
 include/google/protobuf/compiler/importer.h
 include/google/protobuf/compiler/java/java_generator.h
+include/google/protobuf/compiler/java/java_kotlin_generator.h
 include/google/protobuf/compiler/java/java_names.h
 include/google/protobuf/compiler/js/js_generator.h
 include/google/protobuf/compiler/js/well_known_types_embed.h

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.49 pkgsrc/devel/protobuf/distinfo:1.50
--- pkgsrc/devel/protobuf/distinfo:1.49 Fri May  7 11:33:01 2021
+++ pkgsrc/devel/protobuf/distinfo      Thu May 13 12:16:54 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.49 2021/05/07 11:33:01 adam Exp $
+$NetBSD: distinfo,v 1.50 2021/05/13 12:16:54 adam Exp $
 
-SHA1 (protobuf-cpp-3.16.0.tar.gz) = 22d45531cdb64b2df63c0d0edc75885e351c3b3e
-RMD160 (protobuf-cpp-3.16.0.tar.gz) = bc09709fc36f11109ff4b65d10bfdcea6a2d0e5f
-SHA512 (protobuf-cpp-3.16.0.tar.gz) = 16db94ea62ec5743f730215fc241a6112c67695359603733dd042b21f88306d31274735246a8771a33c23831c4e789eeeb94a105d19ba4889d29232a6b4ac932
-Size (protobuf-cpp-3.16.0.tar.gz) = 4661289 bytes
+SHA1 (protobuf-cpp-3.17.0.tar.gz) = aa0c0e46f06adbb199f45fcb69a115b7344ada79
+RMD160 (protobuf-cpp-3.17.0.tar.gz) = 691ee68e6a5e59bd5e4b9b7361d481c38ae7c691
+SHA512 (protobuf-cpp-3.17.0.tar.gz) = 9f1ed58da7db094ae16e4de60f550e72d36422d2a71b5ca7de2255f9b7a21237811fd7f23826fb8f39927543229833962d97647e6800c1858c0a673b959b9f19
+Size (protobuf-cpp-3.17.0.tar.gz) = 4688814 bytes
 SHA1 (patch-configure) = 22a1fc4e701b348772b3e2e4c68aad3b97032cc5
-SHA1 (patch-src_google_protobuf_port__def.inc) = 40948a86bb1be18937a3d729f9cc7dc1499a5977
+SHA1 (patch-src_google_protobuf_port__def.inc) = c65c327878691dcd7d3c7be496c51ca4ff8ae776
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1

Index: pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc
diff -u pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc:1.1 pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc:1.2
--- pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc:1.1   Wed Mar 31 10:18:47 2021
+++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc       Thu May 13 12:16:54 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_google_protobuf_port__def.inc,v 1.1 2021/03/31 10:18:47 jperkin Exp $
+$NetBSD: patch-src_google_protobuf_port__def.inc,v 1.2 2021/05/13 12:16:54 adam Exp $
 
 SunOS does not support init_priority.
 
---- src/google/protobuf/port_def.inc.orig      2021-03-04 21:39:09.000000000 +0000
+--- src/google/protobuf/port_def.inc.orig      2021-05-12 23:23:56.000000000 +0000
 +++ src/google/protobuf/port_def.inc
-@@ -587,7 +587,7 @@
- #define PROTOBUF_ATTRIBUTE_NO_DESTROY
+@@ -506,7 +506,7 @@
+ #ifdef PROTOBUF_ATTRIBUTE_INIT_PRIORITY
+ #error PROTOBUF_ATTRIBUTE_INIT_PRIORITY was previously defined
  #endif
- 
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && !defined(__sun)
- // Protobuf extensions and reflection require registration of the protos linked
- // in the binary. Not until everything is registered does the runtime have a
- // complete view on all protos. When code is using reflection or extensions
+-#if PROTOBUF_GNUC_MIN(3, 0)
++#if PROTOBUF_GNUC_MIN(3, 0) && !defined(__sun)
+ #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY __attribute__((init_priority((102))))
+ #else
+ #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY