- renamed to xserver.patch (dunno why git mv hasn't deleted it during push)

diff --git a/xserver113.patch b/xserver113.patch
deleted file mode 100644 (file)
index bc0d17e..0000000
--- a/xserver113.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc   2012-08-28 15:35:23.778810954 +0200
-+++ xserver/configure.ac       2012-08-28 15:54:46.396743431 +0200
-@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- AC_LIBTOOL_WIN32_DLL
- AC_DISABLE_STATIC
-@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then
-       AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- 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'
-@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then
-       AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
-       AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
-       AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--      AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-       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])
-@@ -2280,6 +2285,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
-diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200
-+++ xserver/hw/Makefile.am     2012-08-28 15:35:42.272795917 +0200
-@@ -33,7 +33,8 @@ SUBDIRS =                    \
-       $(XNEST_SUBDIRS)        \
-       $(DMX_SUBDIRS)          \
-       $(KDRIVE_SUBDIRS)       \
--      $(XQUARTZ_SUBDIRS)
-+      $(XQUARTZ_SUBDIRS)      \
-+      vnc
- 
- 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 2012-08-28 15:35:23.000000000 +0200
-+++ xserver/mi/miinitext.c     2012-09-05 15:07:40.714953972 +0200
-@@ -112,6 +112,10 @@ SOFTWARE.
- #include "micmap.h"
- #include "globals.h"
- 
-+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
-+#endif
-+
- /* The following is only a small first step towards run-time
-  * configurable extensions.
-  */
-@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[
- #ifdef XSELINUX
-     {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
- #endif
-+#ifdef TIGERVNC
-+    {vncExtensionInit, "VNC-EXTENSION", NULL},
-+#endif
- };
- 
- static ExtensionModule *ExtensionModuleList = NULL;