From: Brian P. Hinz <bphinz@users.sf.net>
Date: Fri, 19 Sep 2014 04:41:24 +0000 (-0400)
Subject: Applying xserver115.patch fails on Ubuntu xorg-server source at hunk 2.  Wayland... 
X-Git-Tag: v1.3.90~29^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F35%2Fhead;p=tigervnc.git

Applying xserver115.patch fails on Ubuntu xorg-server source at hunk 2.  Wayland was not merged into the Xorg tree until 1.16
---

diff --git a/unix/xserver115.patch b/unix/xserver115.patch
index 82b02c13..479039d7 100644
--- a/unix/xserver115.patch
+++ b/unix/xserver115.patch
@@ -9,14 +9,6 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  AC_PROG_LN_S
  AC_LIBTOOL_WIN32_DLL
  AC_DISABLE_STATIC
-@@ -1028,7 +1029,6 @@ fi
- if test "x$WAYLAND" = xyes; then
-         PKG_CHECK_MODULES(XWAYLAND, $WAYLAND_MODULES)
-       AC_DEFINE(XORG_WAYLAND, 1, [Support wayland mode])
--      WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xfree86/xwayland'])
- fi
- AM_CONDITIONAL(WAYLAND, [test "x$WAYLAND" = xyes])
- 
 @@ -1573,6 +1573,10 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi