diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index d1d1389e1e7a..16c3769343d2 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -1,26 +1,26 @@ PORTNAME= libdispatch -DISTVERSION= 6.0.3 +DISTVERSION= 6.1 PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= fluffy@FreeBSD.org COMMENT= Grand Central Dispatch API support library LICENSE= APACHE20 USES= cmake:testing compiler:c++17-lang USE_LDCONFIG= yes USE_CXXSTD= c++17 USE_GITHUB= yes -GH_ACCOUNT= apple +GH_ACCOUNT= swiftlang GH_PROJECT= swift-corelibs-libdispatch GH_TAGNAME= swift-${DISTVERSION}-RELEASE .include .if ${OPSYS} == FreeBSD && (${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc) CFLAGS+= -Wno-incompatible-function-pointer-types .endif .include diff --git a/devel/libdispatch/distinfo b/devel/libdispatch/distinfo index 65560e992d63..25429492d7fa 100644 --- a/devel/libdispatch/distinfo +++ b/devel/libdispatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737150009 -SHA256 (apple-swift-corelibs-libdispatch-6.0.3-swift-6.0.3-RELEASE_GH0.tar.gz) = 444c0de5fe18e148548a3f3b60b3bac3d4d586285c21064346c7ca17ed1d4fac -SIZE (apple-swift-corelibs-libdispatch-6.0.3-swift-6.0.3-RELEASE_GH0.tar.gz) = 595115 +TIMESTAMP = 1743943822 +SHA256 (swiftlang-swift-corelibs-libdispatch-6.1-swift-6.1-RELEASE_GH0.tar.gz) = 5bba8d7442890f7dbd37a9245340c5bb0c4c924dee6180ba30385b24e3fdf121 +SIZE (swiftlang-swift-corelibs-libdispatch-6.1-swift-6.1-RELEASE_GH0.tar.gz) = 595700 diff --git a/devel/libdispatch/files/patch-src_init.c b/devel/libdispatch/files/patch-src_init.c index 33af1ade1a36..ec2ff9cdbf96 100644 --- a/devel/libdispatch/files/patch-src_init.c +++ b/devel/libdispatch/files/patch-src_init.c @@ -1,38 +1,36 @@ ---- src/init.c.orig 2021-09-17 04:54:52 UTC +--- src/init.c.orig 2025-03-07 00:50:44 UTC +++ src/init.c -@@ -961,7 +961,6 @@ _dispatch_continuation_get_function_symbol(dispatch_co +@@ -964,7 +964,6 @@ _dispatch_continuation_get_function_symbol(dispatch_co return dc->dc_func; } -#if HAVE_MACH void _dispatch_bug_kevent_client(const char *msg, const char *filter, const char *operation, int err, uint64_t ident, uint64_t udata, -@@ -1005,7 +1004,6 @@ _dispatch_bug_kevent_client(const char *msg, const cha +@@ -1008,7 +1007,6 @@ _dispatch_bug_kevent_client(const char *msg, const cha msg, strerror(err), err, udata, filter, ident, ident, func); } } -#endif // HAVE_MACH #if RDAR_49023449 -@@ -1048,7 +1046,7 @@ _dispatch_bug_kevent_vanished(dispatch_unote_t du) +@@ -1051,7 +1049,7 @@ _dispatch_bug_kevent_vanished(dispatch_unote_t du) "{ %p[%s], ident: %" PRIdPTR " / 0x%" PRIxPTR ", handler: %p }", dux_type(du._du)->dst_kind, dou._dq, dou._dq->dq_label ? dou._dq->dq_label : "", - du._du->du_ident, du._du->du_ident, func); + (intptr_t)du._du->du_ident, (uintptr_t)du._du->du_ident, func); } #endif // RDAR_49023449 -@@ -1153,8 +1151,8 @@ _dispatch_logv_init(void *context DISPATCH_UNUSED) - } +@@ -1157,7 +1155,7 @@ _dispatch_logv_init(void *context DISPATCH_UNUSED) #else dprintf(dispatch_logfile, "=== log file opened for %s[%u] at " -- "%ld.%06u ===\n", getprogname() ?: "", getpid(), + "%ld.%06u ===\n", getprogname() ?: "", getpid(), - tv.tv_sec, (int)tv.tv_usec); -+ "%lld.%06u ===\n", getprogname() ?: "", getpid(), + (time_t)tv.tv_sec, (int)tv.tv_usec); #endif } }