Attachment 247203 Details for Bug 275887 – patch

[patch] patch

abseil.patch (text/plain), 6.76 KB, created by Yuri Victorovich on 2023-12-22 18:37:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-12-22 18:37:07 UTC

Size: 6.76 KB

patch

obsolete

>diff --git a/devel/abseil/Makefile b/devel/abseil/Makefile
>index d81294ae0bbf..dc4fe67a32a7 100644
>--- a/devel/abseil/Makefile
>+++ b/devel/abseil/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	abseil
>-PORTVERSION=	20230125.3
>+PORTVERSION=	20230802.1
> CATEGORIES=	devel
> 
> MAINTAINER=	danfe@FreeBSD.org
>diff --git a/devel/abseil/distinfo b/devel/abseil/distinfo
>index f6ecdc2b7820..ff38264a9d3a 100644
>--- a/devel/abseil/distinfo
>+++ b/devel/abseil/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1689453071
>-SHA256 (abseil-abseil-cpp-20230125.3_GH0.tar.gz) = 5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36
>-SIZE (abseil-abseil-cpp-20230125.3_GH0.tar.gz) = 2119655
>+TIMESTAMP = 1703268912
>+SHA256 (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed
>+SIZE (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 2157158
>diff --git a/devel/abseil/files/patch-absl_time_internal_cctz_src_time__zone__format.cc b/devel/abseil/files/patch-absl_time_internal_cctz_src_time__zone__format.cc
>new file mode 100644
>index 000000000000..3f3b808e8567
>--- /dev/null
>+++ b/devel/abseil/files/patch-absl_time_internal_cctz_src_time__zone__format.cc
>@@ -0,0 +1,22 @@
>+- workaround for https://github.com/abseil/abseil-cpp/issues/1587
>+
>+--- absl/time/internal/cctz/src/time_zone_format.cc.orig	2023-09-18 14:40:01 UTC
>++++ absl/time/internal/cctz/src/time_zone_format.cc
>+@@ -12,7 +12,7 @@
>+ //   See the License for the specific language governing permissions and
>+ //   limitations under the License.
>+ 
>+-#if !defined(HAS_STRPTIME)
>++#if 0 && !defined(HAS_STRPTIME)
>+ #if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__)
>+ #define HAS_STRPTIME 1  // Assume everyone else has strptime().
>+ #endif
>+@@ -648,7 +648,7 @@ const char* ParseSubSeconds(const char* dp, detail::fe
>+ // Parses a string into a std::tm using strptime(3).
>+ const char* ParseTM(const char* dp, const char* fmt, std::tm* tm) {
>+   if (dp != nullptr) {
>+-    dp = strptime(dp, fmt, tm);
>++    dp = ::strptime(dp, fmt, tm);
>+   }
>+   return dp;
>+ }
>diff --git a/devel/abseil/pkg-plist b/devel/abseil/pkg-plist
>index 8c68cf9bc207..659809c6193e 100644
>--- a/devel/abseil/pkg-plist
>+++ b/devel/abseil/pkg-plist
>@@ -24,6 +24,7 @@ include/absl/base/internal/inline_variable_testing.h
> include/absl/base/internal/invoke.h
> include/absl/base/internal/low_level_alloc.h
> include/absl/base/internal/low_level_scheduling.h
>+include/absl/base/internal/nullability_impl.h
> include/absl/base/internal/per_thread_tls.h
> include/absl/base/internal/prefetch.h
> include/absl/base/internal/pretty_function.h
>@@ -47,10 +48,12 @@ include/absl/base/internal/unscaledcycleclock.h
> include/absl/base/internal/unscaledcycleclock_config.h
> include/absl/base/log_severity.h
> include/absl/base/macros.h
>+include/absl/base/nullability.h
> include/absl/base/optimization.h
> include/absl/base/options.h
> include/absl/base/policy_checks.h
> include/absl/base/port.h
>+include/absl/base/prefetch.h
> include/absl/base/thread_annotations.h
> include/absl/cleanup/cleanup.h
> include/absl/cleanup/internal/cleanup.h
>@@ -158,12 +161,13 @@ include/absl/hash/hash.h
> include/absl/hash/hash_testing.h
> include/absl/hash/internal/city.h
> include/absl/hash/internal/hash.h
>+include/absl/hash/internal/hash_test.h
> include/absl/hash/internal/low_level_hash.h
> include/absl/hash/internal/spy_hash_state.h
> include/absl/log/absl_check.h
> include/absl/log/absl_log.h
> include/absl/log/check.h
>-include/absl/log/check_test_impl.h
>+include/absl/log/check_test_impl.inc
> include/absl/log/die_if_null.h
> include/absl/log/flags.h
> include/absl/log/globals.h
>@@ -189,7 +193,7 @@ include/absl/log/internal/test_helpers.h
> include/absl/log/internal/test_matchers.h
> include/absl/log/internal/voidify.h
> include/absl/log/log.h
>-include/absl/log/log_basic_test_impl.h
>+include/absl/log/log_basic_test_impl.inc
> include/absl/log/log_entry.h
> include/absl/log/log_sink.h
> include/absl/log/log_sink_registry.h
>@@ -322,11 +326,17 @@ include/absl/synchronization/barrier.h
> include/absl/synchronization/blocking_counter.h
> include/absl/synchronization/internal/create_thread_identity.h
> include/absl/synchronization/internal/futex.h
>+include/absl/synchronization/internal/futex_waiter.h
> include/absl/synchronization/internal/graphcycles.h
> include/absl/synchronization/internal/kernel_timeout.h
> include/absl/synchronization/internal/per_thread_sem.h
>+include/absl/synchronization/internal/pthread_waiter.h
>+include/absl/synchronization/internal/sem_waiter.h
>+include/absl/synchronization/internal/stdcpp_waiter.h
> include/absl/synchronization/internal/thread_pool.h
> include/absl/synchronization/internal/waiter.h
>+include/absl/synchronization/internal/waiter_base.h
>+include/absl/synchronization/internal/win32_waiter.h
> include/absl/synchronization/mutex.h
> include/absl/synchronization/notification.h
> include/absl/time/civil_time.h
>@@ -364,6 +374,7 @@ include/absl/types/internal/variant.h
> include/absl/types/optional.h
> include/absl/types/span.h
> include/absl/types/variant.h
>+include/absl/utility/internal/if_constexpr.h
> include/absl/utility/utility.h
> lib/cmake/absl/abslConfig.cmake
> lib/cmake/absl/abslConfigVersion.cmake
>@@ -445,6 +456,8 @@ lib/libabsl_hashtablez_sampler.so
> lib/libabsl_hashtablez_sampler.so.%%LIBSUFX%%
> lib/libabsl_int128.so
> lib/libabsl_int128.so.%%LIBSUFX%%
>+lib/libabsl_kernel_timeout_internal.so
>+lib/libabsl_kernel_timeout_internal.so.%%LIBSUFX%%
> lib/libabsl_leak_check.so
> lib/libabsl_leak_check.so.%%LIBSUFX%%
> lib/libabsl_log_entry.so
>@@ -521,6 +534,8 @@ lib/libabsl_str_format_internal.so
> lib/libabsl_str_format_internal.so.%%LIBSUFX%%
> lib/libabsl_strerror.so
> lib/libabsl_strerror.so.%%LIBSUFX%%
>+lib/libabsl_string_view.so
>+lib/libabsl_string_view.so.%%LIBSUFX%%
> lib/libabsl_strings.so
> lib/libabsl_strings.so.%%LIBSUFX%%
> lib/libabsl_strings_internal.so
>@@ -612,6 +627,7 @@ libdata/pkgconfig/absl_hash_policy_traits.pc
> libdata/pkgconfig/absl_hashtable_debug.pc
> libdata/pkgconfig/absl_hashtable_debug_hooks.pc
> libdata/pkgconfig/absl_hashtablez_sampler.pc
>+libdata/pkgconfig/absl_if_constexpr.pc
> libdata/pkgconfig/absl_inlined_vector.pc
> libdata/pkgconfig/absl_inlined_vector_internal.pc
> libdata/pkgconfig/absl_int128.pc
>@@ -654,6 +670,7 @@ libdata/pkgconfig/absl_node_hash_set.pc
> libdata/pkgconfig/absl_node_slot_policy.pc
> libdata/pkgconfig/absl_non_temporal_arm_intrinsics.pc
> libdata/pkgconfig/absl_non_temporal_memcpy.pc
>+libdata/pkgconfig/absl_nullability.pc
> libdata/pkgconfig/absl_numeric.pc
> libdata/pkgconfig/absl_numeric_representation.pc
> libdata/pkgconfig/absl_optional.pc
>@@ -699,6 +716,7 @@ libdata/pkgconfig/absl_statusor.pc
> libdata/pkgconfig/absl_str_format.pc
> libdata/pkgconfig/absl_str_format_internal.pc
> libdata/pkgconfig/absl_strerror.pc
>+libdata/pkgconfig/absl_string_view.pc
> libdata/pkgconfig/absl_strings.pc
> libdata/pkgconfig/absl_strings_internal.pc
> libdata/pkgconfig/absl_symbolize.pc

Actions: View | Diff

Attachments on bug 275887: 247203 | 248083 | 248753 | 252427