From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Google (abseil-cpp/protobuf/grpc) update
Date: Sat, 17 Feb 2024 18:31:23 +0100 [thread overview]
Message-ID: <20240217173123.21AB028FA4@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48772@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages the_goog
https://github.com/void-linux/void-packages/pull/48772
Google (abseil-cpp/protobuf/grpc) update
I don't really use Protobuf or gRPC anymore, but noticed the packages are a bit outdated, so I'll let this sit for a bit and merge if nobody raises any issues for awhile.
This PR includes a few GCC 13 fixes necessary to build some packages (generally including `<cstdint>`) even with the old versions of Googleware.
Also, in VLC, I'm dropping `libplacebo` to allow https://github.com/void-linux/void-packages/pull/47361 to proceed. That change has nothing to do with the Googleware updates, but saves us from another needless revbump of VLC.
@leahneukirchen: if you have any insight on getting `justbuild` to work, please let me know. The bootstrap pulls in old gRPC and abseil, and then the linker panics when it looks for old abseil symbols in the new abseil libraries.
#### Testing the changes
- I tested the changes in this PR: **in process**
#### Local build testing
Except for `justbuild`, everything builds on:
- [x] x86_64
- [x] x86_64-musl
- [x] i686
- [x] aarch64
- [x] aarch64-musl
- [x] armv6l
- [x] armv6l-musl
- [x] armv7l
- [x] armv7l-musl
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/48772.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-the_goog-48772.patch --]
[-- Type: text/x-diff, Size: 64857 bytes --]
From bf849aed25f11f97cb8f5bb1cdb27fc80542900b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:14:41 -0500
Subject: [PATCH 01/31] abseil-cpp: update to 20240116.1.
---
common/shlibs | 171 ++++++++++++++++++------------------
srcpkgs/abseil-cpp/template | 4 +-
2 files changed, 88 insertions(+), 87 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3cf507d8ada87..9d2e342b48a53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4124,91 +4124,92 @@ libsunpinyin.so.3 libsunpinyin-3.0.0rc2_1
libtpm2-totp.so.0 libtpm2-totp-0.3.0_1
libmujs.so.1.2.0 mujs-1.2.0_2
libiir.so.1 libiir1-1.9.3_1
-libabsl_flags.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_raw_logging_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_parse.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_reflection.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_globals.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_config.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_seed_sequences.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_statusor.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_usage_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_commandlineflag.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_randen_hwaes_impl.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_status.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_bad_any_cast_impl.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_bad_variant_access.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_raw_hash_set.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_bad_optional_access.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cord.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_distribution_test_util.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cordz_handle.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_graphcycles_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_kernel_timeout_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_spinlock_wait.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cordz_functions.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_usage.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_debugging_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_strerror.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_seed_material.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_log_sink_set.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_proto.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_crc_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_civil_time.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_conditions.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_crc_cpu_detect.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_entry.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_distributions.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_globals.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_format.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_randen.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_exponential_biased.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_city.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_symbolize.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_leak_check.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_low_level_hash.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_severity.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_scoped_set_env.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_strings.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_string_view.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_die_if_null.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_hash.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_commandlineflag_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_periodic_sampler.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_platform.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_malloc_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cordz_sample_token.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_str_format_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_synchronization.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_message.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_strings_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_private_handle_accessor.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cord_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_randen_hwaes.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_throw_delegate.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_crc_cord_state.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_flags.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_program_name.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_time_zone.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_examine_stack.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_crc32c.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_initialize.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_failure_signal_handler.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_time.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_cordz_info.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_sink.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_nullguard.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_demangle_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_internal.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_base.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_hashtablez_sampler.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_flags_marshalling.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_pool_urbg.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_int128.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_stacktrace.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_seed_gen_exception.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_log_internal_check_op.so.2308.0.0 abseil-cpp-20230802.0_1
-libabsl_random_internal_randen_slow.so.2308.0.0 abseil-cpp-20230802.0_1
+libabsl_bad_any_cast_impl.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_bad_optional_access.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_bad_variant_access.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_base.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_city.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_civil_time.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cord.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cord_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cordz_functions.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cordz_handle.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cordz_info.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_cordz_sample_token.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_crc32c.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_crc_cord_state.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_crc_cpu_detect.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_crc_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_debugging_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_demangle_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_die_if_null.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_examine_stack.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_exponential_biased.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_failure_signal_handler.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_commandlineflag.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_commandlineflag_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_config.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_marshalling.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_parse.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_private_handle_accessor.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_program_name.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_reflection.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_usage.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_flags_usage_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_graphcycles_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_hash.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_hashtablez_sampler.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_int128.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_kernel_timeout_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_leak_check.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_entry.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_flags.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_globals.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_initialize.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_check_op.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_conditions.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_fnmatch.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_format.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_globals.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_log_sink_set.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_message.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_nullguard.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_internal_proto.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_severity.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_log_sink.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_low_level_hash.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_malloc_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_periodic_sampler.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_distributions.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_distribution_test_util.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_platform.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_pool_urbg.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_randen.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_randen_hwaes.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_randen_hwaes_impl.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_randen_slow.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_internal_seed_material.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_seed_gen_exception.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_random_seed_sequences.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_raw_hash_set.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_raw_logging_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_scoped_set_env.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_spinlock_wait.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_stacktrace.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_status.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_statusor.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_str_format_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_strerror.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_string_view.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_strings.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_strings_internal.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_symbolize.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_synchronization.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_throw_delegate.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_time.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_time_zone.so.2401.0.0 abseil-cpp-20240116.1_1
+libabsl_vlog_config_internal.so.2401.0.0 abseil-cpp-20240116.1_1
libzint.so.2.12 libzint-2.12.0_1
libairspyhf.so.0 libairspyhf-1.6.8_1
libtraceevent.so.1 libtraceevent-1.6.2_1
diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template
index 4b049b6b84fdd..7909b5e19e0aa 100644
--- a/srcpkgs/abseil-cpp/template
+++ b/srcpkgs/abseil-cpp/template
@@ -1,6 +1,6 @@
# Template file for 'abseil-cpp'
pkgname=abseil-cpp
-version=20230802.1
+version=20240116.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON"
@@ -11,7 +11,7 @@ license="Apache-2.0"
homepage="https://abseil.io"
changelog="https://github.com/abseil/abseil-cpp/releases"
distfiles="https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz"
-checksum=987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed
+checksum=3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a
abseil-cpp-devel_package() {
short_desc+=" (development files)"
From 893aa814206a475de20d0b0649bf42e4ff6e87c4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:20:58 -0500
Subject: [PATCH 02/31] protobuf: update to 25.2.
---
common/shlibs | 6 +++---
srcpkgs/protobuf/template | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9d2e342b48a53..fc37436a8392b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3034,9 +3034,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
libm17n-gui.so.0 m17n-lib-1.7.0_1
libm17n-core.so.0 m17n-lib-1.7.0_1
libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.24.1.0 libprotobuf-lite-24.1_1
-libprotoc.so.24.1.0 libprotoc-24.1_1
-libprotobuf.so.24.1.0 libprotobuf-24.1_1
+libprotobuf-lite.so.25.2.0 libprotobuf-lite-25.2_1
+libprotoc.so.25.2.0 libprotoc-25.2_1
+libprotobuf.so.25.2.0 libprotobuf-25.2_1
libsombok.so.3 sombok-2.4.0_1
libdeviceclient.so.0 pragha-1.3.3_1
libykclient.so.3 ykclient-2.15_1
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index cbb8cfdbf5570..0b6f27a360f8e 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,6 +1,6 @@
# Template file for 'protobuf'
pkgname=protobuf
-version=24.1
+version=25.2
revision=1
build_style=cmake
configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
homepage="https://developers.google.com/protocol-buffers/"
changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=0930b1a6eb840a2295dfcb13bb5736d1292c3e0d61a90391181399327be7d8f1
+checksum=8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871
# Switch to versioned package
conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
From aaef29200e6a4c052832b93470c988b705db1e74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:23:46 -0500
Subject: [PATCH 03/31] python3-protobuf: update to 4.25.2.
---
srcpkgs/python3-protobuf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template
index ab29ff1629fd0..301489708bf35 100644
--- a/srcpkgs/python3-protobuf/template
+++ b/srcpkgs/python3-protobuf/template
@@ -1,7 +1,7 @@
# Template file for 'python3-protobuf'
pkgname=python3-protobuf
-version=4.24.1
-revision=2
+version=4.25.2
+revision=1
build_style=python3-module
build_wrksrc=python
hostmakedepends="python3-setuptools python3-wheel protobuf"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://developers.google.com/protocol-buffers/"
# PyPi release does not have bits for cppext
distfiles="https://github.com/protocolbuffers/protobuf/releases/download/v${version#*.}/protobuf-${version#*.}.tar.gz"
-checksum=0930b1a6eb840a2295dfcb13bb5736d1292c3e0d61a90391181399327be7d8f1
+checksum=8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871
make_check=no # ImportError: cannot import name 'unittest_retention_pb2' from 'google.protobuf'
build_options="cppext"
From 78efdf8d454d9199272f0a24aae512779d94a8d7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:21:05 -0500
Subject: [PATCH 04/31] protobuf-c: update to 1.5.0.
---
...4f3fd85a205eb7c90b790477d5415364209e.patch | 44 ---
srcpkgs/protobuf-c/patches/66a0b0d2.patch | 308 ------------------
srcpkgs/protobuf-c/template | 6 +-
3 files changed, 3 insertions(+), 355 deletions(-)
delete mode 100644 srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch
delete mode 100644 srcpkgs/protobuf-c/patches/66a0b0d2.patch
diff --git a/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch b/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch
deleted file mode 100644
index 7d1e97032d322..0000000000000
--- a/srcpkgs/protobuf-c/patches/66574f3fd85a205eb7c90b790477d5415364209e.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 66574f3fd85a205eb7c90b790477d5415364209e Mon Sep 17 00:00:00 2001
-From: Steve Peters <scpeters@openrobotics.org>
-Date: Sat, 24 Jun 2023 22:15:42 -0700
-Subject: [PATCH] Use FileDescriptorLegacy for deprecated syntax()
-
----
- protoc-c/c_file.cc | 2 +-
- protoc-c/c_helpers.h | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc
-index 59c1824e..4b60b889 100644
---- a/protoc-c/c_file.cc
-+++ b/protoc-c/c_file.cc
-@@ -119,7 +119,7 @@ void FileGenerator::GenerateHeader(io::Printer* printer) {
-
- int min_header_version = 1000000;
- #if defined(HAVE_PROTO3)
-- if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) {
-+ if (FileDescriptorLegacy(file_).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3) {
- min_header_version = 1003000;
- }
- #endif
-diff --git a/protoc-c/c_helpers.h b/protoc-c/c_helpers.h
-index 7598a4e1..87deea24 100644
---- a/protoc-c/c_helpers.h
-+++ b/protoc-c/c_helpers.h
-@@ -67,6 +67,7 @@
- #include <vector>
- #include <sstream>
- #include <google/protobuf/descriptor.h>
-+#include <google/protobuf/descriptor_legacy.h>
- #include <protobuf-c/protobuf-c.pb.h>
- #include <google/protobuf/io/printer.h>
-
-@@ -172,7 +173,7 @@ int compare_name_indices_by_name(const void*, const void*);
- // This wrapper is needed to be able to compile against protobuf2.
- inline int FieldSyntax(const FieldDescriptor* field) {
- #ifdef HAVE_PROTO3
-- return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? 3 : 2;
-+ return FileDescriptorLegacy(field->file()).syntax() == FileDescriptorLegacy::SYNTAX_PROTO3 ? 3 : 2;
- #else
- return 2;
- #endif
diff --git a/srcpkgs/protobuf-c/patches/66a0b0d2.patch b/srcpkgs/protobuf-c/patches/66a0b0d2.patch
deleted file mode 100644
index 790db6329120c..0000000000000
--- a/srcpkgs/protobuf-c/patches/66a0b0d2.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From 66a0b0d205224f63f19dd8f96abf9dcdc2112331 Mon Sep 17 00:00:00 2001
-From: Xiangyu Chen <xiangyu.chen@windriver.com>
-Date: Wed, 29 Mar 2023 14:25:17 +0800
-Subject: [PATCH] add support of protobuf 4.22.x
-
-after upgrade the protobuf to 4.22.x, the protobuf-c cannot compile anymore (#544) due to following changes:
-1.protobuf using c++14, that cause the command_line_interface.h report error
-2.protobuf using abseil-cpp library instead the trace API with GOOGLE_ header
-3. removed GOOGLE_DISALLOW_EVIL_CONSTRUCTORS
----
- Makefile.am | 2 +-
- configure.ac | 8 ++++++++
- protoc-c/c_bytes_field.h | 1 -
- protoc-c/c_enum.h | 1 -
- protoc-c/c_enum_field.h | 1 -
- protoc-c/c_extension.h | 1 -
- protoc-c/c_field.cc | 2 +-
- protoc-c/c_field.h | 3 ---
- protoc-c/c_file.h | 1 -
- protoc-c/c_generator.h | 2 --
- protoc-c/c_helpers.cc | 4 ++--
- protoc-c/c_message.cc | 4 ++--
- protoc-c/c_message.h | 1 -
- protoc-c/c_message_field.h | 3 ---
- protoc-c/c_primitive_field.cc | 6 +++---
- protoc-c/c_primitive_field.h | 3 ---
- protoc-c/c_service.h | 1 -
- protoc-c/c_string_field.h | 1 -
- 18 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c7339efe..3b0d1d66 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
- -I${top_builddir} \
- -I${top_srcdir}
- AM_CFLAGS = ${my_CFLAGS}
--AM_LDFLAGS =
-+AM_LDFLAGS = ${ABSL_LOG_INTERNAL_CHECK_OP_LIBS} ${ABSL_LOG_RAW_HASH_SET_LIBS}
-
- # code coverage
-
-diff --git a/configure.ac b/configure.ac
-index f5a0261e..8ed549ac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,6 +78,14 @@ if test "x$enable_protoc" != "xno"; then
-
- AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
-
-+# now checking 4.22.x protobuf, if so, set cxx as 17
-+ AS_IF([pkg-config --atleast-version 4.22.0 protobuf],[AX_CXX_COMPILE_STDCXX(17, noext, mandatory)])
-+
-+ AS_IF([pkg-config --atleast-version 4.22.0 protobuf],
-+ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op],
-+ [PKG_CHECK_MODULES([ABSL_LOG_RAW_HASH_SET], [absl_raw_hash_set], [], [AC_MSG_ERROR([Missing absl_raw_hash_set library.])])],
-+ [AC_MSG_ERROR([Missing absl_log_internal_check_op library.])])])
-+
- PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0],
- [proto3_supported=yes],
- [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])]
-diff --git a/protoc-c/c_bytes_field.h b/protoc-c/c_bytes_field.h
-index bf873f0f..8fc63d35 100644
---- a/protoc-c/c_bytes_field.h
-+++ b/protoc-c/c_bytes_field.h
-@@ -88,7 +88,6 @@ class BytesFieldGenerator : public FieldGenerator {
- private:
- std::map<std::string, std::string> variables_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(BytesFieldGenerator);
- };
-
-
-diff --git a/protoc-c/c_enum.h b/protoc-c/c_enum.h
-index 9c34b697..d5e58f0a 100644
---- a/protoc-c/c_enum.h
-+++ b/protoc-c/c_enum.h
-@@ -107,7 +107,6 @@ class EnumGenerator {
- const EnumDescriptor* descriptor_;
- std::string dllexport_decl_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_enum_field.h b/protoc-c/c_enum_field.h
-index 3f8c005d..03eb4028 100644
---- a/protoc-c/c_enum_field.h
-+++ b/protoc-c/c_enum_field.h
-@@ -86,7 +86,6 @@ class EnumFieldGenerator : public FieldGenerator {
- private:
- std::map<std::string, std::string> variables_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator);
- };
-
-
-diff --git a/protoc-c/c_extension.h b/protoc-c/c_extension.h
-index 95413885..9c5797d6 100644
---- a/protoc-c/c_extension.h
-+++ b/protoc-c/c_extension.h
-@@ -99,7 +99,6 @@ class ExtensionGenerator {
- std::string type_traits_;
- std::string dllexport_decl_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc
-index 0716744a..4abdc6d3 100644
---- a/protoc-c/c_field.cc
-+++ b/protoc-c/c_field.cc
-@@ -231,7 +231,7 @@ FieldGeneratorMap::~FieldGeneratorMap() {}
-
- const FieldGenerator& FieldGeneratorMap::get(
- const FieldDescriptor* field) const {
-- GOOGLE_CHECK_EQ(field->containing_type(), descriptor_);
-+ ABSL_CHECK_EQ(field->containing_type(), descriptor_);
- return *field_generators_[field->index()];
- }
-
-diff --git a/protoc-c/c_field.h b/protoc-c/c_field.h
-index 3cad35d3..76d3b0bc 100644
---- a/protoc-c/c_field.h
-+++ b/protoc-c/c_field.h
-@@ -104,8 +104,6 @@ class FieldGenerator {
- const std::string &descriptor_addr) const;
- const FieldDescriptor *descriptor_;
-
-- private:
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator);
- };
-
- // Convenience class which constructs FieldGenerators for a Descriptor.
-@@ -122,7 +120,6 @@ class FieldGeneratorMap {
-
- static FieldGenerator* MakeGenerator(const FieldDescriptor* field);
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h
-index 8dfd8ba0..ec55906e 100644
---- a/protoc-c/c_file.h
-+++ b/protoc-c/c_file.h
-@@ -104,7 +104,6 @@ class FileGenerator {
- std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_;
- std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_generator.h b/protoc-c/c_generator.h
-index ac1ffafe..92601164 100644
---- a/protoc-c/c_generator.h
-+++ b/protoc-c/c_generator.h
-@@ -94,8 +94,6 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator {
- OutputDirectory* output_directory,
- std::string* error) const;
-
-- private:
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc
-index 6fd0cd3a..1eaeeb42 100644
---- a/protoc-c/c_helpers.cc
-+++ b/protoc-c/c_helpers.cc
-@@ -286,7 +286,7 @@ const char* const kKeywordList[] = {
-
- std::set<std::string> MakeKeywordsMap() {
- std::set<std::string> result;
-- for (int i = 0; i < GOOGLE_ARRAYSIZE(kKeywordList); i++) {
-+ for (int i = 0; i < ABSL_ARRAYSIZE(kKeywordList); i++) {
- result.insert(kKeywordList[i]);
- }
- return result;
-@@ -548,7 +548,7 @@ std::string CEscape(const std::string& src) {
- std::unique_ptr<char[]> dest(new char[dest_length]);
- const int len = CEscapeInternal(src.data(), src.size(),
- dest.get(), dest_length, false);
-- GOOGLE_DCHECK_GE(len, 0);
-+ ABSL_DCHECK_GE(len, 0);
- return std::string(dest.get(), len);
- }
-
-diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc
-index 37e8bf8b..c7e85155 100755
---- a/protoc-c/c_message.cc
-+++ b/protoc-c/c_message.cc
-@@ -499,7 +499,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) {
- // NOTE: not supported by protobuf
- vars["maybe_static"] = "";
- vars["field_dv_ctype"] = "{ ... }";
-- GOOGLE_LOG(DFATAL) << "Messages can't have default values!";
-+ ABSL_LOG(FATAL) << "Messages can't have default values!";
- break;
- case FieldDescriptor::CPPTYPE_STRING:
- if (fd->type() == FieldDescriptor::TYPE_BYTES || opt.string_as_bytes())
-@@ -521,7 +521,7 @@ GenerateMessageDescriptor(io::Printer* printer, bool gen_init) {
- break;
- }
- default:
-- GOOGLE_LOG(DFATAL) << "Unknown CPPTYPE";
-+ ABSL_LOG(FATAL) << "Unknown CPPTYPE";
- break;
- }
- if (!already_defined)
-diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h
-index ea1c3ab3..e90782bf 100644
---- a/protoc-c/c_message.h
-+++ b/protoc-c/c_message.h
-@@ -137,7 +137,6 @@ class MessageGenerator {
- std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
- std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_message_field.h b/protoc-c/c_message_field.h
-index 39b8d999..42efe368 100644
---- a/protoc-c/c_message_field.h
-+++ b/protoc-c/c_message_field.h
-@@ -83,9 +83,6 @@ class MessageFieldGenerator : public FieldGenerator {
- std::string GetDefaultValue(void) const;
- void GenerateStaticInit(io::Printer* printer) const;
-
-- private:
--
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
- };
-
-
-diff --git a/protoc-c/c_primitive_field.cc b/protoc-c/c_primitive_field.cc
-index 6990893f..d5a7b60c 100644
---- a/protoc-c/c_primitive_field.cc
-+++ b/protoc-c/c_primitive_field.cc
-@@ -99,7 +99,7 @@ void PrimitiveFieldGenerator::GenerateStructMembers(io::Printer* printer) const
- case FieldDescriptor::TYPE_STRING :
- case FieldDescriptor::TYPE_BYTES :
- case FieldDescriptor::TYPE_GROUP :
-- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break;
-+ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break;
-
- // No default because we want the compiler to complain if any new
- // types are added.
-@@ -143,7 +143,7 @@ std::string PrimitiveFieldGenerator::GetDefaultValue() const
- case FieldDescriptor::CPPTYPE_BOOL:
- return descriptor_->default_value_bool() ? "1" : "0";
- default:
-- GOOGLE_LOG(DFATAL) << "unexpected CPPTYPE in c_primitive_field";
-+ ABSL_LOG(FATAL) << "unexpected CPPTYPE in c_primitive_field";
- return "UNEXPECTED_CPPTYPE";
- }
- }
-@@ -197,7 +197,7 @@ void PrimitiveFieldGenerator::GenerateDescriptorInitializer(io::Printer* printer
- case FieldDescriptor::TYPE_STRING :
- case FieldDescriptor::TYPE_BYTES :
- case FieldDescriptor::TYPE_GROUP :
-- case FieldDescriptor::TYPE_MESSAGE : GOOGLE_LOG(FATAL) << "not a primitive type"; break;
-+ case FieldDescriptor::TYPE_MESSAGE : ABSL_LOG(FATAL) << "not a primitive type"; break;
-
- // No default because we want the compiler to complain if any new
- // types are added.
-diff --git a/protoc-c/c_primitive_field.h b/protoc-c/c_primitive_field.h
-index a9eb893b..d2bb7243 100644
---- a/protoc-c/c_primitive_field.h
-+++ b/protoc-c/c_primitive_field.h
-@@ -83,9 +83,6 @@ class PrimitiveFieldGenerator : public FieldGenerator {
- std::string GetDefaultValue(void) const;
- void GenerateStaticInit(io::Printer* printer) const;
-
-- private:
--
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_service.h b/protoc-c/c_service.h
-index 27125a60..4737ff3b 100644
---- a/protoc-c/c_service.h
-+++ b/protoc-c/c_service.h
-@@ -101,7 +101,6 @@ class ServiceGenerator {
- const ServiceDescriptor* descriptor_;
- std::map<std::string, std::string> vars_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
- };
-
- } // namespace c
-diff --git a/protoc-c/c_string_field.h b/protoc-c/c_string_field.h
-index 513cea75..ba258e44 100644
---- a/protoc-c/c_string_field.h
-+++ b/protoc-c/c_string_field.h
-@@ -88,7 +88,6 @@ class StringFieldGenerator : public FieldGenerator {
- private:
- std::map<std::string, std::string> variables_;
-
-- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator);
- };
-
-
diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index 7935ca2684e22..c3910417d0806 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf-c'
pkgname=protobuf-c
-version=1.4.1
-revision=3
+version=1.5.0
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable protoc)"
hostmakedepends="pkg-config protobuf protobuf-devel automake libtool"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/protobuf-c/protobuf-c"
distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz"
-checksum=4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f
+checksum=7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98
build_options="protoc"
build_options_default="protoc"
From c431b34c472dc86f4fc682a4f95eebb39a1f1483 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:36:06 -0500
Subject: [PATCH 05/31] grpc: update to 1.61.1.
---
common/shlibs | 30 +++++++++++--------
.../grpc/patches/revert-find-protobuf.patch | 8 -----
srcpkgs/grpc/template | 9 +++---
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc37436a8392b..7588f4616ad34 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3600,18 +3600,24 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
libaal-1.0.so.7 libaal-1.0.7_1
libaal-minimal.so.0 libaal-1.0.7_1
libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.33 libgrpc-1.56.0_1
-libgpr.so.33 libgrpc-1.56.0_1
-libgrpc.so.33 libgrpc-1.56.0_1
-libgrpc_unsecure.so.33 libgrpc-1.56.0_1
-libupb.so.33 libgrpc-1.56.0_1
-libgrpc++.so.1.56 libgrpc-1.56.0_1
-libgrpc++_alts.so.1.56 libgrpc-1.56.0_1
-libgrpc++_error_details.so.1.56 libgrpc-1.56.0_1
-libgrpc++_reflection.so.1.56 libgrpc-1.56.0_1
-libgrpc++_unsecure.so.1.56 libgrpc-1.56.0_1
-libgrpc_plugin_support.so.1.56 libgrpc-1.56.0_1
-libgrpcpp_channelz.so.1.56 libgrpc-1.56.0_1
+libaddress_sorting.so.38 libgrpc-1.61.1_1
+libgpr.so.38 libgrpc-1.61.1_1
+libgrpc++.so.1.61 libgrpc-1.61.1_1
+libgrpc++_alts.so.1.61 libgrpc-1.61.1_1
+libgrpc++_error_details.so.1.61 libgrpc-1.61.1_1
+libgrpc++_reflection.so.1.61 libgrpc-1.61.1_1
+libgrpc++_unsecure.so.1.61 libgrpc-1.61.1_1
+libgrpc.so.38 libgrpc-1.61.1_1
+libgrpc_authorization_provider.so.1.61 libgrpc-1.61.1_1
+libgrpc_plugin_support.so.1.61 libgrpc-1.61.1_1
+libgrpc_unsecure.so.38 libgrpc-1.61.1_1
+libgrpcpp_channelz.so.1.61 libgrpc-1.61.1_1
+libupb_base_lib.so.38 libgrpc-1.61.1_1
+libupb_json_lib.so.38 libgrpc-1.61.1_1
+libupb_mem_lib.so.38 libgrpc-1.61.1_1
+libupb_message_lib.so.38 libgrpc-1.61.1_1
+libupb_textformat_lib.so.38 libgrpc-1.61.1_1
+libutf8_range_lib.so.38 libgrpc-1.61.1_1
libircclient.so.1 libircclient-1.10_5
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/patches/revert-find-protobuf.patch b/srcpkgs/grpc/patches/revert-find-protobuf.patch
index 6001f37c6b1b8..8f2bc44d90128 100644
--- a/srcpkgs/grpc/patches/revert-find-protobuf.patch
+++ b/srcpkgs/grpc/patches/revert-find-protobuf.patch
@@ -13,11 +13,3 @@ all packages are updated to the new system
if(Protobuf_FOUND OR PROTOBUF_FOUND)
if(TARGET protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME})
-@@ -86,6 +86,6 @@
- set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
- endif()
- endif()
-- set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)")
-+ set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf)")
- endif()
- endif()
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 4beb8922c59ed..b2c090a9a2f7e 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
-version=1.56.0
-revision=3
+version=1.61.1
+revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
-DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package
@@ -21,10 +21,9 @@ distfiles="https://github.com/grpc/grpc/archive/v${version}/${pkgname}-${version
https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v${_opencensus}.tar.gz>opencensus-proto-v${_opencensus}.tar.gz
https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/${_xds}.tar.gz>xds-${_xds}.tar.gz
"
-checksum="e034992a0b464042021f6d440f2090acc2422c103a322b0844e3921ccea981dc
+checksum="6dadc0420ad2d4b8ac49f516830f72feae3764bf83decc8d7c3a871eca1a0843
b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0
- 0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899
- "
+ 0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899"
skip_extraction="
opencensus-proto-v${_opencensus}.tar.gz
From 21ca26db5a90ea4e946cf953318bc95a6149d8df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:40:57 -0500
Subject: [PATCH 06/31] python3-grpcio: update to 1.60.1.
---
srcpkgs/python3-grpcio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 7b7ef34cd6d98..ee25192910a3a 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,7 +1,7 @@
# Template file for 'python3-grpcio'
pkgname=python3-grpcio
-version=1.56.0
-revision=4
+version=1.60.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-six python3-Cython0.29"
makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://grpc.io"
distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=4c08ee21b3d10315b8dc26f6c13917b20ed574cdbed2d2d80c53d5508fdcc0f2
+checksum=dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
From 1b32c44e768725805f8438c9b8c53fad38f84a0f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 12:42:41 -0500
Subject: [PATCH 07/31] python3-grpcio-tools: update to 1.60.1.
---
srcpkgs/python3-grpcio-tools/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index b299e521ce745..c5d4420c2a4e2 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,7 +1,7 @@
# Template file for 'python3-grpcio-tools'
pkgname=python3-grpcio-tools
-version=1.49.1
-revision=3
+version=1.60.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://grpc.io"
distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91
+checksum=da08224ab8675c6d464b988bd8ca02cccd2bf0275bceefe8f6219bfd4a4f5e85
export GRPC_PYTHON_BUILD_WITH_CYTHON=1
From 594c9485ef39bc67e5969d8984d3d0f0d23a069f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:31 -0500
Subject: [PATCH 08/31] Bear: rebuild for protobuf, grpc
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index a2f5e78d4b641..23d24214daa38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.1.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 9510472204b028d5b0a48a1aadbbfcfa93324768 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:31 -0500
Subject: [PATCH 09/31] EternalTerminal: rebuild for protobuf, grpc
---
srcpkgs/EternalTerminal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 2c9701d93e714..8ed8bc1377341 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
version=6.2.1
-revision=5
+revision=6
# revisions used for the specific versions of submodules.
# they can be found in the external/ directory of the source code.
_sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b"
From 166fdb638624141bb8ac5c9ead21ab0489d269b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 10/31] android-tools: rebuild for protobuf, grpc
---
srcpkgs/android-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index bb5240068d7b8..198be4764805a 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
# Template file for 'android-tools'
pkgname=android-tools
version=34.0.4
-revision=1
+revision=2
archs="armv* aarch64* x86_64* i686* ppc64le* riscv64*"
build_style=cmake
hostmakedepends="perl go protobuf pkg-config"
From 462b76e15e110f85c7dbbac4866bac075df3ad74 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 11/31] astroid: rebuild for protobuf, grpc
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 2bd79b3a9420f..02d7743130fb3 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=12
+revision=13
build_style=cmake
build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
From 0edbb52c2234a7c01a2a6c691b0f607c6b5d4568 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 12/31] bloaty: rebuild for protobuf, grpc
---
srcpkgs/bloaty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index 71632e102b923..3309afa179267 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
# Template file for 'bloaty'
pkgname=bloaty
version=1.1
-revision=14
+revision=15
build_style=cmake
hostmakedepends="pkg-config protobuf"
makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"
From 4ed5dbb9789a2f3228bb33fdeec8b5421e272c72 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 13/31] clementine: rebuild for protobuf, grpc
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 68983b46a6d0a..ce972f80dba6e 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.0rc1
-revision=13
+revision=14
_fullver=${version}-873-g3471134d5
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
From d03f84f9cc607ff31d2d878d575e2f206c6b8b81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 14/31] cura-engine: rebuild for protobuf, grpc
---
srcpkgs/cura-engine/patches/gcc13.patch | 10 ++++++++++
srcpkgs/cura-engine/template | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cura-engine/patches/gcc13.patch
diff --git a/srcpkgs/cura-engine/patches/gcc13.patch b/srcpkgs/cura-engine/patches/gcc13.patch
new file mode 100644
index 0000000000000..2d3c8f850e62d
--- /dev/null
+++ b/srcpkgs/cura-engine/patches/gcc13.patch
@@ -0,0 +1,10 @@
+--- a/src/utils/math.h
++++ b/src/utils/math.h
+@@ -5,6 +5,7 @@
+ #define UTILS_MATH_H
+
+ #include <cmath>
++#include <cstdint>
+
+
+ //c++11 no longer defines M_PI, so add our own constant.
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 7ed8a207c0894..599852312e6b5 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
# Template file for 'cura-engine'
pkgname=cura-engine
version=4.13.1
-revision=5
+revision=6
build_style=cmake
configure_args="-DCURA_ENGINE_VERSION=${version}"
hostmakedepends="protobuf git"
From a05befd46a7242094972231512fb707efa483e7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 15/31] justbuild: rebuild for protobuf, grpc
---
srcpkgs/justbuild/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 2a885a0d22b50..d9f6ec63602a7 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,9 +1,9 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.2.4
-revision=1
+revision=2
create_wrksrc=yes
-hostmakedepends="jo pandoc pkg-config python3 tar unzip wget"
+hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
libarchive-devel libcurl-devel libgit2-devel openssl-devel re2-devel"
depends="python3"
@@ -44,9 +44,7 @@ do_build() {
bazel_remote_apis \
cli11 \
com_github_microsoft_gsl \
- com_google_absl \
- google_apis \
- protobuf
+ google_apis
)
sed -i "s/TaskSystem[(][0-9]*[)]/TaskSystem($XBPS_MAKEJOBS)/" \
justbuild-${version}/bin/parallel-bootstrap-traverser.py
From 741fb8e3ec41ff779ff31ddc327e8f2704cb9268 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:32 -0500
Subject: [PATCH 16/31] kismet: rebuild for protobuf, grpc
---
srcpkgs/kismet/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index 411b6e3a932dc..1ddca9a8d6f74 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
version=2023.07.R1
-revision=3
+revision=4
_realver="${version//./-}"
build_style=gnu-configure
configure_args="--disable-python-tools"
From ef56bd8c796a5aa1a6b6531174f32744fc2508e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 17/31] libArcus: rebuild for protobuf, grpc
---
srcpkgs/libArcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 36d4f88e87517..343eef5273088 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
# Template file for 'libArcus'
pkgname=libArcus
version=4.13.1
-revision=7
+revision=8
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
hostmakedepends="protobuf python3-sip-devel python3-setuptools"
From cc42cff44df1abedf045ef0a00fea43acb8de0a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 18/31] libcompizconfig: rebuild for protobuf, grpc
---
srcpkgs/libcompizconfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index 95ae6dd601da9..d9801a3117365 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
# Template file for 'libcompizconfig'
pkgname=libcompizconfig
version=0.8.18
-revision=13
+revision=14
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake intltool libtool pkg-config protobuf"
From 4372b9fdd41a73bca643d7838082124cf80e881e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 19/31] libphonenumber: rebuild for protobuf, grpc
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 3c00e8c7056b0..4edd459c6bcf3 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=15
+revision=16
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From a2465f2ba748fdbf6c4f1768189de286884eed10 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 20/31] mixxx: rebuild for protobuf, grpc
---
srcpkgs/mixxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 6921996e4e77b..6a79b328c1abf 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.3.3
-revision=6
+revision=7
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=Release"
hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
From 97e07f86f6c8b522ede73457a47e300d1edeef86 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 21/31] mosh: rebuild for protobuf, grpc
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index cb1a1fa97e392..c86d49efe2035 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf autoconf automake"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 0f0b2e5118b5845670758c99d4058164b98433eb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:33 -0500
Subject: [PATCH 22/31] mumble: rebuild for protobuf, grpc
---
srcpkgs/mumble/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f682404e36797..58e75465f245d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.4.287
-revision=7
+revision=8
build_style=cmake
make_cmd=make
configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF
From cf62bca9ad4f5319679d1667b41c6dd997fcd7b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 23/31] netdata: rebuild for protobuf, grpc
---
srcpkgs/netdata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index 0d242a182b700..07e6a53da83a2 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,7 +1,7 @@
# Template file for 'netdata'
pkgname=netdata
version=1.42.1
-revision=2
+revision=3
build_style=gnu-configure
build_helper=qemu
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no
From c0fde7b979e3cdd664c8ae6709bd1722e74426a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 24/31] nsjail: rebuild for protobuf, grpc
---
srcpkgs/nsjail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 83ce12fa70abc..3619c8e60d394 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
# Template file for 'nsjail'
pkgname=nsjail
version=3.3
-revision=2
+revision=3
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="bison flex pkg-config protobuf which"
From 99f5114857fccb3a2824beaac46dc1159abb69e2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 25/31] qgis: rebuild for protobuf, grpc
---
srcpkgs/qgis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 1c99d8277e819..3dd7af263aba6 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
# Template file for 'qgis'
pkgname=qgis
version=3.34.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
-DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
From 309a08755e3a43337d8405772ba1394c01cf14b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 26/31] strawberry: rebuild for protobuf, grpc
---
srcpkgs/strawberry/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 68c4ac4c7371a..044d54443d363 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
# Template file for 'strawberry'
pkgname=strawberry
version=1.0.17
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config protobuf gettext"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
From f1da927b5e1a9c07b780434150d872061745921f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 20:01:09 -0500
Subject: [PATCH 27/31] sysdig: rebuild for protobuf, grpc
---
srcpkgs/sysdig/patches/gcc13.patch | 19 +++++++++++++++++++
.../patches/libsinsp-absl-protobuf.patch | 6 ++++--
srcpkgs/sysdig/template | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/sysdig/patches/gcc13.patch
diff --git a/srcpkgs/sysdig/patches/gcc13.patch b/srcpkgs/sysdig/patches/gcc13.patch
new file mode 100644
index 0000000000000..d6997b7305774
--- /dev/null
+++ b/srcpkgs/sysdig/patches/gcc13.patch
@@ -0,0 +1,19 @@
+--- a/.xbps-falco/userspace/libsinsp/procfs_utils.h
++++ b/.xbps-falco/userspace/libsinsp/procfs_utils.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <istream>
+ #include <string>
+
+--- a/.xbps-falco/userspace/libsinsp/sinsp_exception.h
++++ b/.xbps-falco/userspace/libsinsp/sinsp_exception.h
+@@ -16,6 +16,7 @@
+ */
+ #pragma once
+
++#include <cstdint>
+ #include <stdexcept>
+ #include <string>
+
diff --git a/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch b/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch
index fef52a10a34b6..b36de5106f7d3 100644
--- a/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch
+++ b/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch
@@ -18,12 +18,14 @@
if(NOT MUSL_OPTIMIZED_BUILD)
list(APPEND SINSP_LIBRARIES
-@@ -301,7 +303,7 @@ else()
+@@ -301,7 +303,9 @@ else()
endif()
endif() # NOT WIN32
-
-+LIST(APPEND SINSP_LIBRARIES absl_log_internal_message absl_log_internal_nullguard)
++LIST(APPEND SINSP_LIBRARIES
++ absl_log_internal_message absl_log_internal_nullguard
++ absl_hash absl_synchronization absl_cord absl_cordz_info absl_cordz_functions)
target_link_libraries(sinsp ${SINSP_LIBRARIES})
if(APPLE)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f3f7d4b576f1e..b451f73920a4e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.33.1
-revision=3
+revision=4
_falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
From 58e0e01e22a61f53998e4fe22715340a040bbbef Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 15:08:25 -0500
Subject: [PATCH 28/31] tg_owt: rebuild for protobuf, grpc
---
srcpkgs/tg_owt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index aee8d35d08ffb..34e8fef054056 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
# Template file for 'tg_owt'
pkgname=tg_owt
version=0.0.0.20231221
-revision=1
+revision=2
_commit=afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60
_libyuv_commit=04821d1e7d60845525e8db55c7bcd41ef5be9406
_abseil_commit=8c0b94e793a66495e0b1f34a5eb26bd7dc672db0
From 2de91862fd79bf117bc4ad775b19f181e2ae6e7c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 29/31] telegram-desktop: rebuild for protobuf, grpc
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 6b63f1942620a..53d89aad23ba8 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=4.14.15
-revision=1
+revision=2
build_style=cmake
build_helper="qemu gir"
configure_args="-DTDESKTOP_API_ID=209235
From 33f79c4acf8f3c9ec3f6229a0a56a60f16bbdb85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:34 -0500
Subject: [PATCH 30/31] usbguard: rebuild for protobuf, grpc
---
srcpkgs/usbguard/patches/gcc13.patch | 56 ++++++++++++++++++++++++++++
srcpkgs/usbguard/template | 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/usbguard/patches/gcc13.patch
diff --git a/srcpkgs/usbguard/patches/gcc13.patch b/srcpkgs/usbguard/patches/gcc13.patch
new file mode 100644
index 0000000000000..6b8f9841e64a8
--- /dev/null
+++ b/srcpkgs/usbguard/patches/gcc13.patch
@@ -0,0 +1,56 @@
+From 22b1e0897af977cc96af926c730ff948bd120bb5 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 31 Mar 2023 09:39:49 +0200
+Subject: [PATCH] Fix build for GCC 13 + make GitHub Actions cover build with
+ GCC 13 (#586)
+
+* include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no
+longer transitively included [1]. Explicitly include it for
+uint8_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+* docker.yml: Cover openSUSE Tumbleweed with GCC 13+
+
+Based on scripts/docker/build_on_centos_8_2.Dockerfile .
+
+---------
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Co-authored-by: Khem Raj <raj.khem@gmail.com>
+---
+ .github/workflows/docker.yml | 1 +
+ .../build_on_opensuse_tumbleweed.Dockerfile | 50 +++++++++++++++++++
+ src/Library/Base64.cpp | 1 -
+ src/Library/Base64.hpp | 1 +
+ 4 files changed, 52 insertions(+), 1 deletion(-)
+ create mode 100644 scripts/docker/build_on_opensuse_tumbleweed.Dockerfile
+
+diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp
+index ddb28dce..0246a134 100644
+--- a/src/Library/Base64.cpp
++++ b/src/Library/Base64.cpp
+@@ -22,7 +22,6 @@
+
+ #include "Base64.hpp"
+ #include <stdexcept>
+-#include <cstdint>
+
+ namespace usbguard
+ {
+diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp
+index 0947f214..e0c745cb 100644
+--- a/src/Library/Base64.hpp
++++ b/src/Library/Base64.hpp
+@@ -23,6 +23,7 @@
+ #endif
+
+ #include <string>
++#include <cstdint>
+ #include <cstddef>
+
+ namespace usbguard
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index eacb488a66fde..018b7f030fc4b 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
version=1.1.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
From cd8fd3cc6063c453dc4654035671eb6ac14c48fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 15 Feb 2024 13:38:35 -0500
Subject: [PATCH 31/31] vlc: drop libplacebo dependency; rebuild for protobuf,
grpc
---
srcpkgs/vlc/patches/libplacebo-5.patch | 110 -------------------------
srcpkgs/vlc/template | 15 ++--
2 files changed, 7 insertions(+), 118 deletions(-)
delete mode 100644 srcpkgs/vlc/patches/libplacebo-5.patch
diff --git a/srcpkgs/vlc/patches/libplacebo-5.patch b/srcpkgs/vlc/patches/libplacebo-5.patch
deleted file mode 100644
index 3dce0889be053..0000000000000
--- a/srcpkgs/vlc/patches/libplacebo-5.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Taken from https://git.alpinelinux.org/aports/plain/community/vlc/libplacebo-5.patch.
-
-patch vaguely ported from: https://code.videolan.org/videolan/vlc/-/merge_requests/2233
-
-diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
-index 7000e1f..49fa667 100644
---- a/modules/video_output/opengl/converter.h
-+++ b/modules/video_output/opengl/converter.h
-@@ -26,6 +26,9 @@
- #include <vlc_picture_pool.h>
- #include <vlc_opengl.h>
-
-+#include <libplacebo/log.h>
-+#include <libplacebo/shaders.h>
-+
- /* if USE_OPENGL_ES2 is defined, OpenGL ES version 2 will be used, otherwise
- * normal OpenGL will be used */
- #ifdef __APPLE__
-@@ -253,10 +256,6 @@ static inline bool HasExtension(const char *apis, const char *api)
- return false;
- }
-
--struct pl_context;
--struct pl_shader;
--struct pl_shader_res;
--
- /*
- * Structure that is filled by "glhw converter" module probe function
- * The implementation should initialize every members of the struct that are
-@@ -273,7 +272,7 @@ struct opengl_tex_converter_t
- vlc_gl_t *gl;
-
- /* libplacebo context, created by the caller (optional) */
-- struct pl_context *pl_ctx;
-+ pl_log pl_log;
-
- /* Function pointers to OpenGL functions, set by the caller */
- const opengl_vtable_t *vt;
-@@ -337,7 +336,7 @@ struct opengl_tex_converter_t
- bool yuv_color;
- GLfloat yuv_coefficients[16];
-
-- struct pl_shader *pl_sh;
-+ pl_shader pl_sh;
- const struct pl_shader_res *pl_sh_res;
-
- /* Private context */
-diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
-index ecf7226..29f4148 100644
---- a/modules/video_output/opengl/fragment_shaders.c
-+++ b/modules/video_output/opengl/fragment_shaders.c
-@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
-
- #ifdef HAVE_LIBPLACEBO
- if (tc->pl_sh) {
-- struct pl_shader *sh = tc->pl_sh;
-+ pl_shader sh = tc->pl_sh;
- struct pl_color_map_params color_params = pl_color_map_default_params;
- color_params.intent = var_InheritInteger(tc->gl, "rendering-intent");
- color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping");
-@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
- pl_color_space_from_video_format(&tc->fmt),
- dst_space, NULL, false);
-
-- struct pl_shader_obj *dither_state = NULL;
-+ pl_shader_obj dither_state = NULL;
- int method = var_InheritInteger(tc->gl, "dither-algo");
- if (method >= 0) {
-
-diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
-index 13d65e0..1ee99af 100644
---- a/modules/video_output/opengl/vout_helper.c
-+++ b/modules/video_output/opengl/vout_helper.c
-@@ -570,8 +570,7 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm)
-
- #ifdef HAVE_LIBPLACEBO
- FREENULL(tc->uloc.pl_vars);
-- if (tc->pl_ctx)
-- pl_context_destroy(&tc->pl_ctx);
-+ pl_log_destroy(&tc->pl_log);
- #endif
-
- vlc_object_release(tc);
-@@ -622,21 +621,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
- // create the main libplacebo context
- if (!subpics)
- {
-- tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) {
-+ tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) {
- .log_cb = log_cb,
- .log_priv = tc,
- .log_level = PL_LOG_INFO,
- });
-- if (tc->pl_ctx) {
-+ if (tc->pl_log) {
- # if PL_API_VER >= 20
-- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) {
-+ tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) {
- .glsl.version = tc->glsl_version,
- .glsl.gles = tc->is_gles,
- });
- # elif PL_API_VER >= 6
-- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
-+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0);
- # else
-- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
-+ tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0);
- # endif
- }
- }
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index bdd0cc414dc1a..559b1c4fff339 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,11 +1,11 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.20
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
- --enable-flac --enable-merge-ffmpeg
+ --enable-flac --enable-merge-ffmpeg --disable-libplacebo
$(vopt_enable notify) $(vopt_enable qt) $(vopt_enable x265)
$(vopt_enable svg) $(vopt_enable v4l2) $(vopt_enable smb smbclient)
$(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau)
@@ -29,12 +29,11 @@ makedepends="
gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel
libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel
libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel
- libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel
- libSM-devel libsysfs-devel libtheora-devel libupnp-devel
- libXinerama-devel libXpm-devel libXvMC-devel ncurses-devel opus-devel pulseaudio-devel
- sndio-devel speex-devel taglib-devel wayland-protocols x264-devel
- xcb-util-devel xcb-util-keysyms-devel live555-devel libdvdread-devel
- chromaprint-devel
+ libmtp-devel libproxy-devel libsamplerate-devel libSM-devel libsysfs-devel
+ libtheora-devel libupnp-devel libXinerama-devel libXpm-devel libXvMC-devel
+ ncurses-devel opus-devel pulseaudio-devel sndio-devel speex-devel taglib-devel
+ wayland-protocols x264-devel xcb-util-devel xcb-util-keysyms-devel
+ live555-devel libdvdread-devel chromaprint-devel
$(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel)
$(vopt_if qt qt5-x11extras-devel) $(vopt_if qt qt5-svg-devel)
$(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)
next prev parent reply other threads:[~2024-02-17 17:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 16:42 [PR PATCH] " ahesford
2024-02-16 16:49 ` [PR PATCH] [Updated] " ahesford
2024-02-17 1:41 ` ahesford
2024-02-17 1:53 ` ahesford
2024-02-17 14:37 ` leahneukirchen
2024-02-17 15:11 ` [PR PATCH] [Updated] " ahesford
2024-02-17 17:31 ` ahesford [this message]
2024-02-21 23:27 ` ahesford
2024-02-21 23:38 ` ahesford
2024-02-21 23:38 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240217173123.21AB028FA4@inbox.vuxu.org \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).