CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Sun, 6 Jan 2019 11:21:06 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jan  6 11:21:06 UTC 2019

Modified Files:
        pkgsrc/devel/protobuf: Makefile.common distinfo
        pkgsrc/devel/py-protobuf: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/protobuf/patches:
            patch-python_google_protobuf_pyext_descriptor.cc
            patch-python_google_protobuf_pyext_descriptor_containers.cc
            patch-python_google_protobuf_pyext_descriptor_pool.cc
            patch-python_google_protobuf_pyext_extension_dict.cc
            patch-python_google_protobuf_pyext_message.cc

Log Message:
{py-,}protobuf: update to 3.6.1

minor changes.
patches for python3.7
build py-protobuf with "--cpp_implementation" to get _message extension


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/protobuf/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc \
    pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc \
    pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc \
    pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc \
    pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-protobuf/Makefile \
    pkgsrc/devel/py-protobuf/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-protobuf/PLIST

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.common
diff -u pkgsrc/devel/protobuf/Makefile.common:1.11 pkgsrc/devel/protobuf/Makefile.common:1.12
--- pkgsrc/devel/protobuf/Makefile.common:1.11  Sat Aug  4 21:19:39 2018
+++ pkgsrc/devel/protobuf/Makefile.common       Sun Jan  6 11:21:06 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2018/08/04 21:19:39 minskim Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/01/06 11:21:06 markd Exp $
 #
 # used by devel/protobuf/Makefile
 # used by devel/py-protobuf/Makefile
 
-PROTOBUFVER=   3.6.0
+PROTOBUFVER=   3.6.1
 
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 GITHUB_PROJECT=        protobuf

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.20 pkgsrc/devel/protobuf/distinfo:1.21
--- pkgsrc/devel/protobuf/distinfo:1.20 Sat Aug  4 21:19:39 2018
+++ pkgsrc/devel/protobuf/distinfo      Sun Jan  6 11:21:06 2019
@@ -1,12 +1,17 @@
-$NetBSD: distinfo,v 1.20 2018/08/04 21:19:39 minskim Exp $
+$NetBSD: distinfo,v 1.21 2019/01/06 11:21:06 markd Exp $
 
-SHA1 (protobuf-cpp-3.6.0.tar.gz) = d211759135fca52daa2d625f27c386acbe65495f
-RMD160 (protobuf-cpp-3.6.0.tar.gz) = f7bded7812f4740297d297f6bc2550c4aeb63c90
-SHA512 (protobuf-cpp-3.6.0.tar.gz) = 469a85026ca45dc43ccd01221d098905a244e92ca79a6681fae528a3a539184475e14fff9898a0eb82654782fd60c5e4650896b5ce7c7ab3f1baa879251c94b3
-Size (protobuf-cpp-3.6.0.tar.gz) = 4454101 bytes
+SHA1 (protobuf-cpp-3.6.1.tar.gz) = 0595bb8c2447ebd13bec4818f99fa8faa8c8b8c5
+RMD160 (protobuf-cpp-3.6.1.tar.gz) = b8b80a6c7150ead6acde8285b4462957cf2c2cd3
+SHA512 (protobuf-cpp-3.6.1.tar.gz) = 61dd237ff053fa41af661f81dee9b610fc26ea1ace8f644a044c6f1e042075261ebca07c2aa9329dfc5e1dd1daeb345a4c8ff73a7b8c689aa74a11ff71a01f45
+Size (protobuf-cpp-3.6.1.tar.gz) = 4450975 bytes
 SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf
 SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
 SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
+SHA1 (patch-python_google_protobuf_pyext_descriptor.cc) = 32f3ddb90d3b52dd4b6919ec75047dcd2906a218
+SHA1 (patch-python_google_protobuf_pyext_descriptor_containers.cc) = 6aed9e2a5b5803fdecaf0d5a49a48ef219b5ca1f
+SHA1 (patch-python_google_protobuf_pyext_descriptor_pool.cc) = 9fe51dfd39f1e3af202a4cff586947b4ec8475a5
+SHA1 (patch-python_google_protobuf_pyext_extension_dict.cc) = 6fff247e007e7856442480600f98507712c80c69
+SHA1 (patch-python_google_protobuf_pyext_message.cc) = 30faea1052e097d976430e2224c97e98cadb5e75
 SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
 SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261

