Received: by mail.netbsd.org (Postfix, from userid 605) id 399E884F03; Thu, 21 Mar 2019 21:26:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B26DF84E2E for ; Thu, 21 Mar 2019 21:26:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id UrMBIphZ6-QL for ; Thu, 21 Mar 2019 21:26:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 816DD84CDF for ; Thu, 21 Mar 2019 21:26:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 76F08FB16; Thu, 21 Mar 2019 21:26:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1553203583164590" MIME-Version: 1.0 Date: Thu, 21 Mar 2019 21:26:23 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/protobuf To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20190321212623.76F08FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1553203583164590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Mar 21 21:26:23 UTC 2019 Modified Files: pkgsrc/devel/protobuf: Makefile PLIST buildlink3.mk distinfo pkgsrc/devel/protobuf/patches: patch-configure Added Files: pkgsrc/devel/protobuf/patches: patch-src_google_protobuf_testing_zcgunzip.cc patch-src_google_protobuf_testing_zcgzip.cc Removed Files: pkgsrc/devel/protobuf: Makefile.common pkgsrc/devel/protobuf/patches: patch-configure.ac patch-m4_acx__check__suncc.m4 patch-src_google_protobuf_message__lite.cc patch-third__party_googletest_googlemock_configure.ac Log Message: protobuf: updated to 3.7.0 version 3.7.0: C++ * Introduced new MOMI (maybe-outside-memory-interval) parser. * Add an option to json_util to parse enum as case-insensitive. In the future, enum parsing in json_util will become case-sensitive. * Added conformance test for enum aliases * Added support for --cpp_out=speed:... * Added use of C++ override keyword where appropriate * Many other cleanups and fixes. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/protobuf/Makefile cvs rdiff -u -r1.13 -r0 pkgsrc/devel/protobuf/Makefile.common cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/protobuf/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/protobuf/buildlink3.mk cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/protobuf/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/protobuf/patches/patch-configure cvs rdiff -u -r1.2 -r0 pkgsrc/devel/protobuf/patches/patch-configure.ac cvs rdiff -u -r1.1 -r0 \ pkgsrc/devel/protobuf/patches/patch-m4_acx__check__suncc.m4 \ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_message__lite.cc \ pkgsrc/devel/protobuf/patches/patch-third__party_googletest_googlemock_configure.ac cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgunzip.cc \ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgzip.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1553203583164590 Content-Disposition: inline Content-Length: 14716 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/protobuf/Makefile diff -u pkgsrc/devel/protobuf/Makefile:1.17 pkgsrc/devel/protobuf/Makefile:1.18 --- pkgsrc/devel/protobuf/Makefile:1.17 Sun Dec 23 23:51:26 2018 +++ pkgsrc/devel/protobuf/Makefile Thu Mar 21 21:26:23 2019 @@ -1,34 +1,36 @@ -# $NetBSD: Makefile,v 1.17 2018/12/23 23:51:26 tsutsui Exp $ +# $NetBSD: Makefile,v 1.18 2019/03/21 21:26:23 adam Exp $ -.include "Makefile.common" - -DISTNAME= protobuf-cpp-${PROTOBUFVER} +DISTNAME= protobuf-cpp-3.7.0 PKGNAME= ${DISTNAME:S/-cpp//} +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GITHUB:=google/} +GITHUB_PROJECT= protobuf +GITHUB_RELEASE= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/protocolbuffers/protobuf COMMENT= Google protocol buffers +LICENSE= modified-bsd -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_LANGUAGES= c++11 c -USE_TOOLS+= autoreconf automake autoconf gmake - -SET_LIBDIR= yes +WRKSRC= ${WRKDIR}/${DISTNAME:S/-cpp//} +USE_LANGUAGES= c c++11 +USE_LIBTOOL= yes +USE_TOOLS+= gmake +GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= protobuf-lite.pc.in PKGCONFIG_OVERRIDE+= protobuf.pc.in +TEST_TARGET= check -TEST_TARGET= check +SET_LIBDIR= yes .if ${MACHINE_ARCH} == "i386" # 64 bit atomic ops are required CXXFLAGS+= -march=i586 .endif -pre-configure: - ${RUN} cd ${WRKSRC} && ./autogen.sh - -.include "../../devel/googletest/buildlink3.mk" +# included in third_party +#.include "../../devel/googletest/buildlink3.mk" BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4 .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" Index: pkgsrc/devel/protobuf/PLIST diff -u pkgsrc/devel/protobuf/PLIST:1.10 pkgsrc/devel/protobuf/PLIST:1.11 --- pkgsrc/devel/protobuf/PLIST:1.10 Sat Aug 4 21:19:39 2018 +++ pkgsrc/devel/protobuf/PLIST Thu Mar 21 21:26:23 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2018/08/04 21:19:39 minskim Exp $ +@comment $NetBSD: PLIST,v 1.11 2019/03/21 21:26:23 adam Exp $ bin/protoc include/google/protobuf/any.h include/google/protobuf/any.pb.h @@ -37,6 +37,7 @@ include/google/protobuf/dynamic_message. 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_mask.pb.h include/google/protobuf/field_mask.proto include/google/protobuf/generated_enum_reflection.h @@ -66,6 +67,10 @@ include/google/protobuf/message.h include/google/protobuf/message_lite.h include/google/protobuf/metadata.h include/google/protobuf/metadata_lite.h +include/google/protobuf/parse_context.h +include/google/protobuf/port.h +include/google/protobuf/port_def.inc +include/google/protobuf/port_undef.inc include/google/protobuf/reflection.h include/google/protobuf/reflection_ops.h include/google/protobuf/repeated_field.h @@ -86,10 +91,10 @@ include/google/protobuf/stubs/mutex.h include/google/protobuf/stubs/once.h include/google/protobuf/stubs/platform_macros.h include/google/protobuf/stubs/port.h -include/google/protobuf/stubs/singleton.h include/google/protobuf/stubs/status.h include/google/protobuf/stubs/stl_util.h include/google/protobuf/stubs/stringpiece.h +include/google/protobuf/stubs/strutil.h include/google/protobuf/stubs/template_util.h include/google/protobuf/text_format.h include/google/protobuf/timestamp.pb.h Index: pkgsrc/devel/protobuf/buildlink3.mk diff -u pkgsrc/devel/protobuf/buildlink3.mk:1.6 pkgsrc/devel/protobuf/buildlink3.mk:1.7 --- pkgsrc/devel/protobuf/buildlink3.mk:1.6 Sat Aug 4 21:19:39 2018 +++ pkgsrc/devel/protobuf/buildlink3.mk Thu Mar 21 21:26:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/08/04 21:19:39 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2019/03/21 21:26:23 adam Exp $ BUILDLINK_TREE+= protobuf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= protobuf PROTOBUF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.0.0 -BUILDLINK_ABI_DEPENDS.protobuf?= protobuf>=3.6.0 +BUILDLINK_ABI_DEPENDS.protobuf+= protobuf>=3.6.0 BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf .include "../../devel/zlib/buildlink3.mk" Index: pkgsrc/devel/protobuf/distinfo diff -u pkgsrc/devel/protobuf/distinfo:1.22 pkgsrc/devel/protobuf/distinfo:1.23 --- pkgsrc/devel/protobuf/distinfo:1.22 Tue Jan 8 05:56:19 2019 +++ pkgsrc/devel/protobuf/distinfo Thu Mar 21 21:26:23 2019 @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.22 2019/01/08 05:56:19 markd Exp $ +$NetBSD: distinfo,v 1.23 2019/03/21 21:26:23 adam Exp $ -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-src_google_protobuf_message__lite.cc) = 8f2ffe07b2710de5365148153978ad6d9939f522 +SHA1 (protobuf-cpp-3.7.0.tar.gz) = ff4b226c4300dc17691ca6f6ae0af34a2fd6f3d2 +RMD160 (protobuf-cpp-3.7.0.tar.gz) = 12da78f822d9be9ef38cfd43747184cedfb0bbe4 +SHA512 (protobuf-cpp-3.7.0.tar.gz) = 111b3d5d9823f0df3f8f6b7594dc680368b48be5a1ea1e785cc0eb1c9bce71dce598d45de06b6a2f768c2c7c2ded0cc3fa9ad561390f9ac7d8e33edb9d573f7d +Size (protobuf-cpp-3.7.0.tar.gz) = 4554405 bytes +SHA1 (patch-configure) = 22a1fc4e701b348772b3e2e4c68aad3b97032cc5 +SHA1 (patch-src_google_protobuf_testing_zcgunzip.cc) = 7bd71bfa3b93f52add0d27fbdba5b8154173b8bf +SHA1 (patch-src_google_protobuf_testing_zcgzip.cc) = e681eca4f267ad1135e0dbc6a1b2ba91492f40b4 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1 -SHA1 (patch-third__party_googletest_googlemock_configure.ac) = dc06fc7aebaef02df536458e45f77386cc857261 Index: pkgsrc/devel/protobuf/patches/patch-configure diff -u pkgsrc/devel/protobuf/patches/patch-configure:1.3 pkgsrc/devel/protobuf/patches/patch-configure:1.4 --- pkgsrc/devel/protobuf/patches/patch-configure:1.3 Sat Aug 4 21:19:39 2018 +++ pkgsrc/devel/protobuf/patches/patch-configure Thu Mar 21 21:26:23 2019 @@ -1,59 +1,11 @@ -$NetBSD: patch-configure,v 1.3 2018/08/04 21:19:39 minskim Exp $ +$NetBSD: patch-configure,v 1.4 2019/03/21 21:26:23 adam Exp $ +Disable Solaris ISA selection. Fix unportable test(1) operator. ---- configure.orig 2018-06-06 19:44:06.000000000 +0000 +--- configure.orig 2019-02-28 21:34:14.000000000 +0000 +++ configure -@@ -787,7 +787,6 @@ infodir - docdir - oldincludedir - includedir --runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -882,7 +881,6 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1135,15 +1133,6 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -- -runstatedir | --runstatedir | --runstatedi | --runstated \ -- | --runstate | --runstat | --runsta | --runst | --runs \ -- | --run | --ru | --r) -- ac_prev=runstatedir ;; -- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -- | --run=* | --ru=* | --r=*) -- runstatedir=$ac_optarg ;; -- - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1281,7 +1270,7 @@ fi - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir runstatedir -+ libdir localedir mandir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1434,7 +1423,6 @@ Fine tuning of the installation director - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -7600,7 +7588,7 @@ fi +@@ -7601,7 +7589,7 @@ fi fi case $host_os in @@ -62,109 +14,7 @@ Fix unportable test(1) operator. for ac_prog in isainfo do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -8796,7 +8784,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -12231,9 +12219,6 @@ $as_echo_n "checking whether the $compil - openbsd* | bitrig*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu | gnu*) -- link_all_deplibs=no -- ;; - esac - - ld_shlibs=yes -@@ -12488,7 +12473,7 @@ _LT_EOF - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -13158,7 +13143,6 @@ $as_echo "$lt_cv_irix_exported_symbol" > - if test yes = "$lt_cv_irix_exported_symbol"; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi -- link_all_deplibs=no - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' -@@ -13180,7 +13164,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > - esac - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -14295,18 +14279,6 @@ fi - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -17201,7 +17173,7 @@ lt_prog_compiler_static_CXX= - ;; - esac - ;; -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -17576,9 +17548,6 @@ $as_echo_n "checking whether the $compil - ;; - esac - ;; -- linux* | k*bsd*-gnu | gnu*) -- link_all_deplibs_CXX=no -- ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -18272,18 +18241,6 @@ fi - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -18661,7 +18618,7 @@ fi +@@ -18667,7 +18624,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS @@ -173,11 +23,3 @@ Fix unportable test(1) operator. HAVE_LD_VERSION_SCRIPT_TRUE= HAVE_LD_VERSION_SCRIPT_FALSE='#' else -@@ -22590,6 +22549,7 @@ $as_echo X"$file" | - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. Added files: Index: pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgunzip.cc diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgunzip.cc:1.1 --- /dev/null Thu Mar 21 21:26:23 2019 +++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgunzip.cc Thu Mar 21 21:26:23 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_google_protobuf_testing_zcgunzip.cc,v 1.1 2019/03/21 21:26:23 adam Exp $ + +Fix testing. + +--- src/google/protobuf/testing/zcgunzip.cc.orig 2019-03-21 20:16:57.000000000 +0000 ++++ src/google/protobuf/testing/zcgunzip.cc +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32 + #ifndef STDIN_FILENO Index: pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgzip.cc diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgzip.cc:1.1 --- /dev/null Thu Mar 21 21:26:23 2019 +++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_testing_zcgzip.cc Thu Mar 21 21:26:23 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_google_protobuf_testing_zcgzip.cc,v 1.1 2019/03/21 21:26:23 adam Exp $ + +Fix testing. + +--- src/google/protobuf/testing/zcgzip.cc.orig 2019-03-21 20:13:30.000000000 +0000 ++++ src/google/protobuf/testing/zcgzip.cc +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32 + #ifndef STDIN_FILENO --_----------=_1553203583164590--