CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun  9 04:57:10 UTC 2021

Modified Files:
        pkgsrc/devel/protobuf: Makefile PLIST distinfo
        pkgsrc/devel/protobuf/patches: patch-configure
            patch-src_google_protobuf_port__def.inc
        pkgsrc/devel/py-protobuf: Makefile distinfo
Removed Files:
        pkgsrc/devel/protobuf/patches: patch-src_google_protobuf_stubs_port.h

Log Message:
protobuf py-protobuf: updated to 3.17.3

Protocol Buffers v3.17.3

C++

Introduce FieldAccessListener.
Stop emitting boilerplate {Copy/Merge}From in each ProtoBuf class
Fixed some uninitialized variable warnings in generated_message_reflection.cc.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/protobuf/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/protobuf/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.39 -r1.40 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.45 pkgsrc/devel/protobuf/Makefile:1.46
--- pkgsrc/devel/protobuf/Makefile:1.45 Thu May 13 12:16:54 2021
+++ pkgsrc/devel/protobuf/Makefile      Wed Jun  9 04:57:10 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2021/05/13 12:16:54 adam Exp $
+# $NetBSD: Makefile,v 1.46 2021/06/09 04:57:10 adam Exp $
 
-DISTNAME=      protobuf-cpp-3.17.0
+DISTNAME=      protobuf-cpp-3.17.3
 PKGNAME=       ${DISTNAME:S/-cpp//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}

Index: pkgsrc/devel/protobuf/PLIST
diff -u pkgsrc/devel/protobuf/PLIST:1.15 pkgsrc/devel/protobuf/PLIST:1.16
--- pkgsrc/devel/protobuf/PLIST:1.15    Thu May 13 12:16:54 2021
+++ pkgsrc/devel/protobuf/PLIST Wed Jun  9 04:57:10 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2021/05/13 12:16:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/06/09 04:57:10 adam Exp $
 bin/protoc
 include/google/protobuf/any.h
 include/google/protobuf/any.pb.h
@@ -39,12 +39,16 @@ include/google/protobuf/empty.pb.h
 include/google/protobuf/empty.proto
 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_reflection.h
 include/google/protobuf/generated_message_table_driven.h
+include/google/protobuf/generated_message_tctable_decl.h
+include/google/protobuf/generated_message_tctable_impl.h
+include/google/protobuf/generated_message_tctable_impl.inc
 include/google/protobuf/generated_message_util.h
 include/google/protobuf/has_bits.h
 include/google/protobuf/implicit_weak_message.h

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.53 pkgsrc/devel/protobuf/distinfo:1.54
--- pkgsrc/devel/protobuf/distinfo:1.53 Fri May 14 20:52:09 2021
+++ pkgsrc/devel/protobuf/distinfo      Wed Jun  9 04:57:10 2021
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.53 2021/05/14 20:52:09 wiz Exp $
+$NetBSD: distinfo,v 1.54 2021/06/09 04:57:10 adam Exp $
 
-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) = 68f6fee8ff6e5e03ace63b57bf5021604c4de41a
-SHA1 (patch-src_google_protobuf_port__def.inc) = c65c327878691dcd7d3c7be496c51ca4ff8ae776
-SHA1 (patch-src_google_protobuf_stubs_port.h) = d1ced40cccf13b48b60b77edf4aace8c667e8429
+SHA1 (protobuf-cpp-3.17.3.tar.gz) = 2adf8fc488302f054a1391855c9e7aced8a3c8c0
+RMD160 (protobuf-cpp-3.17.3.tar.gz) = 745ca2105f22a1f3b5a81eb1af4241128805ac61
+SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8
+Size (protobuf-cpp-3.17.3.tar.gz) = 4710418 bytes
+SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
+SHA1 (patch-src_google_protobuf_port__def.inc) = b9af7b28ebca182f1e23b5db8899005d38c7837c
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1

Index: pkgsrc/devel/protobuf/patches/patch-configure
diff -u pkgsrc/devel/protobuf/patches/patch-configure:1.5 pkgsrc/devel/protobuf/patches/patch-configure:1.6
--- pkgsrc/devel/protobuf/patches/patch-configure:1.5   Fri May 14 20:52:09 2021
+++ pkgsrc/devel/protobuf/patches/patch-configure       Wed Jun  9 04:57:10 2021
@@ -1,13 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2021/05/14 20:52:09 wiz Exp $
+$NetBSD: patch-configure,v 1.6 2021/06/09 04:57:10 adam Exp $
 
 Disable Solaris ISA selection.
 
-Fix unportable test(1) operator.
-https://github.com/protocolbuffers/protobuf/pull/8616
-
---- configure.orig     2019-02-28 21:34:14.000000000 +0000
+--- configure.orig     2021-06-08 14:11:47.000000000 +0000
 +++ configure
-@@ -7601,7 +7589,7 @@ fi
+@@ -7640,7 +7640,7 @@ fi
  fi
  
    case $host_os in
@@ -16,12 +13,3 @@ https://github.com/protocolbuffers/proto
        for ac_prog in isainfo
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -18667,7 +18624,7 @@ fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
-- if test "$have_ld_version_script" == "yes"; then
-+ if test "$have_ld_version_script" = "yes"; then
-   HAVE_LD_VERSION_SCRIPT_TRUE=
-   HAVE_LD_VERSION_SCRIPT_FALSE='#'
- else

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.2 pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc:1.3
--- pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc:1.2   Thu May 13 12:16:54 2021
+++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_port__def.inc       Wed Jun  9 04:57:10 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_google_protobuf_port__def.inc,v 1.2 2021/05/13 12:16:54 adam Exp $
+$NetBSD: patch-src_google_protobuf_port__def.inc,v 1.3 2021/06/09 04:57:10 adam Exp $
 
 SunOS does not support init_priority.
 
---- src/google/protobuf/port_def.inc.orig      2021-05-12 23:23:56.000000000 +0000
+--- src/google/protobuf/port_def.inc.orig      2021-06-08 14:11:11.000000000 +0000
 +++ src/google/protobuf/port_def.inc
-@@ -506,7 +506,7 @@
+@@ -541,7 +541,7 @@
  #ifdef PROTOBUF_ATTRIBUTE_INIT_PRIORITY
  #error PROTOBUF_ATTRIBUTE_INIT_PRIORITY was previously defined
  #endif
--#if PROTOBUF_GNUC_MIN(3, 0)
-+#if PROTOBUF_GNUC_MIN(3, 0) && !defined(__sun)
+-#if PROTOBUF_GNUC_MIN(3, 0) && (!defined(__APPLE__) || defined(__clang__))
++#if PROTOBUF_GNUC_MIN(3, 0) && !defined(__sun) && (!defined(__APPLE__) || defined(__clang__))
  #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY __attribute__((init_priority((102))))
  #else
  #define PROTOBUF_ATTRIBUTE_INIT_PRIORITY

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.42 pkgsrc/devel/py-protobuf/Makefile:1.43
--- pkgsrc/devel/py-protobuf/Makefile:1.42      Thu May 13 12:17:38 2021
+++ pkgsrc/devel/py-protobuf/Makefile   Wed Jun  9 04:57:10 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2021/05/13 12:17:38 adam Exp $
+# $NetBSD: Makefile,v 1.43 2021/06/09 04:57:10 adam Exp $
 
-DISTNAME=      protobuf-3.17.0
+DISTNAME=      protobuf-3.17.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/-python//}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/protobuf/}

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.39 pkgsrc/devel/py-protobuf/distinfo:1.40
--- pkgsrc/devel/py-protobuf/distinfo:1.39      Thu May 13 12:17:38 2021
+++ pkgsrc/devel/py-protobuf/distinfo   Wed Jun  9 04:57:10 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.39 2021/05/13 12:17:38 adam Exp $
+$NetBSD: distinfo,v 1.40 2021/06/09 04:57:10 adam Exp $
 
-SHA1 (protobuf-3.17.0.tar.gz) = 781a449280b9639c4fee64d98a8154674165be2b
-RMD160 (protobuf-3.17.0.tar.gz) = 31a74683316221261cb3ab1db64121624bbc3e3e
-SHA512 (protobuf-3.17.0.tar.gz) = 56a11b0340d4721090bf40bceef76d37a0d50736f6f87997e5c8f09d77e4231a0230f1af66c250eaf59556e814a9ea1ee90966516567137a89f0d8af9314ad99
-Size (protobuf-3.17.0.tar.gz) = 228735 bytes
+SHA1 (protobuf-3.17.3.tar.gz) = 62f27d8042bc22d07b2df22beb85e0c8d3dad4ce
+RMD160 (protobuf-3.17.3.tar.gz) = db4f62ffebdc89d250272f8b2f5af66652cf090f
+SHA512 (protobuf-3.17.3.tar.gz) = 7ac0e788672c4c6429a257715411a5c4092fc15ee4f05abca8a327b0631471d94abdc27250f500cea37ba0b8c788ec61cbecc8d5db246bfa3f053036662977cd
+Size (protobuf-3.17.3.tar.gz) = 228448 bytes