From 9aa79c73da75f84804bae55e4d5fbcee3509f0f4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 3cf507d8ada879..9d2e342b48a530 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 4b049b6b84fdd4..7909b5e19e0aa9 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 01595e58fa5eae7aff842908433ecea08aa1febd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 9d2e342b48a530..fc37436a8392b1 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 cbb8cfdbf55704..0b6f27a360f8ed 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 617823fd22a098ff25da68b561a431e5ff518e27 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 ab29ff1629fd01..301489708bf35a 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 2b9d0a90317e8a7d26d2328fd80912a503a60b24 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 7d1e97032d322d..00000000000000 --- 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 -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 - #include - #include -+#include - #include - #include - -@@ -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 790db6329120c4..00000000000000 --- 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 -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 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 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[]> service_generators_; - std::unique_ptr[]> 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 MakeKeywordsMap() { - std::set 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 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[]> enum_generators_; - std::unique_ptr[]> 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 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 variables_; - -- GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator); - }; - - diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index 7935ca2684e228..c3910417d08061 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 " 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 7d8e53f0210836222d5551841e3af6fe340498d9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 fc37436a8392b1..7588f4616ad342 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 6001f37c6b1b87..8f2bc44d901284 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 4beb8922c59ed9..b2c090a9a2f7e3 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 08957fc8b19b1b1bf99ec9d9af9d7c620cbc08bd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 7b7ef34cd6d988..ee25192910a3ad 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 " 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 bd7b6ee2b8ace6be563e7192a7081315360733da Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 b299e521ce745e..c5d4420c2a4e2b 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 " 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 14cdf517c3a3189c361a1e12fb79d5ef1490fed4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 a2f5e78d4b6415..23d24214daa389 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 771e3b4179529a4978bb91da115c92207804ed23 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 2c9701d93e7147..8ed8bc13773418 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 2a2f998c536f894f8139db2eaf9786700ba6b83a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 bb5240068d7b80..198be4764805ac 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 258bc6b00ef8738510802d33e40ef7b5ca79f5c4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 2bd79b3a9420fb..02d7743130fb39 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 1febe0bca303b5ea67b0aee9b90ff322c3409bea Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 71632e102b923e..3309afa1792674 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 2f12ac5802eda4173291c48ff369540b05d3127b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 68983b46a6d0aa..ce972f80dba6e9 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 112a4f944c56576358d80b9ea510219e12ff36b2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 00000000000000..2d3c8f850e62df --- /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 ++#include + + + //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 7ed8a207c08945..599852312e6b5f 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 a5163f828ce414fbde9761aa756dcbf2193709d3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 15 Feb 2024 13:38:32 -0500 Subject: [PATCH 15/31] justbuild: rebuild for protobuf, grpc --- srcpkgs/justbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index 2a885a0d22b509..fe12f1242995c0 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # 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" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From f7c6f8cc2bbd303fab4f3f03c5c1a04136d85a81 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 411b6e3a932dc7..1ddca9a8d6f740 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 ffd53ceb51c4a8dca166cd7c7686d96e23305671 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 36d4f88e875174..343eef52730880 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 ed0953cdefc31db0893917c9fe6d516adb3acc6f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 95ae6dd601da97..d9801a31173659 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 e87d75221514540dbfaa00742cdb4b18ba8cd6f9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 3c00e8c7056b0a..4edd459c6bcf32 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 1cc089646fec61dcc07485ffb89b4b90c60c90ae Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 6921996e4e77b3..6a79b328c1abf0 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 c146d7f689651ba2c4d66270784b6dbc3831b80e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 cb1a1fa97e3925..c86d49efe20356 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 4aa1d89853efafa337441827ce056989a275b5e2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 f682404e367976..58e75465f245d9 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 a30a5a7743739fe4e6bb93848660abfcb26ed8c2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 0d242a182b700d..07e6a53da83a25 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 1cdff45962a996c5cf5c6819b293cd8ba15a9c83 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 83ce12fa70abcd..3619c8e60d394d 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 11249467ffc3c07f7a18b3a5ce4abb94347a74cb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 1c99d8277e8197..3dd7af263aba62 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 7377bc8c49c781937e507f561e688986535c24ce Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 68c4ac4c7371ab..044d54443d3636 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 ba9b909d45cca5cecb5a38f5823d93797f66d324 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 00000000000000..d6997b73057749 --- /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 + #include + #include + +--- a/.xbps-falco/userspace/libsinsp/sinsp_exception.h ++++ b/.xbps-falco/userspace/libsinsp/sinsp_exception.h +@@ -16,6 +16,7 @@ + */ + #pragma once + ++#include + #include + #include + diff --git a/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch b/srcpkgs/sysdig/patches/libsinsp-absl-protobuf.patch index fef52a10a34b67..b36de5106f7d32 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 f3f7d4b576f1ec..b451f73920a4e3 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 fbe5d125c12b4dc1965e868b1b08b0450a16d1e2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 aee8d35d08ffbe..34e8fef0540569 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 e269b1b799b67dac36b2957f938d08af20dc1f9d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 d00b273b7b7386..d20b87b5182db8 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.9 -revision=1 +revision=2 build_style=cmake build_helper="qemu gir" configure_args="-DTDESKTOP_API_ID=209235 From 5693274f6f72a4d5c9c69886ae3fca78b1002af8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 00000000000000..6b8f9841e64a82 --- /dev/null +++ b/srcpkgs/usbguard/patches/gcc13.patch @@ -0,0 +1,56 @@ +From 22b1e0897af977cc96af926c730ff948bd120bb5 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +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 + +gcc 13 moved some includes around and as a result 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 + +* docker.yml: Cover openSUSE Tumbleweed with GCC 13+ + +Based on scripts/docker/build_on_centos_8_2.Dockerfile . + +--------- + +Signed-off-by: Khem Raj +Co-authored-by: Khem Raj +--- + .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 +-#include + + 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 ++#include + #include + + namespace usbguard diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index eacb488a66fde5..018b7f030fc4bd 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 a8180f88acea91e252280b2392fe54259e5b1c6c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" 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 3dce0889be053a..00000000000000 --- 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 - #include - -+#include -+#include -+ - /* 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 bdd0cc414dc1a0..559b1c4fff339f 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)