CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Oct  6 08:09:19 UTC 2021

Modified Files:
        pkgsrc/devel/protobuf: Makefile distinfo
        pkgsrc/devel/protobuf/patches:
            patch-third__party_googletest_googlemock_configure
        pkgsrc/devel/py-protobuf: Makefile distinfo

Log Message:
protobuf py-protobuf: updated to 3.18.1

Protocol Buffers v3.18.1

Python

Update setup.py to reflect that we now require at least Python 3.5
Performance fix for DynamicMessage: force GetRaw() to be inlined


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/devel/protobuf/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-protobuf/Makefile
cvs rdiff -u -r1.41 -r1.42 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.47 pkgsrc/devel/protobuf/Makefile:1.48
--- pkgsrc/devel/protobuf/Makefile:1.47 Thu Sep 30 18:59:47 2021
+++ pkgsrc/devel/protobuf/Makefile      Wed Oct  6 08:09:19 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2021/09/30 18:59:47 adam Exp $
+# $NetBSD: Makefile,v 1.48 2021/10/06 08:09:19 adam Exp $
 
-DISTNAME=      protobuf-cpp-3.18.0
+DISTNAME=      protobuf-cpp-3.18.1
 PKGNAME=       ${DISTNAME:S/-cpp//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=protocolbuffers/}

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.55 pkgsrc/devel/protobuf/distinfo:1.56
--- pkgsrc/devel/protobuf/distinfo:1.55 Thu Sep 30 18:59:47 2021
+++ pkgsrc/devel/protobuf/distinfo      Wed Oct  6 08:09:19 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.55 2021/09/30 18:59:47 adam Exp $
+$NetBSD: distinfo,v 1.56 2021/10/06 08:09:19 adam Exp $
 
-SHA1 (protobuf-cpp-3.18.0.tar.gz) = 95fe11069dec2cfa0db93000ae2729a54dffb373
-RMD160 (protobuf-cpp-3.18.0.tar.gz) = 1a5644d9736e42c21b02f6fe276d077a6b706c0a
-SHA512 (protobuf-cpp-3.18.0.tar.gz) = be0a537efb911259cdb33f51683fd3768d20af99df0e7c7a65b43d32ccb14caa28c88bbb1a23d23b7b0795d039e5a9e5228ecbcfb34375de38e425e8bb513040
-Size (protobuf-cpp-3.18.0.tar.gz) = 4743005 bytes
+SHA1 (protobuf-cpp-3.18.1.tar.gz) = ec0d156f35770c47148bc5059b55a65af8331e45
+RMD160 (protobuf-cpp-3.18.1.tar.gz) = 4d4afc8e61a662c24434d00f31b55922b71d93b4
+SHA512 (protobuf-cpp-3.18.1.tar.gz) = 524340259bf084a228b2a3bae9a45b7730fc75e4e523ec928f062a10eaea8b914638007037a1e04ec25db5d23f7d339850cf658b5611c54bde6cf12927651164
+Size (protobuf-cpp-3.18.1.tar.gz) = 4776202 bytes
 SHA1 (patch-configure) = e9953648e5b3df015be007c1c424a564d1eb2bef
 SHA1 (patch-src_google_protobuf_port__def.inc) = b9af7b28ebca182f1e23b5db8899005d38c7837c
-SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
+SHA1 (patch-third__party_googletest_googlemock_configure) = 9afd8358eef2dffe7639ca70081f60535c116855

Index: pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure
diff -u pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure:1.1 pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure:1.2
--- pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure:1.1        Sat Aug  4 21:19:39 2018
+++ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure    Wed Oct  6 08:09:19 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.1 2018/08/04 21:19:39 minskim Exp $
+$NetBSD: patch-third__party_googletest_googlemock_configure,v 1.2 2021/10/06 08:09:19 adam Exp $
 
 Fix shell portability issues.
 
---- third_party/googletest/googlemock/configure.orig   2018-07-31 00:19:25.000000000 +0000
+--- third_party/googletest/googlemock/configure.orig   2021-10-05 18:30:06.000000000 +0000
 +++ third_party/googletest/googlemock/configure
-@@ -16355,7 +16355,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -17329,7 +17329,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
         have_pthreads="$acx_pthread_ok"
  fi
@@ -13,12 +13,12 @@ Fix shell portability issues.
    HAVE_PTHREADS_TRUE=
    HAVE_PTHREADS_FALSE='#'
  else
-@@ -16385,7 +16385,7 @@ else
+@@ -17361,7 +17361,7 @@ else $as_nop
    enable_external_gtest=yes
  fi
  
--if test "x$with_gtest" == "xno"; then :
-+if test "x$with_gtest" = "xno"; then :
+-if test "x$with_gtest" == "xno"
++if test "x$with_gtest" = "xno"
+ then :
    as_fn_error $? "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
  dependency upon GoogleTest to build, please provide a version, or allow
- GoogleMock to use any installed version and fall back upon its internal

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.44 pkgsrc/devel/py-protobuf/Makefile:1.45
--- pkgsrc/devel/py-protobuf/Makefile:1.44      Thu Sep 30 18:59:47 2021
+++ pkgsrc/devel/py-protobuf/Makefile   Wed Oct  6 08:09:19 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2021/09/30 18:59:47 adam Exp $
+# $NetBSD: Makefile,v 1.45 2021/10/06 08:09:19 adam Exp $
 
-DISTNAME=      protobuf-3.18.0
+DISTNAME=      protobuf-3.18.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/protobuf/}

Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.41 pkgsrc/devel/py-protobuf/distinfo:1.42
--- pkgsrc/devel/py-protobuf/distinfo:1.41      Thu Sep 30 18:59:47 2021
+++ pkgsrc/devel/py-protobuf/distinfo   Wed Oct  6 08:09:19 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.41 2021/09/30 18:59:47 adam Exp $
+$NetBSD: distinfo,v 1.42 2021/10/06 08:09:19 adam Exp $
 
-SHA1 (protobuf-3.18.0.tar.gz) = c05fc2fb5ed0b4de7fa2be344ef663ad5efc0e1d
-RMD160 (protobuf-3.18.0.tar.gz) = 824b8152629d7f1be5a72693a95bb7f6f72721f3
-SHA512 (protobuf-3.18.0.tar.gz) = 62aeb337b4328dbdf7081225f5b341d34aab1bd1484bf5230000ad80d3ac2f904efd65ec49763dc0968bfbdff41b02d3b87a049f77028673989d141ad8b8f7db
-Size (protobuf-3.18.0.tar.gz) = 229136 bytes
+SHA1 (protobuf-3.18.1.tar.gz) = 2d72e05555e6fc5c491692bd2ad577cd7cb444f2
+RMD160 (protobuf-3.18.1.tar.gz) = ac89cd1d0fc9c0aee7f7facb21c5ed968a0295bc
+SHA512 (protobuf-3.18.1.tar.gz) = 367241c0375f97e7f7e0ae6b5e3df0130d4cbe41f255932449ac3fd3f1731c1d1448331c38c85f536365f16d47e746dead276264896773bfb319855aa4a6471c
+Size (protobuf-3.18.1.tar.gz) = 229236 bytes