From 45e3145726cf3a721144c826261cd1c1d93ce930 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 16 Mar 2024 12:43:37 +0100 Subject: [PATCH] Revert "protobuf: 25.3 -> 26.0" This reverts commit 07b322ea8cb7f8ff40bbeeca4cd1327b49a765d3. Wait until protobuf-c updates, see https://github.com/protobuf-c/protobuf-c/issues/476#issuecomment-847305880 --- protobuf/.footprint | 27 +++++++++------------------ protobuf/.signature | 8 ++++---- protobuf/Pkgfile | 2 +- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/protobuf/.footprint b/protobuf/.footprint index a5b9e128d..0e07302f7 100644 --- a/protobuf/.footprint +++ b/protobuf/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/protoc -> protoc-26.0.0 --rwxr-xr-x root/root usr/bin/protoc-26.0.0 +lrwxrwxrwx root/root usr/bin/protoc -> protoc-25.3.0 +-rwxr-xr-x root/root usr/bin/protoc-25.3.0 drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/google/ drwxr-xr-x root/root usr/include/google/protobuf/ @@ -128,22 +128,18 @@ drwxr-xr-x root/root usr/include/google/protobuf/compiler/ruby/ -rw-r--r-- root/root usr/include/google/protobuf/compiler/ruby/ruby_generator.h drwxr-xr-x root/root usr/include/google/protobuf/compiler/rust/ drwxr-xr-x root/root usr/include/google/protobuf/compiler/rust/accessors/ --rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/accessors/accessor_case.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/accessors/accessor_generator.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/accessors/accessors.h --rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/accessors/helpers.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/context.h --rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/crate_mapping.h --rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/enum.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/generator.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/message.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/naming.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/oneof.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/relative_path.h --rw-r--r-- root/root usr/include/google/protobuf/compiler/rust/rust_keywords.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/scc.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/subprocess.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/versions.h +-rw-r--r-- root/root usr/include/google/protobuf/compiler/versions_suffix.h -rw-r--r-- root/root usr/include/google/protobuf/compiler/zip_writer.h -rw-r--r-- root/root usr/include/google/protobuf/cpp_edition_defaults.h -rw-r--r-- root/root usr/include/google/protobuf/cpp_features.pb.h @@ -153,7 +149,6 @@ drwxr-xr-x root/root usr/include/google/protobuf/compiler/rust/accessors/ -rw-r--r-- root/root usr/include/google/protobuf/descriptor.proto -rw-r--r-- root/root usr/include/google/protobuf/descriptor_database.h -rw-r--r-- root/root usr/include/google/protobuf/descriptor_legacy.h --rw-r--r-- root/root usr/include/google/protobuf/descriptor_lite.h -rw-r--r-- root/root usr/include/google/protobuf/descriptor_visitor.h -rw-r--r-- root/root usr/include/google/protobuf/duration.pb.h -rw-r--r-- root/root usr/include/google/protobuf/duration.proto @@ -239,8 +234,6 @@ drwxr-xr-x root/root usr/include/google/protobuf/stubs/ -rw-r--r-- root/root usr/include/google/protobuf/stubs/platform_macros.h -rw-r--r-- root/root usr/include/google/protobuf/stubs/port.h -rw-r--r-- root/root usr/include/google/protobuf/stubs/status_macros.h -drwxr-xr-x root/root usr/include/google/protobuf/testing/ --rw-r--r-- root/root usr/include/google/protobuf/testing/file.h -rw-r--r-- root/root usr/include/google/protobuf/text_format.h -rw-r--r-- root/root usr/include/google/protobuf/thread_safe_arena.h -rw-r--r-- root/root usr/include/google/protobuf/timestamp.pb.h @@ -271,8 +264,6 @@ drwxr-xr-x root/root usr/include/java/core/src/main/java/com/ drwxr-xr-x root/root usr/include/java/core/src/main/java/com/google/ drwxr-xr-x root/root usr/include/java/core/src/main/java/com/google/protobuf/ -rw-r--r-- root/root usr/include/java/core/src/main/java/com/google/protobuf/java_features.proto -drwxr-xr-x root/root usr/include/upb_generator/ --rw-r--r-- root/root usr/include/upb_generator/mangle.h -rw-r--r-- root/root usr/include/utf8_range.h -rw-r--r-- root/root usr/include/utf8_validity.h drwxr-xr-x root/root usr/lib/ @@ -289,12 +280,12 @@ drwxr-xr-x root/root usr/lib/cmake/utf8_range/ -rw-r--r-- root/root usr/lib/cmake/utf8_range/utf8_range-config.cmake -rw-r--r-- root/root usr/lib/cmake/utf8_range/utf8_range-targets-release.cmake -rw-r--r-- root/root usr/lib/cmake/utf8_range/utf8_range-targets.cmake -lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so -> libprotobuf-lite.so.26.0.0 --rwxr-xr-x root/root usr/lib/libprotobuf-lite.so.26.0.0 -lrwxrwxrwx root/root usr/lib/libprotobuf.so -> libprotobuf.so.26.0.0 --rwxr-xr-x root/root usr/lib/libprotobuf.so.26.0.0 -lrwxrwxrwx root/root usr/lib/libprotoc.so -> libprotoc.so.26.0.0 --rwxr-xr-x root/root usr/lib/libprotoc.so.26.0.0 +lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so -> libprotobuf-lite.so.25.3.0 +-rwxr-xr-x root/root usr/lib/libprotobuf-lite.so.25.3.0 +lrwxrwxrwx root/root usr/lib/libprotobuf.so -> libprotobuf.so.25.3.0 +-rwxr-xr-x root/root usr/lib/libprotobuf.so.25.3.0 +lrwxrwxrwx root/root usr/lib/libprotoc.so -> libprotoc.so.25.3.0 +-rwxr-xr-x root/root usr/lib/libprotoc.so.25.3.0 -rw-r--r-- root/root usr/lib/libutf8_range.a -rw-r--r-- root/root usr/lib/libutf8_validity.a drwxr-xr-x root/root usr/lib/pkgconfig/ diff --git a/protobuf/.signature b/protobuf/.signature index ebbf840a6..5bd143243 100644 --- a/protobuf/.signature +++ b/protobuf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SjZ6LbUfoyAliJW9ziFXoz+M1Nm5Hzm7MQDGAxBbFNUt39BiJ/zGdmsaagm+BLvhLVrD8kDXjAvuC2IFIKvsAA= -SHA256 (Pkgfile) = 62bc1314655910e82187601fb3a5f81ad40dadda90be562b350da64568715c03 -SHA256 (.footprint) = 66758379c6fe097863891c16374b0b3d3881844d9ebff4fea0c0cc4067a96f1a -SHA256 (protobuf-26.0.tar.gz) = e32100a8013870d24ffc37dad6781a61e5d0c99501bcb04d39c340a1c44a8e63 +RWSE3ohX2g5d/fOnM+tSlQuYWpBeObsF4tI+x8NCPL8p7AFqegKCYwcBQpCZPIS1Vh+xKykupu4C4TnOFzzWECKy5bLmVKyycwo= +SHA256 (Pkgfile) = 9475a6e38194dd24a0ced33c277222a6d4d360e806ee241f60ed12ea91640603 +SHA256 (.footprint) = 1bb04bb3a6f0f79a3cfef5e6ba13e9bf4b40e4dee677183b390b56f2ed283a01 +SHA256 (protobuf-25.3.tar.gz) = d19643d265b978383352b3143f04c0641eea75a75235c111cc01a1350173180e diff --git a/protobuf/Pkgfile b/protobuf/Pkgfile index 869adf320..a1804a3d0 100644 --- a/protobuf/Pkgfile +++ b/protobuf/Pkgfile @@ -4,7 +4,7 @@ # Depends on: abseil-cpp name=protobuf -version=26.0 +version=25.3 release=1 source=(https://github.com/protocolbuffers/protobuf/archive/v$version/$name-$version.tar.gz)