Commit 73b1e3ab authored by Sunpoet Po-Chuan Hsieh's avatar Sunpoet Po-Chuan Hsieh
Browse files

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
parent fc67317a
......@@ -4,7 +4,7 @@
PORTNAME= libosmpbf
PORTVERSION= 1.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info
......
......@@ -4,7 +4,7 @@
PORTNAME= clementine
DISTVERSION= 1.3.1-661
DISTVERSIONSUFFIX= -g4ff370ce1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= audio
PKGNAMESUFFIX= -player
......
......@@ -4,7 +4,7 @@
PORTNAME= mixxx
DISTVERSIONPREFIX= release-
DISTVERSION= 2.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= acm@FreeBSD.org
......
......@@ -4,6 +4,7 @@
PORTNAME= mixxx
DISTVERSIONPREFIX= release-
DISTVERSION= 2.1.7
PORTREVISION= 1
CATEGORIES= audio
PKGNAMESUFFIX= 21
......
......@@ -3,7 +3,7 @@
PORTNAME= mumble
DISTVERSION= 1.3.0-rc1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= feld@FreeBSD.org
......
......@@ -3,7 +3,7 @@
PORTNAME= murmur
DISTVERSION= 1.3.0-rc1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= audio net
MAINTAINER= feld@FreeBSD.org
......
......@@ -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
......
......@@ -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
......
......@@ -3,6 +3,7 @@
PORTNAME= bloaty
PORTVERSION= 1.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= swills@FreeBSD.org
......
......@@ -4,7 +4,7 @@
PORTNAME= grpc
PORTVERSION= 1.15.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
......
......@@ -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=/
......
......@@ -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=/
......
......@@ -3,8 +3,8 @@
PORTNAME= protobuf-c
PORTVERSION= 1.3.1
PORTREVISION= 2
DISTVERSIONPREFIX= v
PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= truckman@FreeBSD.org
......
--- 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
......@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= protobuf
PORTVERSION= 3.6.1
PORTREVISION= 1
PORTVERSION= 3.7.1
DISTVERSIONPREFIX= v
PORTEPOCH= 1
CATEGORIES= devel
......
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
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"], [
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
--- 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;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment