diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-02-04 17:02:03 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-02-04 17:02:03 +0000 |
| commit | 84496811af21de34263d6f03261457e1425fb76b (patch) | |
| tree | f94f31921b30d18cc4a19337de084e9fa7fab4a2 | |
| parent | 3ae4500233583fe0be0d30236f979d90403ba2f0 (diff) | |
| download | tigervnc-84496811af21de34263d6f03261457e1425fb76b.tar.gz tigervnc-84496811af21de34263d6f03261457e1425fb76b.zip | |
[Bugfix] Updated xserver16.patch
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3586 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | unix/xserver16.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/unix/xserver16.patch b/unix/xserver16.patch index 3df84ccf..b3edaf62 100644 --- a/unix/xserver16.patch +++ b/unix/xserver16.patch @@ -1,15 +1,15 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac ---- xserver/configure.ac.vnc 2009-01-05 13:40:51.000000000 +0100 -+++ xserver/configure.ac 2009-01-05 13:48:18.000000000 +0100 +--- xserver/configure.ac.vnc 2009-02-04 17:59:08.000000000 +0100 ++++ xserver/configure.ac 2009-02-04 17:59:38.000000000 +0100 @@ -29,7 +29,6 @@ AC_PREREQ(2.57) - AC_INIT([xorg-server], 1.5.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) + AC_INIT([xorg-server], 1.5.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) -AM_MAINTAINER_MODE - dnl this gets generated by autoheader, and thus contains all the defines. we - dnl don't ever actually use it, internally. -@@ -50,6 +49,7 @@ dnl kdrive-config.h covers the kdrive DD + RELEASE_DATE="2009-1-30" + +@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD AC_CONFIG_HEADERS(include/kdrive-config.h) AC_PROG_CC @@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac AM_PROG_AS AC_PROG_INSTALL AC_PROG_LN_S -@@ -1208,6 +1208,9 @@ if test "x$XVFB" = xyes; then +@@ -1203,6 +1203,9 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -27,7 +27,7 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac dnl Xnest DDX -@@ -1884,6 +1887,7 @@ hw/dmx/input/Makefile +@@ -1879,6 +1882,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile @@ -36,8 +36,8 @@ diff -up xserver/configure.ac.vnc xserver/configure.ac hw/xwin/Makefile hw/xquartz/Makefile diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am ---- xserver/hw/Makefile.am.vnc 2009-01-05 13:48:29.000000000 +0100 -+++ xserver/hw/Makefile.am 2009-01-05 13:48:42.000000000 +0100 +--- xserver/hw/Makefile.am.vnc 2009-02-04 17:59:08.000000000 +0100 ++++ xserver/hw/Makefile.am 2009-02-04 17:59:27.000000000 +0100 @@ -33,7 +33,8 @@ SUBDIRS = \ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) \ @@ -49,8 +49,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 2009-01-05 13:48:52.000000000 +0100 -+++ xserver/mi/miinitext.c 2009-01-05 13:51:24.000000000 +0100 +--- xserver/mi/miinitext.c.vnc 2009-02-04 17:59:08.000000000 +0100 ++++ xserver/mi/miinitext.c 2009-02-04 17:59:27.000000000 +0100 @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS extern void CompositeExtensionInit(INITARGS); #endif |