* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/
@ 2020-06-25 7:30 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2020-06-25 7:30 UTC (permalink / raw
To: gentoo-commits
commit: a1a3bb0fc62b6944db42955147d3c954a44394aa
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 22 18:16:48 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:30:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a3bb0f
sys-apps/dbus: remove unused file
Closes: https://github.com/gentoo/gentoo/pull/16376
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-apps/dbus/files/dbus.initd-r1 | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1
deleted file mode 100644
index bd3542381a7..00000000000
--- a/sys-apps/dbus/files/dbus.initd-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-
-dbus_socket="/var/run/dbus/system_bus_socket"
-
-depend() {
- need localmount
- after bootmisc
-}
-
-start_pre() {
- /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
- # We need to test if /var/run/dbus exists, since script will fail if it does not
- checkpath -q -d /var/run/dbus
-}
-
-stop_post() {
- [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
-}
-
-reload() {
- ebegin "Reloading D-BUS messagebus config"
- /usr/bin/dbus-send --print-reply --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig > /dev/null
- eend $?
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/
@ 2022-10-15 19:34 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-10-15 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 8b47d1aa4f2c87e2293fad2aed57ad9102226db7
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct 7 20:26:14 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b47d1aa
sys-apps/dbus: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27681
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/dbus-1.14.0-clang-15-configure.patch | 26 ----------------------
1 file changed, 26 deletions(-)
diff --git a/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch b/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch
deleted file mode 100644
index 821279c50ee9..000000000000
--- a/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/339
-
-From 88c96ff6a351758cb7c69a25e3a8464b5164a19c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Sep 2022 18:37:35 +0100
-Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15
- (implicit function declarations)
-
-Clang 15 makes implicit function declarations fatal by default which
-leads to some configure tests silently failing/returning
-the wrong result.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -613,7 +613,8 @@ AS_IF([test -n "$dbus_va_copy_func"],
- AC_CACHE_CHECK([whether $CC knows __sync_sub_and_fetch()],
- dbus_cv_sync_sub_and_fetch,
- [AC_LINK_IFELSE([
-- AC_LANG_PROGRAM([[]], [[int a = 4; int b = __sync_sub_and_fetch(&a, 4); exit(b); ]])],
-+ AC_LANG_PROGRAM([[]], [[#include <stdlib.h>
-+ int a = 4; int b = __sync_sub_and_fetch(&a, 4); exit(b); ]])],
- [dbus_cv_sync_sub_and_fetch=yes],
- [dbus_cv_sync_sub_and_fetch=no])
- ])
-GitLab
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/
@ 2022-11-13 18:34 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2022-11-13 18:34 UTC (permalink / raw
To: gentoo-commits
commit: ba0af321b32d067cf6f79ff0b6449d0db74b91ce
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Nov 12 08:08:12 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 18:33:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0af321
sys-apps/dbus: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28242
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-apps/dbus/files/dbus-daemon-optional.patch | 75 --------------------------
sys-apps/dbus/files/dbus-enable-elogind.patch | 73 -------------------------
2 files changed, 148 deletions(-)
diff --git a/sys-apps/dbus/files/dbus-daemon-optional.patch b/sys-apps/dbus/files/dbus-daemon-optional.patch
deleted file mode 100644
index 353dcb5761be..000000000000
--- a/sys-apps/dbus/files/dbus-daemon-optional.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 21 Feb 2019 23:53:19 +0100
-Subject: [PATCH] Make dbus daemon build optional
-
----
- bus/Makefile.am | 2 ++
- configure.ac | 17 ++++++++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 9ae3071..26a770c 100644
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -70,6 +70,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
- agent_DATA=org.freedesktop.dbus-session.plist
- endif
-
-+if DBUS_DAEMON
- if DBUS_BUS_ENABLE_KQUEUE
- DIR_WATCH_SOURCE=dir-watch-kqueue.c
- else
-@@ -241,6 +242,7 @@ test_bus_LDADD = \
- $(top_builddir)/dbus/libdbus-internal.la \
- $(DBUS_BUS_LIBS) \
- $(NULL)
-+endif DBUS_DAEMON
-
- install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d
-diff --git a/configure.ac b/configure.ac
-index be6b065..854e846 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -202,6 +202,7 @@ AC_ARG_ENABLE([apparmor],
- [enable_apparmor=$enableval],
- [enable_apparmor=auto])
- AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto)
-+AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[build with the dbus daemon]),enable_daemon=$enableval,enable_daemon=yes)
- AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto)
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
-@@ -830,7 +831,20 @@ AC_CHECK_FUNCS(getpeerucred getpeereid)
-
- AC_CHECK_FUNCS(pipe2 accept4)
-
--PKG_CHECK_MODULES([EXPAT], [expat])
-+# dbusdaemon checks
-+if test x$enable_daemon = xno ; then
-+ have_daemon=no
-+else
-+ have_daemon=yes
-+fi
-+
-+dnl check if daemon shall be built
-+if test x$have_daemon = xyes; then
-+ AC_DEFINE(DBUS_DAEMON,1,[Use daemon])
-+ PKG_CHECK_MODULES([EXPAT], [expat])
-+fi
-+
-+AM_CONDITIONAL(DBUS_DAEMON, test x$have_daemon = xyes)
-
- save_cflags="$CFLAGS"
- save_libs="$LIBS"
-@@ -1824,6 +1838,7 @@ echo "
- Building bus stats API: ${enable_stats}
- Building SELinux support: ${have_selinux}
- Building AppArmor support: ${have_apparmor}
-+ Building daemon: ${have_daemon}
- Building inotify support: ${have_inotify}
- Building kqueue support: ${have_kqueue}
- Building systemd support: ${have_systemd}
---
-2.20.1
-
diff --git a/sys-apps/dbus/files/dbus-enable-elogind.patch b/sys-apps/dbus/files/dbus-enable-elogind.patch
deleted file mode 100644
index 5cb5d649cd91..000000000000
--- a/sys-apps/dbus/files/dbus-enable-elogind.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200
-+++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100
-@@ -32,6 +32,9 @@
- #if HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#if HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
-
- /**
- * @addtogroup DBusInternalsUtils
-@@ -54,7 +57,7 @@
- const DBusUserInfo *info;
- dbus_bool_t result = FALSE;
-
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
- /* check if we have logind */
- if (access ("/run/systemd/seats/", F_OK) >= 0)
- {
---- a/configure.ac 2016-11-03 11:13:58.286528265 +0100
-+++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100
-@@ -185,6 +185,7 @@
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
- AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
-+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
- AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
-
- AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
-@@ -1184,6 +1185,24 @@
-
- AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
-
-+dnl elogind detection
-+if test x$enable_elogind = xno ; then
-+ have_elogind=no;
-+else
-+ PKG_CHECK_MODULES([ELOGIND],
-+ [libelogind >= 209],
-+ [have_elogind=yes],
-+ [have_elogind=no])
-+fi
-+
-+if test x$have_elogind = xyes; then
-+ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
-+fi
-+
-+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
-+ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found])
-+fi
-+
- dnl systemd detection
- if test x$enable_systemd = xno ; then
- have_systemd=no;
-@@ -1290,7 +1309,7 @@
- fi
-
- #### Set up final flags
--LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"
-+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
- AC_SUBST([LIBDBUS_LIBS])
-
- ### X11 detection
-@@ -1949,6 +1968,7 @@
- Building AppArmor support: ${have_apparmor}
- Building inotify support: ${have_inotify}
- Building kqueue support: ${have_kqueue}
-+ Building elogind support: ${have_elogind}
- Building systemd support: ${have_systemd}
- Building X11 code: ${have_x11}
- Building Doxygen docs: ${enable_doxygen_docs}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/
@ 2023-09-02 17:35 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-09-02 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 437dd07ebf11db8a8babbf70c317dbbe7abad168
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 17:35:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 17:35:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437dd07e
sys-apps/dbus: fixup elogind patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch b/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch
index 1cf9094990e6..543eac5b30f2 100644
--- a/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch
+++ b/sys-apps/dbus/files/dbus-1.15.8-enable-elogind.patch
@@ -9,7 +9,7 @@ particularly required. The only known consumer at the moment is hplip.
#ifdef HAVE_SYSTEMD
#include <systemd/sd-login.h>
#endif
-+#if HAVE_ELOGIND
++#ifdef HAVE_ELOGIND
+#include <elogind/sd-login.h>
+#endif
@@ -40,7 +40,7 @@ particularly required. The only known consumer at the moment is hplip.
endif
endif
-+elogind = dependency('elogind', version: '>=209', required: get_option('elogind'))
++elogind = dependency('libelogind', version: '>=209', required: get_option('elogind'))
+use_elogind = elogind.found()
+config.set('HAVE_ELOGIND', use_elogind)
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/
@ 2024-10-15 21:46 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-10-15 21:46 UTC (permalink / raw
To: gentoo-commits
commit: dbd706e0b2bc43db61939caa7a99304b04378089
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 14 15:31:52 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 21:45:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd706e0
sys-apps/dbus: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../dbus/files/dbus-1.15.0-daemon-optional.patch | 65 -------------------
.../dbus/files/dbus-1.15.0-enable-elogind.patch | 75 ----------------------
2 files changed, 140 deletions(-)
diff --git a/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch b/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch
deleted file mode 100644
index 2b9cd03472d8..000000000000
--- a/sys-apps/dbus/files/dbus-1.15.0-daemon-optional.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/653136
-
-From 3c08d28fbae8b0ef3839ef26f8d2a713a9a684f9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 21 Feb 2019 23:53:19 +0100
-Subject: [PATCH] Make dbus daemon build optional
-
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -76,6 +76,7 @@ agentdir=$(LAUNCHD_AGENT_DIR)
- agent_DATA=org.freedesktop.dbus-session.plist
- endif
-
-+if DBUS_DAEMON
- if DBUS_BUS_ENABLE_KQUEUE
- DIR_WATCH_SOURCE=dir-watch-kqueue.c
- else
-@@ -230,6 +231,7 @@ EXTRA_DIST += \
- tmpfiles.d/dbus.conf.in \
- tmpfiles.d/meson.build \
- $(NULL)
-+endif DBUS_DAEMON
-
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = \
---- a/configure.ac
-+++ b/configure.ac
-@@ -211,6 +211,7 @@ AC_ARG_ENABLE([apparmor],
- [enable_apparmor=$enableval],
- [enable_apparmor=auto])
- AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto)
-+AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[build with the dbus daemon]),enable_daemon=$enableval,enable_daemon=yes)
- AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto)
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
-@@ -658,7 +659,20 @@ AC_CHECK_MEMBER([struct unpcbid.unp_pid],
- [],
- [[#include <sys/un.h>]])
-
--PKG_CHECK_MODULES([EXPAT], [expat])
-+# dbusdaemon checks
-+if test x$enable_daemon = xno ; then
-+ have_daemon=no
-+else
-+ have_daemon=yes
-+fi
-+
-+dnl check if daemon shall be built
-+if test x$have_daemon = xyes; then
-+ AC_DEFINE(DBUS_DAEMON,1,[Use daemon])
-+ PKG_CHECK_MODULES([EXPAT], [expat])
-+fi
-+
-+AM_CONDITIONAL(DBUS_DAEMON, test x$have_daemon = xyes)
-
- save_cflags="$CFLAGS"
- save_libs="$LIBS"
-@@ -1748,6 +1762,7 @@ echo "
- Building bus stats API: ${enable_stats}
- Building SELinux support: ${have_selinux}
- Building AppArmor support: ${have_apparmor}
-+ Building daemon: ${have_daemon}
- Building inotify support: ${have_inotify}
- Building kqueue support: ${have_kqueue}
- Building elogind support: ${have_elogind}
diff --git a/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch b/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch
deleted file mode 100644
index a6c0e1bd2153..000000000000
--- a/sys-apps/dbus/files/dbus-1.15.0-enable-elogind.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/53
-https://bugs.gentoo.org/599494
---- a/configure.ac
-+++ b/configure.ac
-@@ -215,6 +215,7 @@ AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify sup
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
- AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
-+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
- AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
- AC_ARG_ENABLE(traditional-activation, AS_HELP_STRING([--disable-traditional-activation], [Do not build support for service activation without using SystemdService]), enable_traditional_activation="$enableval", enable_traditional_activation=yes)
-
-@@ -904,6 +905,24 @@ fi
-
- AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
-
-+dnl elogind detection
-+if test x$enable_elogind = xno ; then
-+ have_elogind=no;
-+else
-+ PKG_CHECK_MODULES([ELOGIND],
-+ [libelogind >= 209],
-+ [have_elogind=yes],
-+ [have_elogind=no])
-+fi
-+
-+if test x$have_elogind = xyes; then
-+ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
-+fi
-+
-+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
-+ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found])
-+fi
-+
- dnl systemd detection
- if test x$enable_systemd = xno ; then
- have_systemd=no;
-@@ -1024,7 +1043,7 @@ if test x$with_valgrind != xno; then
- fi
-
- #### Set up final flags
--LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"
-+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
- AC_SUBST([LIBDBUS_LIBS])
-
- ### X11 detection
-@@ -1731,6 +1750,7 @@ echo "
- Building AppArmor support: ${have_apparmor}
- Building inotify support: ${have_inotify}
- Building kqueue support: ${have_kqueue}
-+ Building elogind support: ${have_elogind}
- Building systemd support: ${have_systemd}
- Traditional activation: ${enable_traditional_activation}
- Building X11 code: ${have_x11}
---- a/dbus/dbus-userdb-util.c
-+++ b/dbus/dbus-userdb-util.c
-@@ -39,6 +39,9 @@
- #ifdef HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#if HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
-
- /**
- * @addtogroup DBusInternalsUtils
-@@ -65,7 +68,7 @@ dbus_bool_t
- _dbus_is_console_user (dbus_uid_t uid,
- DBusError *error)
- {
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
- /* check if we have logind */
- if (access ("/run/systemd/seats/", F_OK) >= 0)
- {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-15 21:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-02 17:35 [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-15 21:46 Conrad Kostecki
2022-11-13 18:34 Conrad Kostecki
2022-10-15 19:34 Conrad Kostecki
2020-06-25 7:30 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox