[packages/xorg-app-xinit] - rediff patches as consolekit-support.patch has been applied in wrong place with fuzz=2

[draenog]

commit 96549693a64048016005889abe695a4cf2eed985
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Fri Sep 12 18:14:11 2014 +0100

    - rediff patches as consolekit-support.patch has been applied in wrong
      place with fuzz=2

 xorg-app-xinit-consolekit-support.patch | 12 ++++++------
 xorg-app-xinit-xwrapper.patch           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/xorg-app-xinit-consolekit-support.patch b/xorg-app-xinit-consolekit-support.patch
index 170f225..e713105 100644
--- a/xorg-app-xinit-consolekit-support.patch
+++ b/xorg-app-xinit-consolekit-support.patch
@@ -10,9 +10,9 @@ index 1aee1d2..5775db3 100644
  # You always want to specify the full path to the X server
  DEFAULT_XSERVER=${bindir}/X
  DEFAULT_XAUTH=xauth
-@@ -104,6 +105,22 @@ esac
- AC_SUBST(XINIT_CFLAGS)
- AC_SUBST(XINIT_LIBS)
+@@ -151,6 +151,22 @@
+ esac
+ 
  
 +# Check for ConsoleKit
 +AC_ARG_WITH(consolekit,
@@ -32,14 +32,14 @@ index 1aee1d2..5775db3 100644
 +
  AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
- if test "x$MCOOKIE" != x ; then
+ 
 diff --git a/startx.cpp b/startx.cpp
 index 42421ef..998c7f8 100644
 --- a/startx.cpp
 +++ b/startx.cpp
 @@ -222,6 +222,12 @@ EOF
-     fi
- done
+     done
+ fi
  
 +if [ x"$display" != x ]; then
 +    export DISPLAY=$display
diff --git a/xorg-app-xinit-xwrapper.patch b/xorg-app-xinit-xwrapper.patch
index 1eb7ce1..779c0de 100644
--- a/xorg-app-xinit-xwrapper.patch
+++ b/xorg-app-xinit-xwrapper.patch
@@ -1,6 +1,6 @@
 --- xinit-1.0.8/Makefile.am.orig	2008-03-06 23:08:48.000000000 +0100
 +++ xinit-1.0.8/Makefile.am	2008-03-08 02:11:36.208958943 +0100
-@@ -57,7 +57,7 @@
+@@ -49,7 +49,7 @@
  	-DXINIT=@XINIT@
  
  CPP_FILES_FLAGS = \
@@ -8,10 +8,10 @@
 +	-DXINITDIR=$(XINITDIR) $(PROGCPPDEFS) -DBINDIR=$(bindir) -DLIBDIR=$(libdir) \
  	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
  	-D__libexecdir__="$(libexecdir)" \
- 	-D__bindir__="$(bindir)"
+ 	-D__bindir__="$(bindir)" \
 --- xinit-1.0.8/startx.cpp	2005-11-15 05:03:10.000000000 +0100
 +++ xinit-1.0.8/startx.cpp	2005-12-22 10:53:22.620963000 +0100
-@@ -65,7 +65,7 @@
+@@ -73,7 +73,7 @@
  userserverrc=$HOME/.xserverrc
  sysserverrc=XINITDIR/xserverrc
  defaultclient=XTERM
@@ -19,7 +19,7 @@
 +defaultserver=BINDIR/Xwrapper
  defaultclientargs=""
  defaultserverargs=""
- clientargs=""
+ defaultdisplay=":0"
 --- xinit-1.3.0/xinit.c.orig	2010-06-12 03:14:10.000000000 +0200
 +++ xinit-1.3.0/xinit.c	2010-10-31 10:38:50.551098261 +0100
 @@ -92,6 +92,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-xinit.git/commitdiff/188d0e2625bb6b49b2a1b510cf01109a553fb2a2