summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2023-05-29 10:09:14 -0400
committerDavid P <megver83@parabola.nu>2023-05-29 10:09:14 -0400
commita962f5ff6d1be785644e38ff75d919ccdc5097bc (patch)
treeab058051fb26f67c5e4cbffd1a20c22a4de8ae36 /pcr
parent48d6a4ac0abb74d2d09eb6602f17b3aeb04633f7 (diff)
remove pcr/dbus-elogind
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'pcr')
-rw-r--r--pcr/dbus-elogind/PKGBUILD84
-rw-r--r--pcr/dbus-elogind/dbus-enable-elogind.patch73
-rw-r--r--pcr/dbus-elogind/dbus.sysusers1
3 files changed, 0 insertions, 158 deletions
diff --git a/pcr/dbus-elogind/PKGBUILD b/pcr/dbus-elogind/PKGBUILD
deleted file mode 100644
index 47cd9f163..000000000
--- a/pcr/dbus-elogind/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Maintainer (artix): artoo <artoo@manjaro.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Link Dupont <link@subpop.net>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Maintainer: David P. <megver83@parabola.nu>
-
-pkgname=dbus-elogind
-_pkgname=${pkgname/-elogind}
-pkgver=1.12.6
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="https://wiki.freedesktop.org/www/Software/dbus/"
-arch=(i686 x86_64 armv7h)
-license=(GPL custom)
-provides=('libdbus' "dbus=$pkgver" "dbus-x11=$pkgver")
-conflicts=('libdbus' 'dbus' 'dbus-x11')
-depends=('libx11' 'expat' 'libelogind')
-makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz)
-optdepends=('dbus-openrc: dbus initscript')
-_commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8 # tags/dbus-1.12.6^0
-source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit"
- 'dbus.sysusers'
- 'dbus-enable-elogind.patch')
-sha256sums=('SKIP'
- '9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8'
- 'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0')
-validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk>
- '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
-
-pkgver() {
- cd $_pkgname
- git describe --tags | sed 's/^dbus-//;s/-/+/g'
-}
-
-prepare() {
- cd $_pkgname
-
- # Reduce docs size
- printf '%s\n' >>Doxyfile.in \
- HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes
-
- patch -Np1 -i ${srcdir}/dbus-enable-elogind.patch
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $_pkgname
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
- --with-system-pid-file=/run/dbus/pid \
- --with-system-socket=/run/dbus/system_bus_socket \
- --with-console-auth-dir=/run/console/ \
- --enable-inotify --disable-static \
- --disable-verbose-mode --disable-asserts \
- --without-systemdsystemunitdir \
- --disable-systemd --disable-user-session \
- --enable-elogind --enable-x11-autolaunch
- make
-
-}
-
-check() {
- cd $_pkgname
- make check # will fail with libremakepkg if building without -N
-}
-
-package() {
- cd $_pkgname
-
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir/var/run"
-
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
-
- # We have a pre-assigned uid (81)
- install -Dm644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
-
- # Remove docs
- rm -r "$pkgdir/usr/share/doc"
-}
diff --git a/pcr/dbus-elogind/dbus-enable-elogind.patch b/pcr/dbus-elogind/dbus-enable-elogind.patch
deleted file mode 100644
index 5cb5d649c..000000000
--- a/pcr/dbus-elogind/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}
diff --git a/pcr/dbus-elogind/dbus.sysusers b/pcr/dbus-elogind/dbus.sysusers
deleted file mode 100644
index f509703d0..000000000
--- a/pcr/dbus-elogind/dbus.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u dbus 81 "System Message Bus"