devel/dbus: revert update to 1.14.0

- Backout update to 1.14 until lockout of XFCE has been figured out.

Reported by:	madpilot

This reverts commit 692fe38479.
This commit is contained in:
Tobias C. Berner 2022-04-30 19:15:52 +02:00
parent 3c56b0e6da
commit f5a0f6f204
4 changed files with 30 additions and 9 deletions

View file

@ -1,7 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
PORTNAME= dbus
DISTVERSION= 1.14.0
DISTVERSION= 1.12.20
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@ -12,7 +13,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libexpat.so:textproc/expat2
USES= cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz
USES= cpe gmake libtool localbase pkgconfig python:build shebangfix
CPE_VENDOR= d-bus_project
CPE_PRODUCT= d-bus
USE_LDCONFIG= yes
@ -42,8 +43,9 @@ OPTIONS_DEFAULT= MANPAGES X11
OPTIONS_SUB= yes
X11_DESC= Support X11 Desktop Environments
MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto
MANPAGES_CONFIGURE_ENABLE= xml-docs
MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto
X11_USES= xorg
X11_USE= XORG=ice,sm,x11
X11_CONFIGURE_WITH= x

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1648926703
SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
SIZE (dbus-1.14.0.tar.xz) = 1360228
TIMESTAMP = 1593757580
SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
SIZE (dbus-1.12.20.tar.gz) = 2095511

View file

@ -0,0 +1,21 @@
--- dbus/dbus-sysdeps-unix.c.orig 2020-07-02 09:08:39 UTC
+++ dbus/dbus-sysdeps-unix.c
@@ -4469,6 +4469,10 @@ _dbus_socket_can_pass_unix_fd (DBusSocket fd)
void
_dbus_close_all (void)
{
+#ifdef __FreeBSD__
+ closefrom(3);
+#else
+#error Expected to be FreeBSD with closefrom()
int maxfds, i;
#ifdef __linux__
@@ -4525,6 +4528,7 @@ _dbus_close_all (void)
/* close all inherited fds */
for (i = 3; i < maxfds; i++)
close (i);
+#endif
}
/**

View file

@ -32,7 +32,7 @@ lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
lib/libdbus-1.a
lib/libdbus-1.so
lib/libdbus-1.so.3
lib/libdbus-1.so.3.32.0
lib/libdbus-1.so.3.19.13
libdata/pkgconfig/dbus-1.pc
@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
@ -49,9 +49,7 @@ share/dbus-1/system.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-hardening-without-traditional-activation.conf
share/xml/dbus-1/busconfig.dtd
share/xml/dbus-1/catalog.xml
share/xml/dbus-1/introspect.dtd
@dir share/dbus-1/services
@dir share/dbus-1/session.d