update fixes patch

3 files changed, 7 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5e285fb7ea7..83999cd1d766 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xorg-xdm-git
 	pkgdesc = X Display Manager
-	pkgver = 1.1.12.r0.ga03a628
-	pkgrel = 2
+	pkgver = 1.1.12.r6.gd0fa514
+	pkgrel = 1
 	url = http://xorg.freedesktop.org/
 	arch = i686
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = xorg-xdm-git
 	depends = xorg-sessreg
 	depends = libxft
 	depends = systemd
-	provides = xorg-xdm=1.1.12-2
+	provides = xorg-xdm=1.1.12-1
 	conflicts = xorg-xdm
 	options = !libtool
 	backup = etc/X11/xdm/Xaccess
@@ -32,8 +32,7 @@ pkgbase = xorg-xdm-git
 	source = fixes.patch
 	source = xdm.pam
 	sha512sums = SKIP
-	sha512sums = 9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83
+	sha512sums = 568d9b17caf410e4e5c3033ec4a751a75b6015bf9d20af29414aac14f0b8dffb90f2b20d83999026af5e024379c32508c2f0bdd7b685e536b8511444ab2a11cd
 	sha512sums = cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0
 
 pkgname = xorg-xdm-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5f135ad970ff..15303d8206cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm-git
 _pkgname=xorg-xdm
-pkgver=1.1.12.r0.ga03a628
-pkgrel=2
+pkgver=1.1.12.r6.gd0fa514
+pkgrel=1
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -17,7 +17,7 @@ source=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xdm"
 	fixes.patch
         xdm.pam)
 sha512sums=('SKIP'
-            '9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83'
+            '568d9b17caf410e4e5c3033ec4a751a75b6015bf9d20af29414aac14f0b8dffb90f2b20d83999026af5e024379c32508c2f0bdd7b685e536b8511444ab2a11cd'
             'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0')
 provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
 conflicts=("${_pkgname}")
diff --git a/fixes.patch b/fixes.patch
index b207e108c332..c5eff6c2da2d 100644
--- a/fixes.patch
+++ b/fixes.patch
@@ -7,22 +7,6 @@ diff -up src/xorg-xdm-git/config/GiveConsole.orig src/xorg-xdm-git/config/GiveCo
  chown $USER /dev/console
 +exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
 +	-x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
-diff -up src/xorg-xdm-git/configure.ac.orig src/xorg-xdm-git/configure.ac
---- src/xorg-xdm-git/configure.ac.orig	2019-08-13 00:10:29.000000000 -0600
-+++ src/xorg-xdm-git/configure.ac	2019-08-13 00:10:30.000000000 -0600
-@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_ST
- 	[Add support for systemd startup notification (default is autodetected)]),
- 	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
- 	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
- 	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
--	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
- 	)]
-     )
- ])
 diff -up src/xorg-xdm-git/config/Xservers.ws.in.orig src/xorg-xdm-git/config/Xservers.ws.in
 --- src/xorg-xdm-git/config/Xservers.ws.in.orig	2019-08-13 00:10:29.000000000 -0600
 +++ src/xorg-xdm-git/config/Xservers.ws.in	2019-08-13 00:10:31.000000000 -0600