Commit 7cdcf9ae authored by Sunpoet Po-Chuan Hsieh's avatar Sunpoet Po-Chuan Hsieh
Browse files

Update devel/protobuf to 3.6.1

- Bump PORTREVISION of dependent ports for shlib change

Changes:	https://github.com/protocolbuffers/protobuf/releases
PR:		231008
Exp-run by:	antoine
parent 4cda730b
......@@ -4,7 +4,7 @@
PORTNAME= libosmpbf
PORTVERSION= 1.3.3
DISTVERSIONPREFIX= v
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
......@@ -21,6 +21,7 @@ USE_GITHUB= yes
GH_ACCOUNT= scrosby
GH_PROJECT= OSM-binary
USES= cmake
USES= cmake compiler:c++11-lang
USE_CXXSTD= c++11
.include <bsd.port.mk>
......@@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info
......
......@@ -5,7 +5,7 @@ PORTNAME= clementine
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.1-441
DISTVERSIONSUFFIX= -gc01b7bc
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= audio
PKGNAMESUFFIX= -player
......@@ -40,6 +40,7 @@ USES= cmake \
gettext-tools \
pkgconfig \
qt:4 sqlite
USE_CXXSTD= c++11
USE_GL= gl glew glu
USE_XORG= x11
......
......@@ -3,6 +3,7 @@
PORTNAME= mixxx
DISTVERSION= 2.1.5
PORTREVISION= 1
DISTVERSIONPREFIX= release-
CATEGORIES= audio
......
......@@ -3,7 +3,7 @@
PORTNAME= mixxx
PORTVERSION= 2.0.0
DISTVERSIONSUFFIX= -src
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 20
......@@ -34,7 +34,8 @@ LIB_DEPENDS= libchromaprint.so:audio/chromaprint \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= qt:4 scons iconv pkgconfig
USES= compiler:c++11-lang iconv pkgconfig qt:4 scons
USE_CXXSTD= c++11
USE_QT= corelib gui network opengl script scripttools sql sql-sqlite3 \
svg testlib xml xmlpatterns linguisttools_build moc_build \
qmake_build rcc_build uic_build
......
......@@ -3,7 +3,7 @@
PORTNAME= mumble
PORTVERSION= 1.2.19
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= audio
MAINTAINER= feld@FreeBSD.org
......@@ -24,7 +24,8 @@ LIB_DEPENDS+= libspeex.so:audio/speex \
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
USES= compiler cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl
USES= compiler:c++11-lang cpe desktop-file-utils gmake pkgconfig qmake qt:4 ssl
USE_CXXSTD= c++11
USE_GITHUB= yes
GH_ACCOUNT= mumble-voip
GH_PROJECT= mumble celt-0.7.0:mumble_celt_0_7 celt-0.11.0:mumble_celt_0_11
......
--- cplusplus.pri.orig 2017-01-27 12:29:08 UTC
+++ cplusplus.pri
@@ -103,8 +103,8 @@ unix {
# older compilers. In GCC, the following
# flags mean the same thing:
# -std=c++98, -std=c++03, -ansi.
- QMAKE_CXXFLAGS += -std=c++98
- QMAKE_LFLAGS += -std=c++98
+ # QMAKE_CXXFLAGS += -std=c++98
+ # QMAKE_LFLAGS += -std=c++98
}
......@@ -3,7 +3,7 @@
PORTNAME= murmur
PORTVERSION= 1.2.19
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= audio net
MAINTAINER= feld@FreeBSD.org
......@@ -21,6 +21,7 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf
USERS= murmur
GROUPS= murmur
USES= compiler:c++11-lang qmake pkgconfig qt:4 ssl
USE_CXXSTD= c++11
USE_QT= moc_build corelib network sql xml
USE_GITHUB= YES
......
--- cplusplus.pri.orig 2017-01-27 12:29:08 UTC
+++ cplusplus.pri
@@ -103,8 +103,8 @@ unix {
# older compilers. In GCC, the following
# flags mean the same thing:
# -std=c++98, -std=c++03, -ansi.
- QMAKE_CXXFLAGS += -std=c++98
- QMAKE_LFLAGS += -std=c++98
+ # QMAKE_CXXFLAGS += -std=c++98
+ # QMAKE_LFLAGS += -std=c++98
}
......@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.7.24
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
......@@ -96,6 +96,7 @@ SUB_FILES= my.cnf.sample
USERS= mysql
GROUPS= mysql
USE_CXXSTD= c++11
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
......
......@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 8.0.12
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
......
......@@ -4,7 +4,7 @@
PORTNAME= grpc
PORTVERSION= 1.15.1
DISTVERSIONPREFIX= v
PORTREVISION= 0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
......
......@@ -2,6 +2,7 @@
PORTNAME= ignition-msgs
DISTVERSION= 3.0.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
......
......@@ -2,6 +2,7 @@
PORTNAME= ignition-transport
DISTVERSION= 6.0.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
......
......@@ -3,7 +3,7 @@
PORTNAME= pinba
PORTVERSION= 2012.03.20
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= devel
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
......@@ -22,7 +22,8 @@ GH_ACCOUNT= tony2001
GH_PROJECT= pinba_extension
GH_TAGNAME= f76b673
USES= php:ext
USES= compiler:c++11-lang php:ext
USE_CXXSTD= c++11
IGNORE_WITH_PHP= 70 71 72 73
.include <bsd.port.mk>
......@@ -3,6 +3,7 @@
PORTNAME= protobuf-c
PORTVERSION= 1.3.1
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel
......
......@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= protobuf
PORTVERSION= 3.5.2
PORTVERSION= 3.6.1
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
......@@ -19,19 +18,23 @@ BROKEN_sparc64= fails to compile: no atomic ops available
TEST_DEPENDS= googlemock>=0:devel/googlemock \
googletest>=0:devel/googletest
USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig
CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
CONFIGURE_ENV= CC_FOR_BUILD="${CC}" CFLAGS_FOR_BUILD="${CFLAGS}" \
CONFIGURE_ENV= CC_FOR_BUILD="${CC}" \
CFLAGS_FOR_BUILD="${CFLAGS}" \
CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \
CXX_FOR_BUILD="${CXX}" CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
CXX_FOR_BUILD="${CXX}" \
CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
LDFLAGS_FOR_BUILD="${LDFLAGS}"
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
TEST_ARGS= ${MAKE_ARGS} ${_MAKE_JOBS}
TEST_TARGET= check
USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig
USE_CXXSTD= c++11
USE_LDCONFIG= yes
GH_ACCOUNT= google
GH_ACCOUNT= protocolbuffers
USE_GITHUB= yes
post-patch:
......
TIMESTAMP = 1523095599
SHA256 (google-protobuf-v3.5.2_GH0.tar.gz) = 4ffd420f39f226e96aebc3554f9c66a912f6cad6261f39f194f16af8a1f6dab2
SIZE (google-protobuf-v3.5.2_GH0.tar.gz) = 4584659
TIMESTAMP = 1535569873
SHA256 (protocolbuffers-protobuf-v3.6.1_GH0.tar.gz) = 3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b
SIZE (protocolbuffers-protobuf-v3.6.1_GH0.tar.gz) = 4485582
--- src/google/protobuf/stubs/atomicops.h.orig 2017-08-15 23:39:12 UTC
+++ src/google/protobuf/stubs/atomicops.h
@@ -198,6 +198,8 @@ Atomic64 Release_Load(volatile const Ato
#elif defined(__GNUC__)
#if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
#include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
+#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
+#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
#if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
--- 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