diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 1ecf854e8588..9ca1aa15e5d7 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,88 +1,88 @@ PORTNAME= dbus DISTVERSION= 1.16.2 -PORTREVISION= 3 +PORTREVISION= 4 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-transport-socket.c b/devel/dbus/files/patch-dbus_dbus-transport-socket.c new file mode 100644 index 000000000000..15a5d2eedcd0 --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-transport-socket.c @@ -0,0 +1,15 @@ +https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/526 + +--- dbus/dbus-transport-socket.c.orig 2025-02-27 16:29:06 UTC ++++ dbus/dbus-transport-socket.c +@@ -1208,8 +1208,8 @@ socket_do_iteration (DBusTransport *transport, + do_io_error (transport); + else + { +- dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0; +- dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0; ++ dbus_bool_t need_read = (poll_fd.revents & (_DBUS_POLLIN | _DBUS_POLLHUP)) > 0; ++ dbus_bool_t need_write = (poll_fd.revents & (_DBUS_POLLOUT | _DBUS_POLLHUP)) > 0; + dbus_bool_t authentication_completed; + + _dbus_verbose ("in iteration, need_read=%d need_write=%d\n",