commit d2a0fabf53d8029c426a163b746247320d73b538
author Brian P. Hinz <bphinz@users.sf.net> Sat May 07 15:33:01 2016 -0400
committer Brian P. Hinz <bphinz@users.sf.net> Sat May 07 15:33:01 2016 -0400
tree d134646f1b0737b04d9a5bb5461e00e3f3e344ad
parent 9927d25316f7e56e5ce5083d19e638214a57fdfd

Fix xserver118.patch so that it actually applies agsinst xorg 1.18

unix/xserver118.patch

diff --git a/unix/xserver118.patch b/unix/xserver118.patch
index 9119b47..286a37b 100644
--- a/unix/xserver118.patch
+++ b/unix/xserver118.patch
@@ -48,15 +48,14 @@
 diff -ur xorg-server.orig/hw/Makefile.am xorg-server/hw/Makefile.am
 --- xorg-server.orig/hw/Makefile.am	2016-04-09 21:28:27.059999965 +0200
 +++ xorg-server/hw/Makefile.am	2016-04-09 21:28:57.587999860 +0200
-@@ -43,7 +43,8 @@
+@@ -43,6 +43,7 @@
  	$(KDRIVE_SUBDIRS)	\
  	$(XQUARTZ_SUBDIRS)	\
- 	$(XWAYLAND_SUBDIRS) \
--	$(XMIR_SUBDIRS)
-+	$(XMIR_SUBDIRS)		\
+-	$(XWAYLAND_SUBDIRS)
++	$(XWAYLAND_SUBDIRS) \
 +	vnc
  
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland xmir
+ DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
  
 diff -ur xorg-server.orig/mi/miinitext.c xorg-server/mi/miinitext.c
 --- xorg-server.orig/mi/miinitext.c	2016-04-09 21:28:27.015999965 +0200