diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2016-05-07 15:33:01 -0400 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2016-05-07 15:33:01 -0400 |
| commit | d2a0fabf53d8029c426a163b746247320d73b538 (patch) | |
| tree | d134646f1b0737b04d9a5bb5461e00e3f3e344ad | |
| parent | 9927d25316f7e56e5ce5083d19e638214a57fdfd (diff) | |
| download | tigervnc-d2a0fabf53d8029c426a163b746247320d73b538.tar.gz tigervnc-d2a0fabf53d8029c426a163b746247320d73b538.zip | |
Fix xserver118.patch so that it actually applies agsinst xorg 1.18
| -rw-r--r-- | unix/xserver118.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unix/xserver118.patch b/unix/xserver118.patch index 9119b477..286a37bc 100644 --- a/unix/xserver118.patch +++ b/unix/xserver118.patch @@ -48,15 +48,14 @@ diff -ur xorg-server.orig/configure.ac xorg-server/configure.ac 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 |