From 37804faa0a887c5ec5d2fc0a95e622157d6f9c72 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 4 Sep 2014 16:59:56 +0200
Subject: [PATCH] xorg-server: add patch by yours truly to completely disable
 systemd-logind.

Fix #532
---
 .../patches/disable-systemd-completely.patch  | 27 +++++++++++++++++++
 srcpkgs/xorg-server/template                  |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xorg-server/patches/disable-systemd-completely.patch

diff --git a/srcpkgs/xorg-server/patches/disable-systemd-completely.patch b/srcpkgs/xorg-server/patches/disable-systemd-completely.patch
new file mode 100644
index 00000000000..9ae6a7081a3
--- /dev/null
+++ b/srcpkgs/xorg-server/patches/disable-systemd-completely.patch
@@ -0,0 +1,27 @@
+linux: do not initialize dbus/systemd-logind if it's disabled.
+
+How to reproduce the issue:
+
+- system has booted with no systemd and dbus has been started.
+- system contains systemd installed (dbus services, libs, etc)
+- InitOutput() thinks that systemd is running and issues dbus requests
+for logind, resulting in an error like this:
+
+/dev/dri/card0: failed to set DRM interface version 1.4: Permission denied
+
+See https://github.com/voidlinux/void-packages/issues/532
+for more information.
+
+--- hw/xfree86/common/xf86Init.c.orig	2014-09-04 16:18:20.866121037 +0200
++++ hw/xfree86/common/xf86Init.c	2014-09-04 16:19:28.401962814 +0200
+@@ -463,8 +463,10 @@ InitOutput(ScreenInfo * pScreenInfo, int
+         if (xf86DoShowOptions)
+             DoShowOptions();
+ 
++#ifdef SYSTEMD_LOGIND
+         dbus_core_init();
+         systemd_logind_init();
++#endif
+ 
+         /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
+         xf86BusProbe();
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 77bac9f4f41..64c2ddcda22 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.16.0
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb