From: Adam Tkac <atkac@redhat.com>
Date: Mon, 14 Mar 2011 13:00:43 +0000 (+0000)
Subject: [Bugfix] Update unix/xserver110.patch patch.
X-Git-Tag: v1.0.90~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b44e6b8f7fd7cd7ae4edd270dd6b1776fb5586db;p=tigervnc.git

[Bugfix] Update unix/xserver110.patch patch.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_1@4360 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/unix/xserver110.patch b/unix/xserver110.patch
index 14901ca3..ccdf433b 100644
--- a/unix/xserver110.patch
+++ b/unix/xserver110.patch
@@ -1,8 +1,8 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2010-12-08 17:09:34.459198307 +0100
-+++ xserver/configure.ac	2010-12-08 17:09:46.789193164 +0100
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.9.99.1, [https:
- RELEASE_DATE="2010-10-01"
+--- xserver/configure.ac.vnc	2011-03-14 13:57:11.716142896 +0100
++++ xserver/configure.ac	2011-03-14 13:58:14.816003575 +0100
+@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.10.0, [https://
+ RELEASE_DATE="2011-2-25"
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
 -AM_MAINTAINER_MODE
@@ -12,12 +12,12 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
 @@ -65,6 +64,7 @@ dnl forcing an entire recompile.x
  AC_CONFIG_HEADERS(include/version-config.h)
  
- AC_PROG_CC
-+AC_PROG_CXX
  AM_PROG_AS
- AC_PROG_INSTALL
++AC_PROG_CXX
  AC_PROG_LN_S
-@@ -1511,6 +1511,13 @@ if test "x$XVFB" = xyes; then
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+@@ -1510,6 +1510,13 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -31,7 +31,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  
  dnl Xnest DDX
  
-@@ -1549,6 +1556,8 @@ xorg_bus_linuxpci=no
+@@ -1548,6 +1555,8 @@ xorg_bus_linuxpci=no
  xorg_bus_bsdpci=no
  xorg_bus_sparc=no
  
@@ -40,7 +40,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  if test "x$XORG" = xyes; then
  	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
  	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1793,7 +1802,6 @@ if test "x$XORG" = xyes; then
+@@ -1792,7 +1801,6 @@ if test "x$XORG" = xyes; then
  	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
  	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
  	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
@@ -48,17 +48,17 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac
  	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2245,6 +2253,7 @@ hw/dmx/input/Makefile
- hw/dmx/glxProxy/Makefile
- hw/dmx/Makefile
+@@ -2254,6 +2262,7 @@ hw/dmx/Makefile
+ hw/dmx/man/Makefile
  hw/vfb/Makefile
+ hw/vfb/man/Makefile
 +hw/vnc/Makefile
  hw/xnest/Makefile
+ hw/xnest/man/Makefile
  hw/xwin/Makefile
- hw/xwin/glx/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2010-12-08 17:09:34.469198303 +0100
-+++ xserver/hw/Makefile.am	2010-12-08 17:09:46.789193164 +0100
+--- xserver/hw/Makefile.am.vnc	2011-03-14 13:57:12.286141640 +0100
++++ xserver/hw/Makefile.am	2011-03-14 13:57:14.116137603 +0100
 @@ -33,7 +33,8 @@ SUBDIRS =			\
  	$(XNEST_SUBDIRS)	\
  	$(DMX_SUBDIRS)		\
@@ -70,8 +70,8 @@ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2010-12-08 17:09:34.509198285 +0100
-+++ xserver/mi/miinitext.c	2010-12-08 17:09:46.789193164 +0100
+--- xserver/mi/miinitext.c.vnc	2011-03-14 13:57:13.756138397 +0100
++++ xserver/mi/miinitext.c	2011-03-14 13:57:14.116137603 +0100
 @@ -263,6 +263,7 @@ extern void DamageExtensionInit(INITARGS
  extern void CompositeExtensionInit(INITARGS);
  #endif
@@ -80,7 +80,7 @@ diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
  
  /* The following is only a small first step towards run-time
   * configurable extensions.
-@@ -435,6 +436,7 @@ InitExtensions(int argc, char *argv[])
+@@ -433,6 +434,7 @@ InitExtensions(int argc, char *argv[])
  #ifdef XF86BIGFONT
      if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
  #endif