1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

Update devel/protobuf to 3.7.1

- Bump PORTREVISION of dependent ports for shlib change

Changes:	https://github.com/protocolbuffers/protobuf/releases
PR:		236157
Exp-run by:	antoine
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-03-31 13:41:02 +00:00
parent fc67317ae5
commit 73b1e3abe6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=497411
49 changed files with 68 additions and 118 deletions

View File

@ -4,7 +4,7 @@
PORTNAME= libosmpbf
PORTVERSION= 1.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info

View File

@ -4,7 +4,7 @@
PORTNAME= clementine
DISTVERSION= 1.3.1-661
DISTVERSIONSUFFIX= -g4ff370ce1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
PKGNAMESUFFIX= -player

View File

@ -4,7 +4,7 @@
PORTNAME= mixxx
DISTVERSIONPREFIX= release-
DISTVERSION= 2.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= acm@FreeBSD.org

View File

@ -4,6 +4,7 @@
PORTNAME= mixxx
DISTVERSIONPREFIX= release-
DISTVERSION= 2.1.7
PORTREVISION= 1
CATEGORIES= audio
PKGNAMESUFFIX= 21

View File

@ -3,7 +3,7 @@
PORTNAME= mumble
DISTVERSION= 1.3.0-rc1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= feld@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= murmur
DISTVERSION= 1.3.0-rc1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio net
MAINTAINER= feld@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.7.25
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server

View File

@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 8.0.15
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server

View File

@ -3,6 +3,7 @@
PORTNAME= bloaty
PORTVERSION= 1.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= swills@FreeBSD.org

View File

@ -4,7 +4,7 @@
PORTNAME= grpc
PORTVERSION= 1.15.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel

View File

@ -2,7 +2,7 @@
PORTNAME= ignition-msgs
DISTVERSION= 3.0.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/

View File

@ -2,7 +2,7 @@
PORTNAME= ignition-transport
DISTVERSION= 6.0.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/

View File

@ -3,8 +3,8 @@
PORTNAME= protobuf-c
PORTVERSION= 1.3.1
PORTREVISION= 2
DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= truckman@FreeBSD.org

View File

@ -0,0 +1,11 @@
--- t/generated-code2/cxx-generate-packed-data.cc.orig 2018-08-14 04:00:07 UTC
+++ t/generated-code2/cxx-generate-packed-data.cc
@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_en
static void dump_test_unknown_fields (void)
{
EmptyMess mess;
- const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
+ const google::protobuf::Reflection *reflection = mess.GetReflection();
google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
#if GOOGLE_PROTOBUF_VERSION >= 2001000

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= protobuf
PORTVERSION= 3.6.1
PORTREVISION= 1
PORTVERSION= 3.7.1
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= devel

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1535569873
SHA256 (protocolbuffers-protobuf-v3.6.1_GH0.tar.gz) = 3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b
SIZE (protocolbuffers-protobuf-v3.6.1_GH0.tar.gz) = 4485582
TIMESTAMP = 1553693726
SHA256 (protocolbuffers-protobuf-v3.7.1_GH0.tar.gz) = f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f
SIZE (protocolbuffers-protobuf-v3.7.1_GH0.tar.gz) = 4795774

View File

@ -1,27 +0,0 @@
Obtained from: https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
--- configure.ac.orig 2018-07-27 20:30:28 UTC
+++ configure.ac
@@ -165,6 +165,22 @@ AS_IF([test "$with_zlib" != no], [
])
AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
+dnl On some platforms, std::atomic needs a helper library
+AC_MSG_CHECKING(whether -latomic is needed)
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ #include <atomic>
+ #include <cstdint>
+ std::atomic<std::int64_t> v;
+ int main() {
+ return v;
+ }
+]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
+AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
+if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
+ LIBATOMIC_LIBS="-latomic"
+fi
+AC_SUBST([LIBATOMIC_LIBS])
+
AS_IF([test "$with_protoc" != "no"], [
PROTOC=$with_protoc
AS_IF([test "$with_protoc" = "yes"], [

View File

@ -1,22 +0,0 @@
Obtained from: https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
--- src/Makefile.am.orig 2018-07-27 20:30:28 UTC
+++ src/Makefile.am
@@ -163,7 +163,7 @@ nobase_include_HEADERS =
lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
-libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
+libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
if HAVE_LD_VERSION_SCRIPT
libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
@@ -209,7 +209,7 @@ libprotobuf_lite_la_SOURCES =
google/protobuf/io/zero_copy_stream.cc \
google/protobuf/io/zero_copy_stream_impl_lite.cc
-libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
if HAVE_LD_VERSION_SCRIPT
libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map

View File

@ -1,11 +0,0 @@
--- src/google/protobuf/stubs/common.h.orig 2018-07-27 20:30:28 UTC
+++ src/google/protobuf/stubs/common.h
@@ -206,7 +206,7 @@ LIBPROTOBUF_EXPORT void OnShutdownRun(vo
template <typename T>
T* OnShutdownDelete(T* p) {
- OnShutdownRun([](const void* p) { delete static_cast<const T*>(p); }, p);
+ OnShutdownRun([](const void* pp) { delete static_cast<const T*>(pp); }, p);
return p;
}

View File

@ -1,15 +0,0 @@
Obtained from: https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
--- tests.sh.orig 2018-07-27 20:30:28 UTC
+++ tests.sh
@@ -16,8 +16,8 @@ internal_build_cpp() {
git submodule update --init --recursive
./autogen.sh
- ./configure CXXFLAGS="-fPIC" # -fPIC is needed for python cpp test.
- # See python/setup.py for more details
+ ./configure CXXFLAGS="-fPIC -std=c++11" # -fPIC is needed for python cpp test.
+ # See python/setup.py for more details
make -j2
}

View File

@ -36,6 +36,7 @@ include/google/protobuf/dynamic_message.h
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
@ -65,6 +66,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
@ -85,10 +90,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
@ -111,15 +116,15 @@ include/google/protobuf/wrappers.pb.h
include/google/protobuf/wrappers.proto
lib/libprotobuf-lite.a
lib/libprotobuf-lite.so
lib/libprotobuf-lite.so.17
lib/libprotobuf-lite.so.17.0.0
lib/libprotobuf-lite.so.18
lib/libprotobuf-lite.so.18.0.1
lib/libprotobuf.a
lib/libprotobuf.so
lib/libprotobuf.so.17
lib/libprotobuf.so.17.0.0
lib/libprotobuf.so.18
lib/libprotobuf.so.18.0.1
lib/libprotoc.a
lib/libprotoc.so
lib/libprotoc.so.17
lib/libprotoc.so.17.0.0
lib/libprotoc.so.18
lib/libprotoc.so.18.0.1
libdata/pkgconfig/protobuf-lite.pc
libdata/pkgconfig/protobuf.pc

View File

@ -3,7 +3,7 @@
PORTNAME= dnsdist
DISTVERSION= 1.3.3
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= dns net
MASTER_SITES= https://downloads.powerdns.com/releases/ \
LOCAL/cpm

View File

@ -3,6 +3,7 @@
PORTNAME= knot-resolver
DISTVERSION= 3.2.1
PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
https://dns.company/downloads/knot-resolver/

View File

@ -3,6 +3,7 @@
PORTNAME= recursor
DISTVERSION= 4.1.11
PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
PKGNAMEPREFIX= powerdns-

View File

@ -2,6 +2,7 @@
PORTNAME= powerdns
DISTVERSION= 4.1.7
PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}

View File

@ -3,6 +3,7 @@
PORTNAME= Cockatrice
PORTVERSION= 2.7.0
PORTREVISION= 1
CATEGORIES= games
MAINTAINER= sbruno@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= pink-pony
PORTVERSION= 1.4.1
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= caffe
PORTVERSION= 1.0
PORTREVISION= 19
PORTREVISION= 20
CATEGORIES= graphics
MAINTAINER= eric@camachat.org

View File

@ -3,7 +3,7 @@
PORTNAME= opencv
PORTVERSION= 3.4.1
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org

View File

@ -3,8 +3,8 @@
PORTNAME= osgearth
PORTVERSION= 2.10
PORTREVISION= 1
DISTVERSIONPREFIX= ${PORTNAME}-
PORTREVISION= 2
CATEGORIES= graphics geography
MAINTAINER= lbartoletti@tuxfamily.org

View File

@ -2,7 +2,7 @@
PORTNAME= qtpbfimageplugin
PORTVERSION= 1.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= sikmir@gmail.com

View File

@ -4,6 +4,7 @@
PORTNAME= mozc
PORTVERSION= 2.23.2815.102.00
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= japanese
MAINTAINER= hrs@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 3.0.6
PORTREVISION= 8
PORTREVISION= 9
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

View File

@ -4,7 +4,7 @@
PORTNAME= ricochet
PORTVERSION= 1.1.4
DISTVERSIONPREFIX= v
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= collectd
PORTVERSION= 5.8.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/
PKGNAMESUFFIX= 5

View File

@ -3,7 +3,7 @@
PORTNAME= bitcoin
PORTVERSION= 0.17.1
PORTREVISION?= 2
PORTREVISION?= 3
CATEGORIES= net-p2p finance
MASTER_SITES= https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/:DEFAULT \
LOCAL/swills:icon

View File

@ -4,7 +4,7 @@
PORTNAME= litecoin
PORTVERSION= 0.16.3
DISTVERSIONPREFIX= v
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= net-p2p finance
MAINTAINER= swills@FreeBSD.org

View File

@ -4,7 +4,7 @@
PORTNAME= namecoin
PORTVERSION= 0.17.0
DISTVERSIONPREFIX= nc
PORTREVISION= 4
PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= net-p2p dns

View File

@ -4,6 +4,7 @@
PORTNAME= qtum
PORTVERSION= 0.17.2
DISTVERSIONPREFIX= mainnet-ignition-v
PORTREVISION= 1
CATEGORIES= net-p2p finance
MAINTAINER= vd@FreeBSD.org

View File

@ -4,7 +4,7 @@
PORTNAME= zetacoin
PORTVERSION= 0.11.2.3
DISTVERSIONPREFIX= v
PORTREVISION= 25
PORTREVISION= 26
CATEGORIES= net-p2p finance
MAINTAINER= daniel@morante.net

View File

@ -3,6 +3,7 @@
PORTNAME= eternalterminal
DISTVERSIONPREFIX= et-v
DISTVERSION= 5.1.9
PORTREVISION= 1
CATEGORIES= net
MAINTAINER= trevis@silencedpoet.com

View File

@ -3,7 +3,7 @@
PORTNAME= mosh
PORTVERSION= 1.3.2
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= https://mosh.org/ \
ZI

View File

@ -3,7 +3,7 @@
PORTNAME= spoofer
PORTVERSION= 1.2.0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= net
MASTER_SITES= http://www.caida.org/projects/spoofer/downloads/

View File

@ -2,8 +2,8 @@
PORTNAME= lm
DISTVERSION= 2.3.0
PORTREVISION= 4
DISTVERSIONSUFFIX= -src
PORTREVISION= 5
CATEGORIES= science
MASTER_SITES= http://scs.illinois.edu/schulten/${PORTNAME}/download/${PORTNAME}${DISTVERSION:R:S/.//}/
PKGNAMESUFFIX= -uiuc

View File

@ -3,6 +3,7 @@
PORTNAME= paraview
DISTVERSION= 5.6.0
PORTREVISION= 1
CATEGORIES= science graphics
MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/
DISTNAME= ParaView-v${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= certificate-transparency
PORTVERSION= 20161015
PORTREVISION= 32
PORTREVISION= 33
CATEGORIES= security
MAINTAINER= ports@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= zbackup
PORTVERSION= 1.4.4
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= sysutils
MAINTAINER= ports@FreeBSD.org

View File

@ -2,7 +2,7 @@
PORTNAME= mod_pagespeed
PORTVERSION= 1.12.34.2
PORTREVISION= 19
PORTREVISION= 20
PORTEPOCH= 1
CATEGORIES= www devel
MASTER_SITES= LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \