diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/android-tools/Makefile | 2 | ||||
-rw-r--r-- | devel/bear/Makefile | 2 | ||||
-rw-r--r-- | devel/bloaty/Makefile | 2 | ||||
-rw-r--r-- | devel/google-cloud-cpp/Makefile | 2 | ||||
-rw-r--r-- | devel/google-cloud-cpp117/Makefile | 2 | ||||
-rw-r--r-- | devel/grpc/Makefile | 1 | ||||
-rw-r--r-- | devel/grpc142/Makefile | 2 | ||||
-rw-r--r-- | devel/ignition-msgs/Makefile | 2 | ||||
-rw-r--r-- | devel/kpublictransport/Makefile | 1 | ||||
-rw-r--r-- | devel/libphonenumber/Makefile | 1 | ||||
-rw-r--r-- | devel/protobuf-c/Makefile | 1 | ||||
-rw-r--r-- | devel/protobuf/Makefile | 4 | ||||
-rw-r--r-- | devel/protobuf/distinfo | 6 | ||||
-rw-r--r-- | devel/protobuf/files/patch-i386 | 23 | ||||
-rw-r--r-- | devel/protobuf/pkg-plist | 30 |
15 files changed, 44 insertions, 37 deletions
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile index f675e1001dd7..ce34e9edd176 100644 --- a/devel/android-tools/Makefile +++ b/devel/android-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= android-tools PORTVERSION= 31.0.3p2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= GH diff --git a/devel/bear/Makefile b/devel/bear/Makefile index a4f8c7a8173e..0274c5ce3838 100644 --- a/devel/bear/Makefile +++ b/devel/bear/Makefile @@ -1,6 +1,6 @@ PORTNAME= bear DISTVERSION= 3.0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org diff --git a/devel/bloaty/Makefile b/devel/bloaty/Makefile index 82071c689e0e..7d3e331963ec 100644 --- a/devel/bloaty/Makefile +++ b/devel/bloaty/Makefile @@ -1,7 +1,7 @@ PORTNAME= bloaty PORTVERSION= 1.1 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile index af7b7a4ef5e5..de36bb72aeca 100644 --- a/devel/google-cloud-cpp/Makefile +++ b/devel/google-cloud-cpp/Makefile @@ -1,7 +1,7 @@ PORTNAME= google-cloud-cpp DISTVERSIONPREFIX= v DISTVERSION= 1.21.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= devel DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/google-cloud-cpp117/Makefile b/devel/google-cloud-cpp117/Makefile index bad3c9632131..815cc34ccb3c 100644 --- a/devel/google-cloud-cpp117/Makefile +++ b/devel/google-cloud-cpp117/Makefile @@ -1,7 +1,7 @@ PORTNAME= google-cloud-cpp DISTVERSIONPREFIX= v DISTVERSION= 1.17.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel PKGNAMESUFFIX= 117 DIST_SUBDIR= ${PORTNAME} diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 8d5b19c8909a..a6d4100ed50a 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -1,6 +1,7 @@ PORTNAME= grpc PORTVERSION= 1.49.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel diff --git a/devel/grpc142/Makefile b/devel/grpc142/Makefile index 4722c627bd4a..643f7db24f4c 100644 --- a/devel/grpc142/Makefile +++ b/devel/grpc142/Makefile @@ -1,7 +1,7 @@ PORTNAME= grpc PORTVERSION= 1.42.0 -PORTREVISION= 2 DISTVERSIONPREFIX= v +PORTREVISION= 3 CATEGORIES= devel PKGNAMESUFFIX= 142 diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile index 49801c0be723..972515386f21 100644 --- a/devel/ignition-msgs/Makefile +++ b/devel/ignition-msgs/Makefile @@ -1,6 +1,6 @@ PORTNAME= ignition-msgs DISTVERSION= 3.0.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ diff --git a/devel/kpublictransport/Makefile b/devel/kpublictransport/Makefile index 2f52e01194d9..fee7c5c12ee9 100644 --- a/devel/kpublictransport/Makefile +++ b/devel/kpublictransport/Makefile @@ -1,5 +1,6 @@ PORTNAME= kpublictransport DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile index acbcee0574a6..2531831fdb9f 100644 --- a/devel/libphonenumber/Makefile +++ b/devel/libphonenumber/Makefile @@ -1,6 +1,7 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v DISTVERSION= 8.12.56 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile index dce9f30d48de..051a9ea6e181 100644 --- a/devel/protobuf-c/Makefile +++ b/devel/protobuf-c/Makefile @@ -1,5 +1,6 @@ PORTNAME= protobuf-c DISTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile index 57f4dbb8f119..330fb0ce19df 100644 --- a/devel/protobuf/Makefile +++ b/devel/protobuf/Makefile @@ -1,9 +1,9 @@ PORTNAME= protobuf -PORTVERSION= 3.20.3 +PORTVERSION= 3.21.7 DISTVERSIONPREFIX= cpp- PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION}/ +MASTER_SITES= https://github.com/protocolbuffers/protobuf/releases/download/v${PORTVERSION:R:E}.${PORTVERSION:E}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Data interchange format library diff --git a/devel/protobuf/distinfo b/devel/protobuf/distinfo index 92e10e31778b..55607e59fb34 100644 --- a/devel/protobuf/distinfo +++ b/devel/protobuf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767844 -SHA256 (protobuf-cpp-3.20.3.tar.gz) = e51cc8fc496f893e2a48beb417730ab6cbcb251142ad8b2cd1951faa5c76fe3d -SIZE (protobuf-cpp-3.20.3.tar.gz) = 4855826 +TIMESTAMP = 1664821519 +SHA256 (protobuf-cpp-3.21.7.tar.gz) = 70de993af0b4f2ddacce59e62ba6d7b7e48faf48beb1b0d5f1ac0e1fb0a68423 +SIZE (protobuf-cpp-3.21.7.tar.gz) = 4855915 diff --git a/devel/protobuf/files/patch-i386 b/devel/protobuf/files/patch-i386 index 401026930a2e..56efb9d86368 100644 --- a/devel/protobuf/files/patch-i386 +++ b/devel/protobuf/files/patch-i386 @@ -1,14 +1,13 @@ -Reference: https://github.com/protocolbuffers/protobuf/issues/9792 - http://pb2.nyi.freebsd.org/data/123i386-default-foo/2022-04-16_08h34m58s/logs/errors/protobuf-3.20.0,1.log +Obtained from: https://cgit.freebsd.org/ports/commit/?id=c212fb9fcceacf49ac4f236c7944aaec5d3cfa57 ---- src/google/protobuf/arenastring.cc.orig 2022-03-25 21:52:12 UTC -+++ src/google/protobuf/arenastring.cc -@@ -64,7 +64,7 @@ constexpr size_t kNewAlign = alignof(std::max_align_t) +--- src/google/protobuf/arena_impl.h.orig 2022-09-29 19:05:00 UTC ++++ src/google/protobuf/arena_impl.h +@@ -640,7 +640,7 @@ class PROTOBUF_EXPORT ThreadSafeArena { + #ifdef _MSC_VER + #pragma warning(disable : 4324) #endif - constexpr size_t kStringAlign = alignof(std::string); - --static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); -+//static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); - static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); - - } // namespace +- struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator { ++ struct alignas(alignof(std::atomic<LifecycleIdAtomic>)) CacheAlignedLifecycleIdGenerator { + std::atomic<LifecycleIdAtomic> id; + }; + static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_; diff --git a/devel/protobuf/pkg-plist b/devel/protobuf/pkg-plist index 6646a259af39..4d7fabcc4711 100644 --- a/devel/protobuf/pkg-plist +++ b/devel/protobuf/pkg-plist @@ -10,19 +10,20 @@ include/google/protobuf/arenastring.h include/google/protobuf/arenaz_sampler.h include/google/protobuf/compiler/code_generator.h include/google/protobuf/compiler/command_line_interface.h -include/google/protobuf/compiler/cpp/cpp_file.h include/google/protobuf/compiler/cpp/cpp_generator.h -include/google/protobuf/compiler/cpp/cpp_helpers.h -include/google/protobuf/compiler/cpp/cpp_names.h +include/google/protobuf/compiler/cpp/file.h +include/google/protobuf/compiler/cpp/generator.h +include/google/protobuf/compiler/cpp/helpers.h +include/google/protobuf/compiler/cpp/names.h include/google/protobuf/compiler/csharp/csharp_doc_comment.h include/google/protobuf/compiler/csharp/csharp_generator.h include/google/protobuf/compiler/csharp/csharp_names.h include/google/protobuf/compiler/csharp/csharp_options.h include/google/protobuf/compiler/importer.h +include/google/protobuf/compiler/java/generator.h include/google/protobuf/compiler/java/java_generator.h -include/google/protobuf/compiler/java/java_kotlin_generator.h -include/google/protobuf/compiler/java/java_names.h -include/google/protobuf/compiler/js/js_generator.h +include/google/protobuf/compiler/java/kotlin_generator.h +include/google/protobuf/compiler/java/names.h include/google/protobuf/compiler/objectivec/objectivec_generator.h include/google/protobuf/compiler/objectivec/objectivec_helpers.h include/google/protobuf/compiler/parser.h @@ -30,8 +31,9 @@ include/google/protobuf/compiler/php/php_generator.h include/google/protobuf/compiler/plugin.h include/google/protobuf/compiler/plugin.pb.h include/google/protobuf/compiler/plugin.proto +include/google/protobuf/compiler/python/generator.h +include/google/protobuf/compiler/python/pyi_generator.h include/google/protobuf/compiler/python/python_generator.h -include/google/protobuf/compiler/python/python_pyi_generator.h include/google/protobuf/compiler/ruby/ruby_generator.h include/google/protobuf/descriptor.h include/google/protobuf/descriptor.pb.h @@ -42,6 +44,7 @@ include/google/protobuf/duration.proto include/google/protobuf/dynamic_message.h include/google/protobuf/empty.pb.h include/google/protobuf/empty.proto +include/google/protobuf/endian.h include/google/protobuf/explicitly_constructed.h include/google/protobuf/extension_set.h include/google/protobuf/extension_set_inl.h @@ -83,6 +86,7 @@ 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_internal.h include/google/protobuf/reflection_ops.h include/google/protobuf/repeated_field.h include/google/protobuf/repeated_ptr_field.h @@ -128,15 +132,15 @@ include/google/protobuf/wrappers.pb.h include/google/protobuf/wrappers.proto lib/libprotobuf-lite.a lib/libprotobuf-lite.so -lib/libprotobuf-lite.so.31 -lib/libprotobuf-lite.so.31.0.3 +lib/libprotobuf-lite.so.32 +lib/libprotobuf-lite.so.32.0.7 lib/libprotobuf.a lib/libprotobuf.so -lib/libprotobuf.so.31 -lib/libprotobuf.so.31.0.3 +lib/libprotobuf.so.32 +lib/libprotobuf.so.32.0.7 lib/libprotoc.a lib/libprotoc.so -lib/libprotoc.so.31 -lib/libprotoc.so.31.0.3 +lib/libprotoc.so.32 +lib/libprotoc.so.32.0.7 libdata/pkgconfig/protobuf-lite.pc libdata/pkgconfig/protobuf.pc |