Index: pkgsrc/devel/py-protobuf/Makefile
diff -u pkgsrc/devel/py-protobuf/Makefile:1.14 pkgsrc/devel/py-protobuf/Makefile:1.15
--- pkgsrc/devel/py-protobuf/Makefile:1.14      Sat Aug  4 21:32:53 2018
+++ pkgsrc/devel/py-protobuf/Makefile   Sun Jan  6 11:21:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/08/04 21:32:53 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2019/01/06 11:21:06 markd Exp $
 
 .include "../../devel/protobuf/Makefile.common"
 
@@ -9,8 +9,13 @@ CATEGORIES+=   python
 MAINTAINER=    khorben%defora.org@localhost
 COMMENT=       Python bindings for protobuf
 
+USE_LANGUAGES+=        c c++
+
 PYSETUPSUBDIR= python
+PYSETUPBUILDARGS=      --cpp_implementation
+PYSETUPINSTALLARGS=    --cpp_implementation
 
+DEPENDS+=      ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.9:../../lang/py-six
 
 EGG_NAME=      protobuf-${PKGVERSION_NOREV}
Index: pkgsrc/devel/py-protobuf/distinfo
diff -u pkgsrc/devel/py-protobuf/distinfo:1.14 pkgsrc/devel/py-protobuf/distinfo:1.15
--- pkgsrc/devel/py-protobuf/distinfo:1.14      Sat Aug  4 21:32:53 2018
+++ pkgsrc/devel/py-protobuf/distinfo   Sun Jan  6 11:21:06 2019
@@ -1,12 +1,17 @@
-$NetBSD: distinfo,v 1.14 2018/08/04 21:32:53 minskim Exp $
+$NetBSD: distinfo,v 1.15 2019/01/06 11:21:06 markd Exp $
 
-SHA1 (protobuf-python-3.6.0.tar.gz) = e5ea65dbcc87eaa86e3440911dacef8544b29c25
-RMD160 (protobuf-python-3.6.0.tar.gz) = 28d826f0b8e7b35cbfc9b9b5c04fdd10f34a40f0
-SHA512 (protobuf-python-3.6.0.tar.gz) = f584684ccc9f59df1602a06ce453a08a1701cad3f063268e5f807393e17a284265151de6822e4a09867f872ae01a63210880058e9dd42c9fadee9bd081503f18
-Size (protobuf-python-3.6.0.tar.gz) = 4750984 bytes
+SHA1 (protobuf-python-3.6.1.tar.gz) = 9170df4cde3ddb94bae7247d209e1cda4432967b
+RMD160 (protobuf-python-3.6.1.tar.gz) = ee9f8344a688f636cee409227b36a5161fa88c44
+SHA512 (protobuf-python-3.6.1.tar.gz) = 9cf80401fca3b58d41c7aa95988bf3763680c5a82009b90f85671762641c7a5a7fd1af691ab258d57fa43f790a9162fdfd96f29f63e888626083b2abe84bafff
+Size (protobuf-python-3.6.1.tar.gz) = 4748789 bytes
 SHA1 (patch-configure) = a35883ff62ba1db429a6cbc12b75714e78e28abf
 SHA1 (patch-configure.ac) = 208a5ce72905aa95ad73ee0f751d4a58f0c37f5f
 SHA1 (patch-m4_acx__check__suncc.m4) = faf96ee5d305c08d30e7c7d3578896971983e1dd
+SHA1 (patch-python_google_protobuf_pyext_descriptor.cc) = 32f3ddb90d3b52dd4b6919ec75047dcd2906a218
+SHA1 (patch-python_google_protobuf_pyext_descriptor_containers.cc) = 6aed9e2a5b5803fdecaf0d5a49a48ef219b5ca1f
+SHA1 (patch-python_google_protobuf_pyext_descriptor_pool.cc) = 9fe51dfd39f1e3af202a4cff586947b4ec8475a5
+SHA1 (patch-python_google_protobuf_pyext_extension_dict.cc) = 6fff247e007e7856442480600f98507712c80c69
+SHA1 (patch-python_google_protobuf_pyext_message.cc) = 30faea1052e097d976430e2224c97e98cadb5e75
 SHA1 (patch-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1
 SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261

Index: pkgsrc/devel/py-protobuf/PLIST
diff -u pkgsrc/devel/py-protobuf/PLIST:1.8 pkgsrc/devel/py-protobuf/PLIST:1.9
--- pkgsrc/devel/py-protobuf/PLIST:1.8  Sat Aug  4 21:32:53 2018
+++ pkgsrc/devel/py-protobuf/PLIST      Sun Jan  6 11:21:06 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/08/04 21:32:53 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/01/06 11:21:06 markd Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -48,6 +48,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
 ${PYSITELIB}/google/protobuf/internal/_parameterized.py
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyc
 ${PYSITELIB}/google/protobuf/internal/_parameterized.pyo
@@ -207,6 +208,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
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.py
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyc
 ${PYSITELIB}/google/protobuf/pyext/cpp_message.pyo

Added files:

Index: pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc:1.1
--- /dev/null   Sun Jan  6 11:21:06 2019
+++ pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor.cc      Sun Jan  6 11:21:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_google_protobuf_pyext_descriptor.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
+
+python3.7 fixes
+
+--- python/google/protobuf/pyext/descriptor.cc.orig    2018-07-30 22:16:10.000000000 +0000
++++ python/google/protobuf/pyext/descriptor.cc
+@@ -56,7 +56,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
Index: pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc:1.1
--- /dev/null   Sun Jan  6 11:21:06 2019
+++ pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_containers.cc   Sun Jan  6 11:21:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_google_protobuf_pyext_descriptor_containers.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
+
+python3.7 fixes 
+
+--- python/google/protobuf/pyext/descriptor_containers.cc.orig 2018-07-30 22:16:10.000000000 +0000
++++ python/google/protobuf/pyext/descriptor_containers.cc
+@@ -66,7 +66,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
Index: pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc:1.1
--- /dev/null   Sun Jan  6 11:21:06 2019
+++ pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_descriptor_pool.cc Sun Jan  6 11:21:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_google_protobuf_pyext_descriptor_pool.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
+
+python3.7 fixes 
+
+--- python/google/protobuf/pyext/descriptor_pool.cc.orig       2018-07-30 22:16:10.000000000 +0000
++++ python/google/protobuf/pyext/descriptor_pool.cc
+@@ -48,7 +48,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
Index: pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc:1.1
--- /dev/null   Sun Jan  6 11:21:06 2019
+++ pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_extension_dict.cc  Sun Jan  6 11:21:06 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_google_protobuf_pyext_extension_dict.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
+
+python3.7 fixes 
+
+--- python/google/protobuf/pyext/extension_dict.cc.orig        2018-07-30 22:16:10.000000000 +0000
++++ python/google/protobuf/pyext/extension_dict.cc
+@@ -53,7 +53,7 @@
+   #endif
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ #endif
+ 
Index: pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc:1.1
--- /dev/null   Sun Jan  6 11:21:06 2019
+++ pkgsrc/devel/protobuf/patches/patch-python_google_protobuf_pyext_message.cc Sun Jan  6 11:21:06 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-python_google_protobuf_pyext_message.cc,v 1.1 2019/01/06 11:21:06 markd Exp $
+
+--- python/google/protobuf/pyext/message.cc.orig       2018-07-30 22:16:10.000000000 +0000
++++ python/google/protobuf/pyext/message.cc
+@@ -79,7 +79,7 @@
+     (PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
+   #define PyString_AsStringAndSize(ob, charpp, sizep) \
+     (PyUnicode_Check(ob)? \
+-       ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
++       ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
+        PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+   #endif
+ #endif
+@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObj
+     return NULL;
+   }
+ #else
+-  field_name = PyUnicode_AsUTF8AndSize(arg, &size);
++  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
+   if (!field_name) {
+     return NULL;
+   }

Prev by Date: CVS commit: pkgsrc/x11/qt5-qtxmlpatterns
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/x11/qt5-qtxmlpatterns
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index