Attachment #247203 for bug #275887

Lines 1-5 Link Here

(-)b/devel/abseil/Makefile (-1 / +1 lines)
1	PORTNAME= abseil	1	PORTNAME= abseil
2	PORTVERSION= 20230125.3	2	PORTVERSION= 20230802.1
3	CATEGORIES= devel	3	CATEGORIES= devel
4		4
5	MAINTAINER= danfe@FreeBSD.org	5	MAINTAINER= danfe@FreeBSD.org

Lines 1-3 Link Here

(-)b/devel/abseil/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1689453071	1	TIMESTAMP = 1703268912
2	SHA256 (abseil-abseil-cpp-20230125.3_GH0.tar.gz) = 5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36	2	SHA256 (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed
3	SIZE (abseil-abseil-cpp-20230125.3_GH0.tar.gz) = 2119655	3	SIZE (abseil-abseil-cpp-20230802.1_GH0.tar.gz) = 2157158




- 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;
 }




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

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

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.inc
include/absl/log/die_if_null.h
include/absl/log/flags.h
include/absl/log/globals.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.inc
include/absl/log/log_entry.h
include/absl/log/log_sink.h
include/absl/log/log_sink_registry.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

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

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

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

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

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

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

Return to bug 275887

Added Link Here

(-)b/devel/abseil/files/patch-absl_time_internal_cctz_src_time__zone__format.cc (+22 lines)
1	- workaround for https://github.com/abseil/abseil-cpp/issues/1587
2
3	--- absl/time/internal/cctz/src/time_zone_format.cc.orig 2023-09-18 14:40:01 UTC
4	+++ absl/time/internal/cctz/src/time_zone_format.cc
5	@@ -12,7 +12,7 @@
6	// See the License for the specific language governing permissions and
7	// limitations under the License.
8
9	-#if !defined(HAS_STRPTIME)
10	+#if 0 && !defined(HAS_STRPTIME)
11	#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__)
12	#define HAS_STRPTIME 1 // Assume everyone else has strptime().
13	#endif
14	@@ -648,7 +648,7 @@ const char* ParseSubSeconds(const char* dp, detail::fe
15	// Parses a string into a std::tm using strptime(3).
16	const char* ParseTM(const char* dp, const char* fmt, std::tm* tm) {
17	if (dp != nullptr) {
18	- dp = strptime(dp, fmt, tm);
19	+ dp = ::strptime(dp, fmt, tm);
20	}
21	return dp;
22	}

Lines 24-29 include/absl/base/internal/inline_variable_testing.h Link Here

(-)b/devel/abseil/pkg-plist (-2 / +20 lines)
24	include/absl/base/internal/invoke.h	24	include/absl/base/internal/invoke.h
25	include/absl/base/internal/low_level_alloc.h	25	include/absl/base/internal/low_level_alloc.h
26	include/absl/base/internal/low_level_scheduling.h	26	include/absl/base/internal/low_level_scheduling.h
		27	include/absl/base/internal/nullability_impl.h
27	include/absl/base/internal/per_thread_tls.h	28	include/absl/base/internal/per_thread_tls.h
28	include/absl/base/internal/prefetch.h	29	include/absl/base/internal/prefetch.h
29	include/absl/base/internal/pretty_function.h	30	include/absl/base/internal/pretty_function.h
Lines 47-56 include/absl/base/internal/unscaledcycleclock.h Link Here
47	include/absl/base/internal/unscaledcycleclock_config.h	48	include/absl/base/internal/unscaledcycleclock_config.h
48	include/absl/base/log_severity.h	49	include/absl/base/log_severity.h
49	include/absl/base/macros.h	50	include/absl/base/macros.h
		51	include/absl/base/nullability.h
50	include/absl/base/optimization.h	52	include/absl/base/optimization.h
51	include/absl/base/options.h	53	include/absl/base/options.h
52	include/absl/base/policy_checks.h	54	include/absl/base/policy_checks.h
53	include/absl/base/port.h	55	include/absl/base/port.h
		56	include/absl/base/prefetch.h
54	include/absl/base/thread_annotations.h	57	include/absl/base/thread_annotations.h
55	include/absl/cleanup/cleanup.h	58	include/absl/cleanup/cleanup.h
56	include/absl/cleanup/internal/cleanup.h	59	include/absl/cleanup/internal/cleanup.h
Lines 158-169 include/absl/hash/hash.h Link Here
158	include/absl/hash/hash_testing.h	161	include/absl/hash/hash_testing.h
159	include/absl/hash/internal/city.h	162	include/absl/hash/internal/city.h
160	include/absl/hash/internal/hash.h	163	include/absl/hash/internal/hash.h
		164	include/absl/hash/internal/hash_test.h
161	include/absl/hash/internal/low_level_hash.h	165	include/absl/hash/internal/low_level_hash.h
162	include/absl/hash/internal/spy_hash_state.h	166	include/absl/hash/internal/spy_hash_state.h
163	include/absl/log/absl_check.h	167	include/absl/log/absl_check.h
164	include/absl/log/absl_log.h	168	include/absl/log/absl_log.h
165	include/absl/log/check.h	169	include/absl/log/check.h
166	include/absl/log/check_test_impl.h	170	include/absl/log/check_test_impl.inc
167	include/absl/log/die_if_null.h	171	include/absl/log/die_if_null.h
168	include/absl/log/flags.h	172	include/absl/log/flags.h
169	include/absl/log/globals.h	173	include/absl/log/globals.h
Lines 189-195 include/absl/log/internal/test_helpers.h Link Here
189	include/absl/log/internal/test_matchers.h	193	include/absl/log/internal/test_matchers.h
190	include/absl/log/internal/voidify.h	194	include/absl/log/internal/voidify.h
191	include/absl/log/log.h	195	include/absl/log/log.h
192	include/absl/log/log_basic_test_impl.h	196	include/absl/log/log_basic_test_impl.inc
193	include/absl/log/log_entry.h	197	include/absl/log/log_entry.h
194	include/absl/log/log_sink.h	198	include/absl/log/log_sink.h
195	include/absl/log/log_sink_registry.h	199	include/absl/log/log_sink_registry.h
Lines 322-332 include/absl/synchronization/barrier.h Link Here
322	include/absl/synchronization/blocking_counter.h	326	include/absl/synchronization/blocking_counter.h
323	include/absl/synchronization/internal/create_thread_identity.h	327	include/absl/synchronization/internal/create_thread_identity.h
324	include/absl/synchronization/internal/futex.h	328	include/absl/synchronization/internal/futex.h
		329	include/absl/synchronization/internal/futex_waiter.h
325	include/absl/synchronization/internal/graphcycles.h	330	include/absl/synchronization/internal/graphcycles.h
326	include/absl/synchronization/internal/kernel_timeout.h	331	include/absl/synchronization/internal/kernel_timeout.h
327	include/absl/synchronization/internal/per_thread_sem.h	332	include/absl/synchronization/internal/per_thread_sem.h
		333	include/absl/synchronization/internal/pthread_waiter.h
		334	include/absl/synchronization/internal/sem_waiter.h
		335	include/absl/synchronization/internal/stdcpp_waiter.h
328	include/absl/synchronization/internal/thread_pool.h	336	include/absl/synchronization/internal/thread_pool.h
329	include/absl/synchronization/internal/waiter.h	337	include/absl/synchronization/internal/waiter.h
		338	include/absl/synchronization/internal/waiter_base.h
		339	include/absl/synchronization/internal/win32_waiter.h
330	include/absl/synchronization/mutex.h	340	include/absl/synchronization/mutex.h
331	include/absl/synchronization/notification.h	341	include/absl/synchronization/notification.h
332	include/absl/time/civil_time.h	342	include/absl/time/civil_time.h
Lines 364-369 include/absl/types/internal/variant.h Link Here
364	include/absl/types/optional.h	374	include/absl/types/optional.h
365	include/absl/types/span.h	375	include/absl/types/span.h
366	include/absl/types/variant.h	376	include/absl/types/variant.h
		377	include/absl/utility/internal/if_constexpr.h
367	include/absl/utility/utility.h	378	include/absl/utility/utility.h
368	lib/cmake/absl/abslConfig.cmake	379	lib/cmake/absl/abslConfig.cmake
369	lib/cmake/absl/abslConfigVersion.cmake	380	lib/cmake/absl/abslConfigVersion.cmake
Lines 445-450 lib/libabsl_hashtablez_sampler.so Link Here
445	lib/libabsl_hashtablez_sampler.so.%%LIBSUFX%%	456	lib/libabsl_hashtablez_sampler.so.%%LIBSUFX%%
446	lib/libabsl_int128.so	457	lib/libabsl_int128.so
447	lib/libabsl_int128.so.%%LIBSUFX%%	458	lib/libabsl_int128.so.%%LIBSUFX%%
		459	lib/libabsl_kernel_timeout_internal.so
		460	lib/libabsl_kernel_timeout_internal.so.%%LIBSUFX%%
448	lib/libabsl_leak_check.so	461	lib/libabsl_leak_check.so
449	lib/libabsl_leak_check.so.%%LIBSUFX%%	462	lib/libabsl_leak_check.so.%%LIBSUFX%%
450	lib/libabsl_log_entry.so	463	lib/libabsl_log_entry.so
Lines 521-526 lib/libabsl_str_format_internal.so Link Here
521	lib/libabsl_str_format_internal.so.%%LIBSUFX%%	534	lib/libabsl_str_format_internal.so.%%LIBSUFX%%
522	lib/libabsl_strerror.so	535	lib/libabsl_strerror.so
523	lib/libabsl_strerror.so.%%LIBSUFX%%	536	lib/libabsl_strerror.so.%%LIBSUFX%%
		537	lib/libabsl_string_view.so
		538	lib/libabsl_string_view.so.%%LIBSUFX%%
524	lib/libabsl_strings.so	539	lib/libabsl_strings.so
525	lib/libabsl_strings.so.%%LIBSUFX%%	540	lib/libabsl_strings.so.%%LIBSUFX%%
526	lib/libabsl_strings_internal.so	541	lib/libabsl_strings_internal.so
Lines 612-617 libdata/pkgconfig/absl_hash_policy_traits.pc Link Here
612	libdata/pkgconfig/absl_hashtable_debug.pc	627	libdata/pkgconfig/absl_hashtable_debug.pc
613	libdata/pkgconfig/absl_hashtable_debug_hooks.pc	628	libdata/pkgconfig/absl_hashtable_debug_hooks.pc
614	libdata/pkgconfig/absl_hashtablez_sampler.pc	629	libdata/pkgconfig/absl_hashtablez_sampler.pc
		630	libdata/pkgconfig/absl_if_constexpr.pc
615	libdata/pkgconfig/absl_inlined_vector.pc	631	libdata/pkgconfig/absl_inlined_vector.pc
616	libdata/pkgconfig/absl_inlined_vector_internal.pc	632	libdata/pkgconfig/absl_inlined_vector_internal.pc
617	libdata/pkgconfig/absl_int128.pc	633	libdata/pkgconfig/absl_int128.pc
Lines 654-659 libdata/pkgconfig/absl_node_hash_set.pc Link Here
654	libdata/pkgconfig/absl_node_slot_policy.pc	670	libdata/pkgconfig/absl_node_slot_policy.pc
655	libdata/pkgconfig/absl_non_temporal_arm_intrinsics.pc	671	libdata/pkgconfig/absl_non_temporal_arm_intrinsics.pc
656	libdata/pkgconfig/absl_non_temporal_memcpy.pc	672	libdata/pkgconfig/absl_non_temporal_memcpy.pc
		673	libdata/pkgconfig/absl_nullability.pc
657	libdata/pkgconfig/absl_numeric.pc	674	libdata/pkgconfig/absl_numeric.pc
658	libdata/pkgconfig/absl_numeric_representation.pc	675	libdata/pkgconfig/absl_numeric_representation.pc
659	libdata/pkgconfig/absl_optional.pc	676	libdata/pkgconfig/absl_optional.pc
Lines 699-704 libdata/pkgconfig/absl_statusor.pc Link Here
699	libdata/pkgconfig/absl_str_format.pc	716	libdata/pkgconfig/absl_str_format.pc
700	libdata/pkgconfig/absl_str_format_internal.pc	717	libdata/pkgconfig/absl_str_format_internal.pc
701	libdata/pkgconfig/absl_strerror.pc	718	libdata/pkgconfig/absl_strerror.pc
		719	libdata/pkgconfig/absl_string_view.pc
702	libdata/pkgconfig/absl_strings.pc	720	libdata/pkgconfig/absl_strings.pc
703	libdata/pkgconfig/absl_strings_internal.pc	721	libdata/pkgconfig/absl_strings_internal.pc
704	libdata/pkgconfig/absl_symbolize.pc	722	libdata/pkgconfig/absl_symbolize.pc