diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index b1b182a97bca..1ecf854e8588 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,88 +1,88 @@ PORTNAME= dbus DISTVERSION= 1.16.2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= https://dbus.freedesktop.org/releases/dbus/ MAINTAINER= desktop@FreeBSD.org COMMENT= Message bus system for inter-application communication WWW= https://www.freedesktop.org/Software/dbus LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cpe libtool localbase meson pkgconfig python:build \ shebangfix tar:xz CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_LDCONFIG= yes USE_RC_SUBR= dbus SHEBANG_FILES= tools/GetAllMatchRules.py \ tools/build-timestamp.py HAS_SYMBOL_VERSION= ${PREFIX}/lib/libdbus-1.so.${_LIBVERSION} MESON_ARGS= -Dkqueue=enabled \ -Dapparmor=disabled \ -Ddoxygen_docs=disabled \ -Dducktype_docs=disabled \ -Depoll=disabled \ -Dinotify=disabled \ -Dlaunchd=disabled \ -Dlibaudit=disabled \ -Dmodular_tests=disabled \ -Dqt_help=disabled \ -Dselinux=disabled \ -Dsystemd=disabled \ -Druntime_dir=/var/run \ -Dsession_socket_dir=/tmp \ -Dtest_socket_dir=${WRKDIR} BINARY_ALIAS= python3=${PYTHON_CMD} PORTSCOUT= limitw:1,even USERS= messagebus GROUPS= messagebus _LIBVERSION= 3.38.3 OPTIONS_SUB= yes PLIST_SUB= GROUPS=${GROUPS} \ VERSION="1.0" \ LIBVERSION=${_LIBVERSION} PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES MANPAGES X11 OPTIONS_DEFAULT= MANPAGES X11 MANPAGES_BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl MANPAGES_USES= gnome MANPAGES_USE= gnome=libxslt:build MANPAGES_MESON_ENABLED= xml_docs X11_DESC= Support X11 Desktop Environments X11_USES= xorg X11_USE= XORG=ice,sm,x11 X11_MESON_ENABLED= x11_autolaunch post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/dbus/dbus-sysdeps-util-unix.c post-install: ${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR} .for file in session.conf system.conf @cd ${STAGEDIR}${ETCDIR}-1/ && \ ${MV} ${file} ${file}.sample .endfor .include .if ${OSVERSION} < 1400000 MESON_ARGS+= -Db_lundef=false .endif .include diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c index 58b587c84140..05bd0cd15fd4 100644 --- a/devel/dbus/files/patch-dbus_dbus-connection.c +++ b/devel/dbus/files/patch-dbus_dbus-connection.c @@ -1,69 +1,20 @@ ---- dbus/dbus-connection.c.orig 2018-02-08 14:07:21 UTC +--- dbus/dbus-connection.c.orig 2025-02-27 16:29:06 UTC +++ dbus/dbus-connection.c -@@ -2385,7 +2385,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * - DBusConnection *connection; - dbus_uint32_t client_serial; - DBusTimeout *timeout; -- int timeout_milliseconds, elapsed_milliseconds; -+ int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds; - - _dbus_assert (pending != NULL); - -@@ -2466,7 +2466,11 @@ _dbus_connection_block_pending_call (DBusPendingCall * - _dbus_get_monotonic_time (&tv_sec, &tv_usec); - elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 + - (tv_usec - start_tv_usec) / 1000; -- -+ if (timeout_milliseconds != -1) -+ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds; -+ else -+ remain_milliseconds = -1; -+ - if (!_dbus_connection_get_is_connected_unlocked (connection)) - { - DBusMessage *error_msg; -@@ -2494,7 +2498,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * - */ - _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); - -- _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds); -+ _dbus_memory_pause_based_on_timeout (remain_milliseconds); - } - else - { -@@ -2503,7 +2507,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * - pending, - DBUS_ITERATION_DO_READING | - DBUS_ITERATION_BLOCK, -- timeout_milliseconds - elapsed_milliseconds); -+ remain_milliseconds); - } - - goto recheck_status; -@@ -2512,7 +2516,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * - _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n"); - else if (elapsed_milliseconds < timeout_milliseconds) - { -- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds); -+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds); - - if (status == DBUS_DISPATCH_NEED_MEMORY) - { -@@ -2522,7 +2526,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * +@@ -2510,7 +2510,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * */ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); - _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds); -+ _dbus_memory_pause_based_on_timeout (remain_milliseconds); ++ _dbus_memory_pause_based_on_timeout (-1); } else { -@@ -2531,7 +2535,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * +@@ -2519,7 +2519,7 @@ _dbus_connection_block_pending_call (DBusPendingCall * pending, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); -+ remain_milliseconds); ++ -1); } goto recheck_status;