sys-apps/dbus: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

2 files changed, 0 insertions, 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)
-     {