diff --git a/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch b/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
index f6ffc1d..e594792 100644
--- a/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
+++ b/0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
@@ -5,22 +5,14 @@ Subject: [PATCH] Fix segfault when killing X with ctrl-alt-backspace.
 
 The damage structure for the cursor is not deregistered before deallocation,
 causing a subsequent DamageUnregister () to segfault.
----
- mi/misprite.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/mi/misprite.c b/mi/misprite.c
-index 692e6c9..c368928 100644
---- a/mi/misprite.c
-+++ b/mi/misprite.c
-@@ -313,6 +313,7 @@ miSpriteCloseScreen (int i, ScreenPtr pScreen)
+================================================================================
+--- xorg-server-1.7.4/mi/misprite.c
++++ xorg-server-1.7.4/mi/misprite.c
+@@ -384,6 +384,7 @@
      pScreen->InstallColormap = pScreenPriv->InstallColormap;
      pScreen->StoreColors = pScreenPriv->StoreColors;
  
 +    miSpriteDisableDamage(pScreen, pScreenPriv);
      DamageDestroy (pScreenPriv->pDamage);
  
-     xfree ((pointer) pScreenPriv);
--- 
-1.6.4.2
-
+     xfree (pScreenPriv);
diff --git a/0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch b/0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
deleted file mode 100644
index 4f011f0..0000000
--- a/0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
-index fc4df84..385848b 100644
---- a/hw/xfree86/modes/xf86Cursors.c
-+++ b/hw/xfree86/modes/xf86Cursors.c
-@@ -480,10 +480,10 @@ xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-     xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
-     
-+    ++cursor->refcnt;
-     if (xf86_config->cursor)
- 	FreeCursor (xf86_config->cursor, None);
-     xf86_config->cursor = cursor;
--    ++cursor->refcnt;
-     
-     /* Make sure ARGB support is available */
-     if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
diff --git a/0001-Unclaim-PCI-slot-if-driver-probing-fails.patch b/0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
deleted file mode 100644
index 16e6cb1..0000000
--- a/0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 593348b46a21c6f291194fa9ff61bd5bc7c5cb9f Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf@suse.de>
-Date: Wed, 24 Jun 2009 18:26:23 +0200
-Subject: [PATCH] Unclaim PCI slot if driver probing fails.
-
-Otherwise no subsequent driver will be able to claim this pci slot.
-Example for this: fbdev tries to claim, but framebuffer device is not
-available. Later on VESA cannot claim the device.
----
- hw/xfree86/common/xf86.h       |    1 +
- hw/xfree86/common/xf86Init.c   |    3 ++-
- hw/xfree86/common/xf86pciBus.c |   19 +++++++++++++++++++
- 3 files changed, 22 insertions(+), 1 deletions(-)
-
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86.h
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86.h
-@@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void);
- Bool xf86CheckPciSlot( const struct pci_device * );
- int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,
- 		     int chipset, GDevPtr dev, Bool active);
-+void xf86UnclaimPciSlot(struct pci_device *);
- Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
- 			   int *func);
- Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Init.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Init.c
-@@ -514,7 +514,8 @@ probe_devices_from_device_sections(Drive
- 		    if ((*drvp->PciProbe)(drvp, entry, pPci,
- 					  devices[j].match_data)) {
- 			foundScreen = TRUE;
--		    }
-+		    } else
-+			xf86UnclaimPciSlot(pPci);
- 		}
- 
- 		break;
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86pciBus.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86pciBus.c
-@@ -753,6 +753,25 @@ xf86ClaimPciSlot(struct pci_device * d,
- }
- 
- /*
-+ * Unclaim PCI slot, e.g. if probing failed, so that a different driver can claim.
-+ */
-+void
-+xf86UnclaimPciSlot(struct pci_device *d)
-+{
-+    int i;
-+
-+    for (i = 0; i < xf86NumEntities; i++) {
-+	const EntityPtr p = xf86Entities[i];
-+
-+	if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) {
-+	    /* Probably the slot should be deallocated? */
-+	    p->bus.type = BUS_NONE;
-+	    return;
-+	}
-+    }
-+}
-+
-+/*
-  * Parse a BUS ID string, and return the PCI bus parameters if it was
-  * in the correct format for a PCI bus id.
-  */
diff --git a/acpi-warning.diff b/acpi-warning.diff
deleted file mode 100644
index e0aafd6..0000000
--- a/acpi-warning.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hw/xfree86/os-support/linux/lnx_acpi.c
-===================================================================
---- hw/xfree86/os-support/linux/lnx_acpi.c.orig
-+++ hw/xfree86/os-support/linux/lnx_acpi.c
-@@ -163,8 +163,6 @@ doLnxACPIOpen(void)
- 	addr.sun_family = AF_UNIX;
- 	strcpy(addr.sun_path, ACPI_SOCKET);
- 	if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
--	    xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
--	    	strerror(errno));
- 	    shutdown(fd, 2);
- 	    close(fd);
- 	    return NULL;
diff --git a/acpi_events.diff b/acpi_events.diff
deleted file mode 100644
index b010520..0000000
--- a/acpi_events.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/os-support/linux/lnx_apm.c
-+++ xorg-server-1.6.3.901/hw/xfree86/os-support/linux/lnx_apm.c
-@@ -189,7 +189,7 @@ lnxAPMOpen(void)
- 	    close(pfd);
- 	xf86PMGetEventFromOs = lnxPMGetEventFromOs;
- 	xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
--	APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
-+	APMihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL);
- 	xf86MsgVerb(X_INFO,3,"Open APM successful\n");
- 	return lnxCloseAPM;
-     }
diff --git a/bitmap_always_unscaled.diff b/bitmap_always_unscaled.diff
index 16be4d2..481861c 100644
--- a/bitmap_always_unscaled.diff
+++ b/bitmap_always_unscaled.diff
@@ -36,22 +36,3 @@ Index: xorg-server-1.6.3.901/configure.ac
  case $host_os in
  	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
  esac
-Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
-+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
-@@ -100,11 +100,11 @@ dist_options_DATA = Options
- 
- CPP_FILES_FLAGS = \
- 	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
--	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
-+	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
- 	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
- 	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
--	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
--	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
-+	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
-+	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
- 	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
- 
- relink:
diff --git a/bug-197858_dpms.diff b/bug-197858_dpms.diff
index 0af19db..8449446 100644
--- a/bug-197858_dpms.diff
+++ b/bug-197858_dpms.diff
@@ -1,8 +1,8 @@
 Index: hw/xfree86/common/xf86Events.c
-===================================================================
---- hw/xfree86/common/xf86Events.c.orig
+================================================================================
+--- hw/xfree86/common/xf86Events.c
 +++ hw/xfree86/common/xf86Events.c
-@@ -124,6 +124,7 @@ typedef struct x_IHRec {
+@@ -115,6 +115,7 @@
      InputHandlerProc	ihproc;
      pointer		data;
      Bool		enabled;
@@ -10,40 +10,39 @@ Index: hw/xfree86/common/xf86Events.c
      struct x_IHRec *	next;
  } IHRec, *IHPtr;
  
-@@ -513,8 +514,12 @@ xf86VTSwitch()
-     for (i = 0; i < xf86NumScreens; i++)
- 	xf86Screens[i]->LeaveVT(i, 0);
- 
+@@ -456,8 +457,12 @@
+      * Keep the order: Disable Device > LeaveVT
+      *                        EnterVT > EnableDevice
+      */
 -    for (ih = InputHandlers; ih; ih = ih->next)
 -      xf86DisableInputHandler(ih);
 +    for (ih = InputHandlers; ih; ih = ih->next) {
-+	if (ih->is_input)
-+	    xf86DisableInputHandler(ih);
-+	else
-+	    xf86DisableGeneralHandler(ih);
++      if (ih->is_input)
++          xf86DisableInputHandler(ih);
++      else
++          xf86DisableGeneralHandler(ih);
 +    }
-     xf86AccessLeave();      /* We need this here, otherwise */
-     xf86AccessLeaveState(); /* console won't be restored    */
- 
-@@ -552,9 +557,12 @@ xf86VTSwitch()
+     for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
+       if (pInfo->dev) {
+           xf86ReleaseKeys(pInfo->dev);
+@@ -499,8 +504,12 @@
+             EnableDevice(pInfo->dev, TRUE);
+ 	pInfo = pInfo->next;
        }
-       /* XXX HACK */
-       xf86ReleaseKeys(inputInfo.keyboard);
 -      for (ih = InputHandlers; ih; ih = ih->next)
 -        xf86EnableInputHandler(ih);
--
 +      for (ih = InputHandlers; ih; ih = ih->next) {
 +        if (ih->is_input)
 +            xf86EnableInputHandler(ih);
 +        else
 +            xf86EnableGeneralHandler(ih);
 +      }
+ 
        xf86UnblockSIGIO(prevSIGIO);
  
-     } else {
-@@ -617,8 +625,12 @@ xf86VTSwitch()
-     /* XXX HACK */
-     xf86ReleaseKeys(inputInfo.keyboard);
+@@ -556,8 +565,12 @@
+       pInfo = pInfo->next;
+     }
  
 -    for (ih = InputHandlers; ih; ih = ih->next)
 -      xf86EnableInputHandler(ih);
@@ -56,7 +55,7 @@ Index: hw/xfree86/common/xf86Events.c
  
      xf86UnblockSIGIO(prevSIGIO);
    }
-@@ -655,8 +667,10 @@ xf86AddInputHandler(int fd, InputHandler
+@@ -594,8 +607,10 @@
  {
      IHPtr ih = addInputHandler(fd, proc, data);
  
@@ -68,11 +67,9 @@ Index: hw/xfree86/common/xf86Events.c
      return ih;
  }
  
-Index: os/WaitFor.c
-===================================================================
---- os/WaitFor.c.orig
+--- os/WaitFor.c
 +++ os/WaitFor.c
-@@ -141,6 +141,7 @@ static OsTimerPtr timers = NULL;
+@@ -142,6 +142,7 @@
   *     For more info on ClientsWithInput, see ReadRequestFromClient().
   *     pClientsReady is an array to store ready client->index values into.
   *****************/
@@ -80,7 +77,7 @@ Index: os/WaitFor.c
  
  int
  WaitForSomething(int *pClientsReady)
-@@ -278,10 +279,9 @@ WaitForSomething(int *pClientsReady)
+@@ -279,10 +280,9 @@
                  if (expired)
                      return 0;
  	    }
@@ -93,7 +90,7 @@ Index: os/WaitFor.c
  
  	    if (*checkForInput[0] == *checkForInput[1]) {
  	        if (timers)
-@@ -316,6 +316,12 @@ WaitForSomething(int *pClientsReady)
+@@ -317,6 +317,12 @@
  		QueueWorkProc(EstablishNewConnections, NULL,
  			      (pointer)&LastSelectMask);
  
diff --git a/bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff b/bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
deleted file mode 100644
index f7fbd33..0000000
--- a/bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c
-@@ -55,6 +55,13 @@ typedef struct _xf86RandR12Info {
-     int				    pointerY;
-     Rotation			    rotation; /* current mode */
-     Rotation                        supported_rotations; /* driver supported */
-+
-+    /* Used to wrap EnterVT so we can re-probe the outputs when a laptop unsuspends
-+     * (actually, any time that we switch back into our VT).
-+     *
-+     * See https://bugs.freedesktop.org/show_bug.cgi?id=21554
-+     */
-+    xf86EnterVTProc *orig_EnterVT;
- } XF86RandRInfoRec, *XF86RandRInfoPtr;
- 
- #ifdef RANDR_12_INTERFACE
-@@ -1648,10 +1655,25 @@ xf86RandR13SetPanning (ScreenPtr
- }
- 
- static Bool
-+xf86RandR12EnterVT (int screen_index, int flags)
-+{
-+    ScreenPtr        pScreen = screenInfo.screens[screen_index];
-+    XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
-+
-+    if (randrp->orig_EnterVT) {
-+	if (!randrp->orig_EnterVT (screen_index, flags))
-+	    return FALSE;
-+    }
-+
-+    return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
-+}
-+
-+static Bool
- xf86RandR12Init12 (ScreenPtr pScreen)
- {
-     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
-     rrScrPrivPtr	rp = rrGetScrPriv(pScreen);
-+    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
- 
-     rp->rrGetInfo = xf86RandR12GetInfo12;
-     rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
-@@ -1667,6 +1689,10 @@ xf86RandR12Init12 (ScreenPtr pScreen)
-     rp->rrModeDestroy = xf86RandR12ModeDestroy;
-     rp->rrSetConfig = NULL;
-     pScrn->PointerMoved = xf86RandR12PointerMoved;
-+
-+    randrp->orig_EnterVT = pScrn->EnterVT;
-+    pScrn->EnterVT = xf86RandR12EnterVT;
-+
-     if (!xf86RandR12CreateObjects12 (pScreen))
- 	return FALSE;
- 
diff --git a/bug532341.diff b/bug532341.diff
deleted file mode 100644
index 7b5884a..0000000
--- a/bug532341.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Xext/shm.c b/Xext/shm.c
-index dd097e6..99bbd37 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -496,15 +496,40 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
- 	      char *data)
- {
-     PixmapPtr pPixmap;
--  
--    pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
--				     BitsPerPixel(depth),
--				     PixmapBytePad(w, depth),
--				     data);
--    if (!pPixmap)
--	return;
--    pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
--    FreeScratchPixmapHeader(pPixmap);
-+
-+    if (format == ZPixmap || depth == 1) {
-+	pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
-+					 BitsPerPixel(depth),
-+					 PixmapBytePad(w, depth),
-+					 data);
-+	if (!pPixmap)
-+	    return;
-+	pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
-+	FreeScratchPixmapHeader(pPixmap);
-+    } else {
-+	GCPtr putGC = GetScratchGC(depth, dst->pScreen);
-+
-+	if (!putGC)
-+	    return;
-+
-+	pPixmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth,
-+						CREATE_PIXMAP_USAGE_SCRATCH);
-+	if (!pPixmap) {
-+	    FreeScratchGC(putGC);
-+	    return;
-+	}
-+	ValidateGC(&pPixmap->drawable, putGC);
-+	(*putGC->ops->PutImage)(&pPixmap->drawable, putGC, depth, -sx, -sy, w, h, 0,
-+				(format == XYPixmap) ? XYPixmap : ZPixmap, data);
-+	FreeScratchGC(putGC);
-+	if (format == XYBitmap)
-+	    (void)(*pGC->ops->CopyPlane)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
-+					 dx, dy, 1L);
-+	else
-+	    (void)(*pGC->ops->CopyArea)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
-+					dx, dy);
-+	(*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
-+    }
- }
- 
- #ifdef PANORAMIX
diff --git a/cache-xkbcomp-output-for-fast-start-up.patch b/cache-xkbcomp-output-for-fast-start-up.patch
index 4b2c766..bc0fa42 100644
--- a/cache-xkbcomp-output-for-fast-start-up.patch
+++ b/cache-xkbcomp-output-for-fast-start-up.patch
@@ -8,17 +8,10 @@ xkbcomp outputs will be cached in files with hashed keymap as
 names. This saves boot time for around 1s on commodity netbooks.
 
 Signed-off-by: Yan Li <yan.i.li@intel.com>
----
- configure.ac        |    6 +-
- xkb/README.compiled |    8 +-
- xkb/ddxLoad.c       |  192 +++++++++++++++++++++++++++++++++++++++++---------
- 3 files changed, 164 insertions(+), 42 deletions(-)
-
-Index: xorg-server-1.6.3.901/configure.ac
-===================================================================
---- xorg-server-1.6.3.901.orig/configure.ac
-+++ xorg-server-1.6.3.901/configure.ac
-@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_S
+================================================================================
+--- xorg-server-1.7.4/configure.ac
++++ xorg-server-1.7.4/configure.ac
+@@ -502,9 +502,9 @@
  AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
  				[ XKBPATH="$withval" ],
  				[ XKBPATH="${datadir}/X11/xkb" ])
@@ -27,23 +20,21 @@ Index: xorg-server-1.6.3.901/configure.ac
  				[ XKBOUTPUT="$withval" ],
 -				[ XKBOUTPUT="compiled" ])
 +				[ XKBOUTPUT="${localstatedir}/cache/xkb" ])
- AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
- 				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
- 				[ SERVERCONFIG="$withval" ],
-@@ -1807,7 +1807,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir,
+ AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
+                                    [Keyboard ruleset (default: base/evdev)]),
+                                 [ XKB_DFLT_RULES="$withval" ],
+@@ -1120,7 +1120,7 @@
+ dnl Make sure XKM_OUTPUT_DIR is an absolute path
  XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
- 
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
+ if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
 -   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
 +   AC_MSG_ERROR([xkb-output must be an absolute path.])
  fi
  
- # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-Index: xorg-server-1.6.3.901/xkb/README.compiled
-===================================================================
---- xorg-server-1.6.3.901.orig/xkb/README.compiled
-+++ xorg-server-1.6.3.901/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymap
+ dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
+--- xorg-server-1.7.4/xkb/README.compiled
++++ xorg-server-1.7.4/xkb/README.compiled
+@@ -4,10 +4,10 @@
  or some other tool might destroy or replace the files in this directory,
  so it is not a safe place to store compiled keymaps for long periods of
  time.  The default keymap for any server is usually stored in:
@@ -58,11 +49,9 @@ Index: xorg-server-1.6.3.901/xkb/README.compiled
  
  Unless the X server is modified, sharing this directory between servers on
  different hosts could cause problems.
-Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
-===================================================================
---- xorg-server-1.6.3.901.orig/xkb/ddxLoad.c
-+++ xorg-server-1.6.3.901/xkb/ddxLoad.c
-@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--- xorg-server-1.7.4/xkb/ddxLoad.c
++++ xorg-server-1.7.4/xkb/ddxLoad.c
+@@ -32,6 +32,12 @@
  #include <xkb-config.h>
  #endif
  
@@ -74,8 +63,8 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
 +#endif
  #include <stdio.h>
  #include <ctype.h>
- #define	NEED_EVENTS 1
-@@ -46,24 +52,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #include <X11/X.h>
+@@ -45,24 +51,13 @@
  #define	XKBSRV_NEED_FILE_FUNCS
  #include <xkbsrv.h>
  #include <X11/extensions/XI.h>
@@ -101,10 +90,10 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  #define	PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
  #define	ERROR_PREFIX	"\"> \""
  #define	POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -179,6 +174,45 @@ OutputDirectory(
+@@ -177,6 +172,45 @@
  }
  
- static Bool    	
+ static Bool
 +Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
 +{
 +    int i;
@@ -122,15 +111,15 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
 +
 +    success = SHA1_Init (&ctx);
 +    if (! success)
-+	return BadAlloc;
++      return BadAlloc;
 +
 +    success = SHA1_Update (&ctx, input, strlen(input));
 +    if (! success)
-+	return BadAlloc;
++      return BadAlloc;
 +
 +    success = SHA1_Final (sha1, &ctx);
 +    if (! success)
-+	return BadAlloc;
++      return BadAlloc;
 +#endif
 +
 +    /* convert sha1 to sha1_asc */
@@ -147,7 +136,7 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
  				XkbComponentNamesPtr	names,
  				unsigned		want,
-@@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr
+@@ -185,7 +219,11 @@
  				int			nameRtrnLen)
  {
      FILE *	out;
@@ -160,7 +149,7 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  
      const char	*emptystring = "";
      const char	*xkbbasedirflag = emptystring;
-@@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr
+@@ -196,15 +234,70 @@
      /* WIN32 has no popen. The input must be stored in a file which is
         used as input for xkbcomp. xkbcomp does not read from stdin. */
      char tmpname[PATH_MAX];
@@ -207,8 +196,6 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
 +        snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
 +    }
  
--    XkbEnsureSafeMapName(keymap);
-+    XkbEnsureSafeMapName(xkmfile);
      OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
  
 +    /* set nameRtrn, fail if it's too small */
@@ -231,11 +218,12 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
 +    /* continue to call xkbcomp to compile the keymap. to avoid race
 +       condition, we compile it to a tmpfile then rename it to
 +       xkmfile */
++
 +
  #ifdef WIN32
      strcpy(tmpname, Win32TempDir());
      strcat(tmpname, "\\xkb_XXXXXX");
-@@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr
+@@ -227,19 +320,30 @@
  	}
      }
  
@@ -269,7 +257,7 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  #ifndef WIN32
      out= Popen(buf,"w");
  #else
-@@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr
+@@ -247,31 +351,43 @@
  #endif
      
      if (out!=NULL) {
@@ -326,7 +314,7 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  #ifdef WIN32
          /* remove the temporary file */
          unlink(tmpname);
-@@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames(	XkbDescPtr
+@@ -286,9 +402,17 @@
      }
      if (nameRtrn)
  	nameRtrn[0]= '\0';
@@ -345,7 +333,7 @@ Index: xorg-server-1.6.3.901/xkb/ddxLoad.c
  }
  
  static FILE *
-@@ -375,7 +498,6 @@ unsigned	missing;
+@@ -372,7 +496,6 @@
  	DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
      }
      fclose(file);
diff --git a/driver-autoconfig.diff b/driver-autoconfig.diff
index f6c2f7d..5a14e93 100644
--- a/driver-autoconfig.diff
+++ b/driver-autoconfig.diff
@@ -1,6 +1,6 @@
---- hw/xfree86/common/xf86AutoConfig.c.orig	2009-10-07 04:54:44.000000000 +0200
-+++ hw/xfree86/common/xf86AutoConfig.c	2009-10-07 04:56:23.000000000 +0200
-@@ -165,7 +165,11 @@ videoPtrToDriverList(struct pci_device *
+--- hw/xfree86/common/xf86AutoConfig.c
++++ hw/xfree86/common/xf86AutoConfig.c
+@@ -176,7 +176,11 @@
  	case 0x1142:		    driverList[0] = "apm"; break;
  	case 0xedd8:		    driverList[0] = "ark"; break;
  	case 0x1a03:		    driverList[0] = "ast"; break;
@@ -12,12 +12,13 @@
 +		break;
  	case 0x102c:		    driverList[0] = "chips"; break;
  	case 0x1013:		    driverList[0] = "cirrus"; break;
- 	case 0x8086:
-@@ -179,7 +183,15 @@ videoPtrToDriverList(struct pci_device *
+ 	case 0x3d3d:		    driverList[0] = "glint"; break;
+@@ -192,8 +196,20 @@
+ 	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
- 	case 0x105d:		    driverList[0] = "i128";	break;
 -	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
+-	case 0x1106:		    driverList[0] = "openchrome"; break;
 +	case 0x12d2:                driverList[0] = "nv";       break;
 +	case 0x10de:
 +		driverList[0] = "nvidia";
@@ -27,31 +28,11 @@
 +			driverList[2] = "nv";
 +		}
 +		break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
- 	case 0x5333:
- 	    switch (dev->device_id)
-@@ -205,7 +217,11 @@ videoPtrToDriverList(struct pci_device *
- 	case 0x3d3d:		    driverList[0] = "glint";	break;
- 	case 0x1023:		    driverList[0] = "trident"; break;
- 	case 0x100c:		    driverList[0] = "tseng";	break;
--	case 0x1106:		    driverList[0] = "openchrome"; break;
-+	case 0x1106:		    
++	case 0x1106:
 +		driverList[0] = "via";
 +		driverList[1] = "openchrome";
 +		driverList[2] = "unichrome";
 +		break;
- 	case 0x15ad:		    driverList[0] = "vmware";	break;
- 	case 0x18ca:
- 	    if (dev->device_id == 0x47)
-@@ -213,6 +229,11 @@ videoPtrToDriverList(struct pci_device *
- 	    else
- 		driverList[0] = "xgi";
- 	    break;
-+	case 0x80ee:
-+		if (dev->device_id == 0xbeef) {
-+		    driverList[0] = "vboxvideo";
-+		}
-+		break;
- 	default: break;
-     }
-     for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
+ 	case 0x5333:
+ 	    switch (dev->device_id)
diff --git a/events.diff b/events.diff
deleted file mode 100644
index daaf7be..0000000
--- a/events.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
-@@ -518,22 +518,26 @@ xf86VTSwitch()
-      * Keep the order: Disable Device > LeaveVT
-      *                        EnterVT > EnableDevice
-      */
-+
-+    for (i = 0; i < xf86NumScreens; i++)
-+      xf86Screens[i]->LeaveVT(i, 0);
-+
-+    for (ih = InputHandlers; ih; ih = ih->next) {
-+        if (ih->is_input)
-+            xf86DisableInputHandler(ih);
-+        else
-+            xf86DisableGeneralHandler(ih);
-+    }
-+
-     pInfo = xf86InputDevs;
-     while (pInfo) {
-       if (pInfo->dev)
-           DisableDevice(pInfo->dev);
-       pInfo = pInfo->next;
-     }
-+    /* XXX HACK */
-     xf86EnterServerState(SETUP);
--    for (i = 0; i < xf86NumScreens; i++)
--	xf86Screens[i]->LeaveVT(i, 0);
- 
--    for (ih = InputHandlers; ih; ih = ih->next) {
--	if (ih->is_input)
--	    xf86DisableInputHandler(ih);
--	else
--	    xf86DisableGeneralHandler(ih);
--    }
-     xf86AccessLeave();      /* We need this here, otherwise */
-     xf86AccessLeaveState(); /* console won't be restored    */
- 
-@@ -563,14 +567,10 @@ xf86VTSwitch()
- 
-       pInfo = xf86InputDevs;
-       while (pInfo) {
--        if (pInfo->dev) {
--            xf86ReleaseKeys(pInfo->dev);
-+        if (pInfo->dev)
-             EnableDevice(pInfo->dev);
--        }
- 	pInfo = pInfo->next;
-       }
--      /* XXX HACK */
--      xf86ReleaseKeys(inputInfo.keyboard);
-       for (ih = InputHandlers; ih; ih = ih->next) {
-         if (ih->is_input)
-             xf86EnableInputHandler(ih);
-@@ -580,6 +580,17 @@ xf86VTSwitch()
-       xf86UnblockSIGIO(prevSIGIO);
- 
-     } else {
-+
-+       pInfo = xf86InputDevs;
-+       while (pInfo) {
-+           if (pInfo->dev) {
-+               xf86ReleaseKeys(pInfo->dev);
-+           }
-+           pInfo = pInfo->next;
-+       }
-+       /* XXX HACK */
-+       xf86ReleaseKeys(inputInfo.keyboard);
-+
- #ifdef XF86PM
- 	  if (xf86OSPMClose)
- 	      xf86OSPMClose();
-@@ -630,14 +641,10 @@ xf86VTSwitch()
- 
-     pInfo = xf86InputDevs;
-     while (pInfo) {
--      if (pInfo->dev) {
--          xf86ReleaseKeys(pInfo->dev);
-+      if (pInfo->dev)
-           EnableDevice(pInfo->dev);
--      }
-       pInfo = pInfo->next;
-     }
--    /* XXX HACK */
--    xf86ReleaseKeys(inputInfo.keyboard);
- 
-     for (ih = InputHandlers; ih; ih = ih->next) {
-       if (ih->is_input)
diff --git a/fbdev_fallback_fail_fix.diff b/fbdev_fallback_fail_fix.diff
deleted file mode 100644
index 8f2b318..0000000
--- a/fbdev_fallback_fail_fix.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Bus.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Bus.c
-@@ -429,7 +429,7 @@ xf86GetEntityInfo(int entityIndex)
-     EntityInfoPtr pEnt;
-     int i;
-     
--    if (entityIndex >= xf86NumEntities)
-+    if (entityIndex < 0 || entityIndex >= xf86NumEntities)
- 	return NULL;
-     
-     pEnt = xnfcalloc(1,sizeof(EntityInfoRec));
-@@ -1816,6 +1816,20 @@ checkRoutingForScreens(xf86State state)
-     xf86FreeResList(pResVGA);
- }
- 
-+CARD16
-+xf86BusesClaimed(void)
-+{
-+    CARD16 ret = 0;
-+
-+    if (pciSlotClaimed) ret |= 1 << BUS_PCI;
-+    if (fbSlotClaimed) ret |= 1 << BUS_NONE;
-+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
-+    if (sbusSlotClaimed) ret |= 1 << BUS_SBUS;
-+#endif
-+
-+    return ret;
-+}
-+
- /*
-  * xf86PostProbe() -- Allocate all non conflicting resources
-  * This function gets called by xf86Init().
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Priv.h
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Priv.h
-@@ -123,6 +123,7 @@ extern RootWinPropPtr *xf86RegisteredPro
- 
- /* xf86Bus.c */
- 
-+CARD16 xf86BusesClaimed(void);
- void xf86BusProbe(void);
- void xf86ChangeBusIndex(int oldIndex, int newIndex);
- void xf86AccessInit(void);
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86fbBus.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86fbBus.c
-@@ -58,7 +58,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chip
- {
-     EntityPtr p;
-     int num;
--    
-+
-+    if (xf86BusesClaimed() & ~(1 << BUS_NONE))
-+        return -1;
-+
-     num = xf86AllocateEntity();
-     p = xf86Entities[num];
-     p->driver = drvp;
diff --git a/fixed-SYNC-extension-trigger-BlockHandler-test.diff b/fixed-SYNC-extension-trigger-BlockHandler-test.diff
index 6f71eea..8040a19 100644
--- a/fixed-SYNC-extension-trigger-BlockHandler-test.diff
+++ b/fixed-SYNC-extension-trigger-BlockHandler-test.diff
@@ -25,29 +25,28 @@ Subject: [PATCH] Fixed SYNC extension trigger BlockHandler test.
     This fixes a problem introduced with commit 1f4fb022 where an idle counter
     expires unnoticed.
 Index: xorg-server-1.6.3.901/Xext/sync.c
-===================================================================
---- xorg-server-1.6.3.901.orig/Xext/sync.c
-+++ xorg-server-1.6.3.901/Xext/sync.c
-@@ -222,8 +222,7 @@ SyncCreateCounter(
- );
+================================================================================
+--- xorg-server-1.7.4/Xext/sync.c
++++ xorg-server-1.7.4/Xext/sync.c
+@@ -94,7 +94,7 @@
+ #define XSyncCAAllTrigger \
+     (XSyncCACounter | XSyncCAValueType | XSyncCAValue | XSyncCATestType)
  
- static void SyncComputeBracketValues(
--    SyncCounter * /* pCounter */,
--    Bool /* startOver */
-+    SyncCounter * /* pCounter */
- );
+-static void SyncComputeBracketValues(SyncCounter *, Bool);
++static void SyncComputeBracketValues(SyncCounter *);
  
- static void
-@@ -333,7 +332,7 @@ SyncDeleteTriggerFromCounter(pTrigger)
+ static void SyncInitServerTime(void);
+ 
+@@ -167,7 +167,7 @@
      }
-     
+ 
      if (IsSystemCounter(pTrigger->pCounter))
 -	SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE);
 +	SyncComputeBracketValues(pTrigger->pCounter);
  }
  
  
-@@ -361,7 +360,7 @@ SyncAddTriggerToCounter(pTrigger)
+@@ -194,7 +194,7 @@
      pTrigger->pCounter->pTriglist = pCur;
  
      if (IsSystemCounter(pTrigger->pCounter))
@@ -56,16 +55,16 @@ Index: xorg-server-1.6.3.901/Xext/sync.c
  
      return Success;
  }
-@@ -531,7 +530,7 @@ SyncInitTrigger(client, pTrigger, counte
+@@ -351,7 +351,7 @@
      }
      else if (IsSystemCounter(pCounter))
      {
 -	SyncComputeBracketValues(pCounter, /*startOver*/ TRUE);
 +	SyncComputeBracketValues(pCounter);
      }
-     
+ 
      return Success;
-@@ -829,13 +828,14 @@ SyncChangeCounter(pCounter, newval)
+@@ -640,13 +640,14 @@
      for (ptl = pCounter->pTriglist; ptl; ptl = pnext)
      {
  	pnext = ptl->next;
@@ -82,18 +81,16 @@ Index: xorg-server-1.6.3.901/Xext/sync.c
      }
  }
  
-@@ -1117,9 +1117,8 @@ SyncDestroySystemCounter(pSysCounter)
+@@ -913,7 +914,7 @@
  }
  
  static void
--SyncComputeBracketValues(pCounter, startOver)
-+SyncComputeBracketValues(pCounter)
-     SyncCounter *pCounter;
--    Bool startOver;
+-SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
++SyncComputeBracketValues(SyncCounter *pCounter)
  {
      SyncTriggerList *pCur;
      SyncTrigger *pTrigger;
-@@ -1136,58 +1135,53 @@ SyncComputeBracketValues(pCounter, start
+@@ -930,58 +931,53 @@
      if (ct == XSyncCounterNeverChanges)
  	return;
  
@@ -191,7 +188,7 @@ Index: xorg-server-1.6.3.901/Xext/sync.c
      } /* end for each trigger */
  
      if (pnewgtval || pnewltval)
-@@ -2541,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA
+@@ -2273,11 +2269,17 @@
  }
  
  static void
@@ -214,7 +211,7 @@ Index: xorg-server-1.6.3.901/Xext/sync.c
  
      if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
  	return;
-@@ -2563,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct
+@@ -2295,46 +2297,57 @@
  	 * want level or edge trigger.  Check the trigger list against the
  	 * current idle time, and if any succeed, bomb out of select()
  	 * immediately so we can reschedule.
diff --git a/fpic.diff b/fpic.diff
index 5f037dc..d172808 100644
--- a/fpic.diff
+++ b/fpic.diff
@@ -1,10 +1,10 @@
 Index: hw/xfree86/parser/Makefile.am
-===================================================================
---- hw/xfree86/parser/Makefile.am.orig
+================================================================================
+--- hw/xfree86/parser/Makefile.am
 +++ hw/xfree86/parser/Makefile.am
-@@ -22,7 +22,7 @@ libxf86config_a_SOURCES = \
- 	DRI.c \
- 	Extensions.c
+@@ -33,7 +33,7 @@
+ 	$(INTERNAL_SOURCES)
+ libxf86config_a_CFLAGS = $(AM_CFLAGS)
  
 -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
diff --git a/keyrelease-1.5.2.diff b/keyrelease-1.5.2.diff
deleted file mode 100644
index 151b72c..0000000
--- a/keyrelease-1.5.2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
-===================================================================
---- xorg-server-1.6.3.901.orig/xkb/xkbPrKeyEv.c
-+++ xorg-server-1.6.3.901/xkb/xkbPrKeyEv.c
-@@ -95,17 +95,6 @@ int             xiEvent;
- 		else if ((xE->u.u.type==KeyRelease || 
-                             xE->u.u.type == DeviceKeyRelease) &&
- 			(!(keyc->down[key>>3]&(1<<(key&7))))) {
--		    XkbLastRepeatEvent=	(pointer)&xE;
--                    if (xiEvent)
--                        xE->u.u.type = DeviceKeyPress;
--                    else
--                        xE->u.u.type = KeyPress;
--		    XkbHandleActions(keybd,keybd,xE,count);
--                    if (xiEvent)
--                        xE->u.u.type = DeviceKeyRelease;
--                    else
--                        xE->u.u.type = KeyRelease;
--		    XkbHandleActions(keybd,keybd,xE,count);
- 		    XkbLastRepeatEvent= NULL;
- 		    return;
- 		}
diff --git a/libdri_noPanoramiXExtension_symbol.patch b/libdri_noPanoramiXExtension_symbol.patch
deleted file mode 100644
index b6354f9..0000000
--- a/libdri_noPanoramiXExtension_symbol.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/dri/dri.c
-+++ xorg-server-1.6.3.901/hw/xfree86/dri/dri.c
-@@ -75,7 +75,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu)
- 
- #if !defined(PANORAMIX)
--extern Bool noPanoramiXExtension;
-+Bool noPanoramiXExtension = TRUE;
- #endif
- 
- static int DRIEntPrivIndex = -1;
diff --git a/loadmod-bug197195.diff b/loadmod-bug197195.diff
deleted file mode 100644
index aea3118..0000000
--- a/loadmod-bug197195.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/loader/loadmod.c
-+++ xorg-server-1.6.3.901/hw/xfree86/loader/loadmod.c
-@@ -401,8 +401,8 @@ FindModuleInSubdir(const char *dirpath,
-     while ((direntry = readdir(dir))) {
-         if (direntry->d_name[0] == '.')
-             continue;
--        if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
--            snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
-+	snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
-+        if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
-             if ((ret = FindModuleInSubdir(tmpBuf, module)))
-                 break;
-             continue;
diff --git a/missing_font_paths.diff b/missing_font_paths.diff
index 3ade796..f5fca10 100644
--- a/missing_font_paths.diff
+++ b/missing_font_paths.diff
@@ -1,11 +1,11 @@
---- configure.ac.orig	2009-11-27 21:59:22.000000000 +0100
-+++ configure.ac	2009-11-27 22:03:59.000000000 +0100
-@@ -466,7 +466,7 @@
+--- configure.ac
++++ configure.ac
+@@ -491,7 +491,7 @@
  AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
                                  [ FONTDIR="$withval" ],
                                  [ FONTDIR="${libdir}/X11/fonts" ])
--DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
-+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic"
+-DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
++DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic"
  case $host_os in
  	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
  esac
diff --git a/no-return-in-nonvoid-function.diff b/no-return-in-nonvoid-function.diff
deleted file mode 100644
index aff166c..0000000
--- a/no-return-in-nonvoid-function.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: hw/kdrive/src/kdrive.c
-===================================================================
---- hw/kdrive/src/kdrive.c.orig
-+++ hw/kdrive/src/kdrive.c
-@@ -1380,6 +1380,7 @@ OsVendorFatalError(void)
- int
- DPMSSet(ClientPtr client, int level)
- {
-+    return 0;
- }
- 
- int
diff --git a/p_default-module-path.diff b/p_default-module-path.diff
index 31f7b81..01b58cf 100644
--- a/p_default-module-path.diff
+++ b/p_default-module-path.diff
@@ -1,11 +1,11 @@
 Index: hw/xfree86/common/xf86Globals.c
-===================================================================
---- hw/xfree86/common/xf86Globals.c.orig
+================================================================================
+--- hw/xfree86/common/xf86Globals.c
 +++ hw/xfree86/common/xf86Globals.c
-@@ -141,7 +141,7 @@ xf86InfoRec xf86Info = {
+@@ -143,7 +143,7 @@
+ #endif
  };
  const char *xf86ConfigFile = NULL;
- const char *xf86InputDeviceList = NULL;
 -const char *xf86ModulePath = DEFAULT_MODULE_PATH;
 +const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH;
  MessageType xf86ModPathFrom = X_DEFAULT;
diff --git a/p_ia64-console.diff b/p_ia64-console.diff
index 961b880..b2c2d76 100644
--- a/p_ia64-console.diff
+++ b/p_ia64-console.diff
@@ -1,8 +1,8 @@
 Index: linux/lnx_init.c
-===================================================================
---- linux/lnx_init.c.orig
+================================================================================
+--- linux/lnx_init.c
 +++ linux/lnx_init.c
-@@ -252,9 +252,6 @@ xf86OpenConsole(void)
+@@ -230,9 +230,6 @@
          {
              struct termios nTty;
  
@@ -12,7 +12,7 @@ Index: linux/lnx_init.c
  	    /*
  	     * now get the VT.  This _must_ succeed, or else fail completely.
  	     */
-@@ -266,6 +263,10 @@ xf86OpenConsole(void)
+@@ -244,6 +241,10 @@
  	        FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
  			   strerror(errno));
  
@@ -23,7 +23,7 @@ Index: linux/lnx_init.c
  	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
  	        FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
  		           strerror(errno));
-@@ -384,6 +385,11 @@ xf86CloseConsole()
+@@ -353,6 +354,11 @@
  
      if (VTSwitch)
      {
@@ -35,7 +35,7 @@ Index: linux/lnx_init.c
          /*
           * Perform a switch back to the active VT when we were started
           */
-@@ -398,11 +404,6 @@ xf86CloseConsole()
+@@ -367,11 +373,6 @@
  	    activeVT = -1;
          }
  
@@ -47,12 +47,10 @@ Index: linux/lnx_init.c
      }
      close(xf86Info.consoleFd);	/* make the vt-manager happy */
  
-Index: shared/VTsw_usl.c
-===================================================================
---- shared/VTsw_usl.c.orig
+--- shared/VTsw_usl.c
 +++ shared/VTsw_usl.c
-@@ -62,15 +62,15 @@ Bool
- xf86VTSwitchAway()
+@@ -62,15 +62,15 @@
+ xf86VTSwitchAway(void)
  {
  	xf86Info.vtRequestsPending = FALSE;
 +#ifdef OSSWITCHAWAY
diff --git a/p_xorg_acpi.diff b/p_xorg_acpi.diff
index f598cf5..3099f96 100644
--- a/p_xorg_acpi.diff
+++ b/p_xorg_acpi.diff
@@ -1,6 +1,6 @@
 Index: hw/xfree86/os-support/linux/lnx_acpi.c
-===================================================================
---- hw/xfree86/os-support/linux/lnx_acpi.c.orig
+================================================================================
+--- hw/xfree86/os-support/linux/lnx_acpi.c
 +++ hw/xfree86/os-support/linux/lnx_acpi.c
 @@ -32,8 +32,10 @@
  #define ACPI_VIDEO_HEAD_INVALID		(~0u - 1)
@@ -13,7 +13,7 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c
  PMClose lnxACPIOpen(void);
  
  /* in milliseconds */
-@@ -52,6 +54,22 @@ lnxACPIReopen(OsTimerPtr timer, CARD32 t
+@@ -52,6 +54,22 @@
  
  #define LINE_LENGTH 80
  
@@ -36,7 +36,7 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c
  static int
  lnxACPIGetEventFromOs(int fd, pmEvent *events, int num)
  {
-@@ -127,16 +145,13 @@ lnxACPIConfirmEventToOs(int fd, pmEvent
+@@ -127,15 +145,14 @@
      }
  }
  
@@ -48,14 +48,13 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c
      int fd;    
      struct sockaddr_un addr;
      int r = -1;
+     static int warned = 0;
  
--#ifdef DEBUG
--    ErrorF("ACPI: OSPMOpen called\n");
--#endif
+-    DebugF("ACPI: OSPMOpen called\n");
      if (ACPIihPtr || !xf86Info.pmFlag)
  	return NULL;
     
-@@ -164,6 +179,27 @@ lnxACPIOpen(void)
+@@ -164,6 +181,27 @@
      return lnxCloseACPI;
  }
  
@@ -83,7 +82,7 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c
  static void
  lnxCloseACPI(void)
  {
-@@ -177,5 +213,11 @@ lnxCloseACPI(void)
+@@ -175,5 +213,11 @@
  	shutdown(fd, 2);
  	close(fd);
  	ACPIihPtr = NULL;
@@ -95,9 +94,7 @@ Index: hw/xfree86/os-support/linux/lnx_acpi.c
 +        }
      }
  }
-Index: hw/xfree86/os-support/linux/lnx_apm.c
-===================================================================
---- hw/xfree86/os-support/linux/lnx_apm.c.orig
+--- hw/xfree86/os-support/linux/lnx_apm.c
 +++ hw/xfree86/os-support/linux/lnx_apm.c
 @@ -12,6 +12,7 @@
  
@@ -107,7 +104,7 @@ Index: hw/xfree86/os-support/linux/lnx_apm.c
  #endif
  
  #ifdef HAVE_APM
-@@ -150,6 +151,14 @@ xf86OSPMOpen(void)
+@@ -150,6 +151,14 @@
  		ret = lnxAPMOpen();
  #endif
  
diff --git a/truetype_fontpath.diff b/truetype_fontpath.diff
deleted file mode 100644
index 172d4c2..0000000
--- a/truetype_fontpath.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring,   AS_HELP_STR
- AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
-                                 [ FONTDIR="$withval" ],
-                                 [ FONTDIR="${libdir}/X11/fonts" ])
--DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
-+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
- case $host_os in
- 	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
- esac
-Index: hw/xfree86/Makefile.am
-===================================================================
---- hw/xfree86/Makefile.am.orig
-+++ hw/xfree86/Makefile.am
-@@ -103,6 +103,7 @@ CPP_FILES_FLAGS = \
- 	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
- 	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
- 	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
-+	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/truetype\"" \
- 	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
- 	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
- 	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
diff --git a/xorg-detect-psb.patch b/xorg-detect-psb.patch
index 18cb83e..f2320b6 100644
--- a/xorg-detect-psb.patch
+++ b/xorg-detect-psb.patch
@@ -1,14 +1,25 @@
 Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86AutoConfig.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86AutoConfig.c
-@@ -175,6 +175,9 @@ videoPtrToDriverList(struct pci_device *
+================================================================================
+--- xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server-1.7.4/hw/xfree86/common/xf86AutoConfig.c
+@@ -186,12 +186,14 @@
+ 	case 0x3d3d:		    driverList[0] = "glint"; break;
+ 	case 0x105d:		    driverList[0] = "i128"; break;
  	case 0x8086:
- 	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
- 		driverList[0] = "i740";
-+	    } if ((dev->device_id == 0x8109) ||  (dev->device_id == 0x8108) ||  (dev->device_id == 0x4102) ) {
-+	        driverList[0] = "psb";
-+		driverList[1] = "psb_drv";
- 	    } else {
- 		driverList[0] = "intel";
- 		driverList[1] = "i810";
+-	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {
+-		driverList[0] = "i740";
+-            } else if (dev->device_id == 0x8108) {
+-                break; /* "hooray" for poulsbo */
+-	    } else {
+-		driverList[0] = "intel";
++	    switch (dev->device_id)
++	    {
++		case 0x00d1: case 0x7800:
++		    driverList[0] = "i740"; break;
++		case 0x8109: case 0x8108: case 0x4102:
++		    driverList[0] = "psb"; driverList[1] = "psb_drv"; break;
++		default:
++		    driverList[0] = "intel"; break;
+ 	    }
+ 	    break;
+ 	case 0x102b:		    driverList[0] = "mga";	break;
diff --git a/xorg-server-1.6.5.tar.bz2 b/xorg-server-1.6.5.tar.bz2
deleted file mode 100644
index 30df648..0000000
--- a/xorg-server-1.6.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
-size 4678406
diff --git a/xorg-server-1.7.4.tar.bz2 b/xorg-server-1.7.4.tar.bz2
new file mode 100644
index 0000000..4f2408e
--- /dev/null
+++ b/xorg-server-1.7.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+size 4919597
diff --git a/xorg-server-xf4vnc-disable-dmxvnc.diff b/xorg-server-xf4vnc-disable-dmxvnc.diff
index 2819979..92d6fe1 100644
--- a/xorg-server-xf4vnc-disable-dmxvnc.diff
+++ b/xorg-server-xf4vnc-disable-dmxvnc.diff
@@ -1,6 +1,6 @@
 Index: hw/dmx/Makefile.am
-===================================================================
---- hw/dmx/Makefile.am.orig
+================================================================================
+--- hw/dmx/Makefile.am
 +++ hw/dmx/Makefile.am
 @@ -1,6 +1,6 @@
  DIST_SUBDIRS = input vnc config glxProxy examples doc
@@ -10,11 +10,9 @@ Index: hw/dmx/Makefile.am
  bin_PROGRAMS = Xdmx
  
  if XINERAMA
-Index: hw/dmx/dmx-config.h
-===================================================================
---- hw/dmx/dmx-config.h.orig
+--- hw/dmx/dmx-config.h
 +++ hw/dmx/dmx-config.h
-@@ -72,8 +72,8 @@
+@@ -72,7 +72,7 @@
  /* Enable the DMX extension */
  #define DMXEXT
  
@@ -23,25 +21,20 @@ Index: hw/dmx/dmx-config.h
 +/* Disable VNC ability */
 +#undef DMXVNC
  
- /* Disable the extensions that are not currently supported */
- #undef MULTIBUFFER
-Index: hw/dmx/input/Makefile.am
-===================================================================
---- hw/dmx/input/Makefile.am.orig
+ #endif /* DMX_CONFIG_H */
+--- hw/dmx/input/Makefile.am
 +++ hw/dmx/input/Makefile.am
-@@ -65,7 +65,6 @@ AM_CFLAGS = $(DIX_CFLAGS) \
+@@ -61,7 +61,6 @@
+ AM_CFLAGS = $(DIX_CFLAGS) \
              -I$(top_srcdir)/hw/dmx \
-             $(GLX_INCS) \
              -DHAVE_DMX_CONFIG_H \
 -            -DDMXVNC=1 \
              $(GLX_DEFS) \
              @DMXMODULES_CFLAGS@
  
-Index: hw/dmx/vnc/Makefile.am
-===================================================================
---- hw/dmx/vnc/Makefile.am.orig
+--- hw/dmx/vnc/Makefile.am
 +++ hw/dmx/vnc/Makefile.am
-@@ -37,7 +37,6 @@ AM_CFLAGS = \
+@@ -37,7 +37,6 @@
              -I$(top_srcdir)/hw/xfree86/common \
              -DHAVE_DMX_CONFIG_H \
  	    $(DIX_CFLAGS) \
diff --git a/xorg-server-xf4vnc-fix.diff b/xorg-server-xf4vnc-fix.diff
index 2c0baa0..a6439ad 100644
--- a/xorg-server-xf4vnc-fix.diff
+++ b/xorg-server-xf4vnc-fix.diff
@@ -1,8 +1,27 @@
 Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/cursor.c
-+++ xorg-server-1.6.3.901/hw/vnc/cursor.c
-@@ -262,7 +262,7 @@ rfbSendCursorPos(cl, pScreen)
+================================================================================
+--- xorg-server-1.7.4/configure.ac
++++ xorg-server-1.7.4/configure.ac
+@@ -1407,7 +1407,7 @@
+ 	XVNC_CFLAGS="-DVNCSERVER -DHAVE_XVNC_CONFIG_H"
+ 	AC_SUBST([XVNC_CFLAGS])
+ 	VNC_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
+-	XVNC_LIBS="$CONFIG_LIB $XSERVER_LIBS $FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS"
++	XVNC_LIBS="$XEXT_LIB $MAIN_LIB $CONFIG_LIB $XSERVER_LIBS $FB_LIB $MI_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $FIXES_LIB $LIBS"
+ 	AC_SUBST([XVNC_LIBS])
+ 
+ 	if test "x$GLX" = xyes; then
+--- xorg-server-1.7.4/hw/vnc/cursor.c
++++ xorg-server-1.7.4/hw/vnc/cursor.c
+@@ -33,6 +33,7 @@
+ #include "sprite.h"
+ #include "cursorstr.h"
+ #include "servermd.h"
++#include "inputstr.h"
+ 
+ 
+ /* Copied from Xvnc/lib/font/util/utilbitmap.c */
+@@ -262,7 +263,7 @@
  
  #if XFREE86VNC
      if (pScreen == pCursorScreen) 
@@ -11,11 +30,9 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
  #else
      rfbSpriteGetCursorPos(pScreen, &x, &y);
  #endif
-Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/cutpaste.c
-+++ xorg-server-1.6.3.901/hw/vnc/cutpaste.c
-@@ -66,7 +66,7 @@ rfbSetXCutText(char *str, int len)
+--- xorg-server-1.7.4/hw/vnc/cutpaste.c
++++ xorg-server-1.7.4/hw/vnc/cutpaste.c
+@@ -66,7 +66,7 @@
  	    event.u.selectionClear.time = GetTimeInMillis();
  	    event.u.selectionClear.window = pSel->window;
  	    event.u.selectionClear.atom = pSel->selection;
@@ -24,11 +41,9 @@ Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
  				NoEventMask, NoEventMask /* CantBeFiltered */,
  				NullGrab);
  	}
-Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/dispcur.c
-+++ xorg-server-1.6.3.901/hw/vnc/dispcur.c
-@@ -74,7 +74,10 @@ in this Software without prior written a
+--- xorg-server-1.7.4/hw/vnc/dispcur.c
++++ xorg-server-1.7.4/hw/vnc/dispcur.c
+@@ -74,7 +74,10 @@
  
  /* per-screen private data */
  
@@ -40,7 +55,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
  
  static Bool	rfbDCCloseScreen(int index, ScreenPtr pScreen);
  
-@@ -205,7 +208,7 @@ rfbDCRealizeCursor (pScreen, pCursor)
+@@ -205,7 +208,7 @@
      CursorPtr	pCursor;
  {
      if (pCursor->bits->refcnt <= 1)
@@ -49,7 +64,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
      return TRUE;
  }
  
-@@ -303,7 +306,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
+@@ -303,7 +306,7 @@
  	    xfree ((pointer) pPriv);
  	    return (rfbDCCursorPtr)NULL;
  	}
@@ -58,7 +73,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
  	return pPriv;
      }
      pPriv->pPicture = 0;
-@@ -321,7 +324,7 @@ rfbDCRealize (ScreenPtr pScreen, CursorP
+@@ -321,7 +324,7 @@
  	xfree ((pointer) pPriv);
  	return (rfbDCCursorPtr)NULL;
      }
@@ -67,7 +82,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
  
      /* create the two sets of bits, clipping as appropriate */
  
-@@ -368,7 +371,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
+@@ -368,7 +371,7 @@
      rfbDCCursorPtr   pPriv;
  
      pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
@@ -76,7 +91,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
      if (pPriv && (pCursor->bits->refcnt <= 1))
      {
  	if (pPriv->sourceBits)
-@@ -380,7 +383,7 @@ rfbDCUnrealizeCursor (pScreen, pCursor)
+@@ -380,7 +383,7 @@
  	    FreePicture (pPriv->pPicture, 0);
  #endif
  	xfree ((pointer) pPriv);
@@ -85,7 +100,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
      }
      return TRUE;
  }
-@@ -439,7 +442,7 @@ rfbDCPutUpCursor (pScreen, pCursor, x, y
+@@ -439,7 +442,7 @@
      WindowPtr	    pWin;
  
      pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
@@ -94,7 +109,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
      if (!pPriv)
      {
  	pPriv = rfbDCRealize(pScreen, pCursor);
-@@ -690,7 +693,7 @@ rfbDCMoveCursor (pScreen, pCursor, x, y,
+@@ -690,7 +693,7 @@
      PixmapPtr	    pTemp;
  
      pPriv = (rfbDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
@@ -103,11 +118,17 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
      if (!pPriv)
      {
  	pPriv = rfbDCRealize(pScreen, pCursor);
-Index: xorg-server-1.6.3.901/hw/vnc/init.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/init.c
-+++ xorg-server-1.6.3.901/hw/vnc/init.c
-@@ -138,7 +138,7 @@ static void rfbCrossScreen(ScreenPtr pSc
+--- xorg-server-1.7.4/hw/vnc/init.c
++++ xorg-server-1.7.4/hw/vnc/init.c
+@@ -90,6 +90,7 @@
+ #include "dix.h"
+ #include "micmap.h"
+ #include "rfb.h"
++#include "xserver-properties.h"
+ 
+ #ifdef CORBA
+ #include <vncserverctrl.h>
+@@ -138,7 +139,7 @@
  
  
  static void
@@ -116,7 +137,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/init.c
  {
  #if 0
     DeviceIntPtr pDev = NULL;
-@@ -775,8 +775,8 @@ InitInput(argc, argv)
+@@ -775,8 +776,8 @@
      char *argv[];
  {
      DeviceIntPtr p, k;
@@ -127,71 +148,102 @@ Index: xorg-server-1.6.3.901/hw/vnc/init.c
      RegisterKeyboardDevice(k);
      RegisterPointerDevice(p);
  
-@@ -843,7 +843,6 @@ rfbMouseProc(pDevice, onoff)
+@@ -804,7 +805,7 @@
+     case DEVICE_INIT: 
+         vncSetKeyboardDevice(pDevice);
+ 	KbdDeviceInit(pDevice, &keySyms, modMap);
+-	InitKeyboardDeviceStruct(pDev, &keySyms, modMap,
++	InitKeyboardDeviceStruct(pDevice, NULL,
+ 				 (BellProcPtr)rfbSendBell,
+ 				 (KbdCtrlProcPtr)NoopDDA);
+         break;
+@@ -831,6 +832,8 @@
+     int onoff;
+ {
+     BYTE map[6];
++    Atom btn_labels[5] = {0};
++    Atom axes_labels[2] = {0};
+     DevicePtr pDev = (DevicePtr)pDevice;
+ 
+     switch (onoff)
+@@ -842,10 +845,16 @@
+ 	map[3] = 3;
  	map[4] = 4;
  	map[5] = 5;
- 	InitPointerDeviceStruct(pDev, map, 5,
+-	InitPointerDeviceStruct(pDev, map, 5,
 -                                GetMotionHistory,
++	btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
++	btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
++	btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
++
++	axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
++	axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
++
++	InitPointerDeviceStruct(pDev, map, 5, btn_labels,
  				PtrDeviceControl,
-                                 GetMaximumEventsNum(), 2 /* numAxes */);
+-                                GetMaximumEventsNum(), 2 /* numAxes */);
++                                GetMaximumEventsNum(), 2 /* numAxes */, axes_labels);
          vncSetPointerDevice(pDevice);
-Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/kbdptr.c
-+++ xorg-server-1.6.3.901/hw/vnc/kbdptr.c
-@@ -74,19 +74,26 @@ vncSetPointerDevice(DeviceIntPtr ptr)
+ 	break;
+ 
+--- xorg-server-1.7.4/hw/vnc/kbdptr.c
++++ xorg-server-1.7.4/hw/vnc/kbdptr.c
+@@ -39,6 +39,7 @@
+ #include "mi.h"
+ #include "mipointer.h"
+ #include "keyboard.h"
++#include "xkbsrv.h"
+ 
+ #ifdef DMXVNC
+ #include "dmxinput.h"
+@@ -69,15 +70,16 @@
+    ptrDevice = ptr;
+ }
+ 
+-
+ #ifndef DMXVNC
  static void
  EnqueueMotion(DeviceIntPtr ptrDev, int x, int y)
  {
 -   xEvent *events = (xEvent*) calloc(sizeof(xEvent),  GetMaximumEventsNum());
-+   int maxEventsNum = GetMaximumEventsNum();
-+   xEvent *events = (xEvent*) calloc(sizeof(xEvent), maxEventsNum);
-+   EventListPtr evls= calloc(sizeof(EventList), maxEventsNum);
     int detail = 0, valuators[2], nevents, i;
++   EventListPtr events;
     valuators[0] = x;
     valuators[1] = y;
-+   for (i = 0; i < maxEventsNum; i++) {
-+      evls[i].event = &events[i];
-+      evls[i].evlen = sizeof(xEvent);
-+   }
++   GetEventList(&events);
++
     if (!ptrDev) {
        ErrorF("VNC: In EnqueueMotion() ptrDev=NULL\n");
        return;
-    }
--   nevents = GetPointerEvents(events, ptrDev, MotionNotify, detail,
-+   nevents = GetPointerEvents(evls, ptrDev, MotionNotify, detail,
+@@ -85,8 +87,7 @@
+    nevents = GetPointerEvents(events, ptrDev, MotionNotify, detail,
                                POINTER_ABSOLUTE, 0, 2, valuators);
     for (i = 0; i < nevents; i++)
-       mieqEnqueue(ptrDev, events + i);
-    free(events);
-+   free(evls);
+-      mieqEnqueue(ptrDev, events + i);
+-   free(events);
++      mieqEnqueue(ptrDev, (InternalEvent*)(events + i)->event);
  }
  #endif
  
-@@ -94,33 +101,47 @@ EnqueueMotion(DeviceIntPtr ptrDev, int x
+@@ -94,8 +95,10 @@
  static void
  EnqueueButton(DeviceIntPtr ptrDev, int type, int detail)
  {
 -   xEvent *events = (xEvent*) calloc(sizeof(xEvent),  GetMaximumEventsNum());
-+   int maxEventsNum = GetMaximumEventsNum();
-+   xEvent *events = (xEvent*) calloc(sizeof(xEvent), maxEventsNum);
-+   EventListPtr evls= calloc(sizeof(EventList), maxEventsNum);
     int nevents, i;
-+   for (i = 0; i < maxEventsNum; i++) {
-+      evls[i].event = &events[i];
-+      evls[i].evlen = sizeof(xEvent);
-+   }
++   EventListPtr events;
++   GetEventList(&events);
++
     if (!ptrDev) {
        ErrorF("VNC: In EnqueueButton() ptrDev=NULL\n");
        return;
-    }
--   nevents = GetPointerEvents(events, ptrDev, type, detail,
-+   nevents = GetPointerEvents(evls, ptrDev, type, detail,
+@@ -103,27 +106,26 @@
+    nevents = GetPointerEvents(events, ptrDev, type, detail,
                                POINTER_ABSOLUTE, 0, 0, NULL/*valuators*/);
     for (i = 0; i < nevents; i++)
-       mieqEnqueue(ptrDev, events + i);
-    free(events);
-+   free(evls);
+-      mieqEnqueue(ptrDev, events + i);
+-   free(events);
++      mieqEnqueue(ptrDev, (InternalEvent*)(events + i)->event);
  }
  
  
@@ -199,41 +251,87 @@ Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
  EnqueueKey(DeviceIntPtr kbdDev, int type, int detail)
  {
 -   xEvent *events = (xEvent*) calloc(sizeof(xEvent),  GetMaximumEventsNum());
-+   int maxEventsNum = GetMaximumEventsNum();
-+   xEvent *events = (xEvent*) calloc(sizeof(xEvent), maxEventsNum);
-+   EventListPtr evls= calloc(sizeof(EventList), maxEventsNum);
     int nevents, i;
-+   for (i = 0; i < maxEventsNum; i++) {
-+      evls[i].event = &events[i];
-+      evls[i].evlen = sizeof(xEvent);
-+   }
++   EventListPtr events;
++   GetEventList(&events);
++
     if (!kbdDev) {
        ErrorF("VNC: In EnqueueKey() kbdDev=NULL\n");
        return;
     }
--   nevents = GetKeyboardEvents(events, kbdDev, type, detail);
-+   nevents = GetKeyboardEvents(evls, kbdDev, type, detail);
+    nevents = GetKeyboardEvents(events, kbdDev, type, detail);
     for (i = 0; i < nevents; i++)
-       mieqEnqueue(kbdDev, events + i);
-    free(events);
-+   free(evls);
+-      mieqEnqueue(kbdDev, events + i);
+-   free(events);
++      mieqEnqueue(kbdDev, (InternalEvent*)(events + i)->event);
  }
  
+-
+ /*
+  * Called when the rfbserver receives a rfbKeyEvent event from a client.
+  * Put an X keyboard event into the event queue.
+@@ -133,6 +135,7 @@
+ {
+     const int type = down ? KeyPress : KeyRelease;
+     KeySymsPtr keySyms;
++    XkbStateRec *xkb;
+     int i;
+     int keyCode = 0;
+     int freeIndex = -1;
+@@ -145,7 +148,7 @@
+     if (!kbdDevice)
+         return;
  
-@@ -256,7 +277,7 @@ KbdAddEvent(Bool down, KeySym keySym, rf
+-    keySyms = &kbdDevice->key->curKeySyms;
++    keySyms = XkbGetCoreMap(kbdDevice);
+ 
+ #ifdef CORBA
+     if (cl) {
+@@ -256,18 +259,19 @@
  		shiftMustBePressed = TRUE;
  	}
  
 -	SendMappingNotify(MappingKeyboard, keyCode, 1, serverClient);
-+	SendMappingNotify(kbdDevice, MappingKeyboard, keyCode, 1, serverClient);
++	XkbApplyMappingChange(kbdDevice, keySyms, keyCode, 1, NULL, serverClient);
  
  	ErrorF("KbdAddEvent: unknown KeySym 0x%x - allocating KeyCode %d\n",
  	       (int)keySym, keyCode);
-Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/rfbkeyb.c
-+++ xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
-@@ -388,7 +388,7 @@ static XF86ModuleVersionInfo xf86rfbKeyb
+     }
+ 
++    xkb = &kbdDevice->key->xkbInfo->state;
+     if (down) {
+-	if (shiftMustBePressed && !(kbdDevice->key->state & ShiftMask)) {
++	if (shiftMustBePressed && !(XkbStateFieldFromRec(xkb) & ShiftMask)) {
+ 	    fakeShiftPress = TRUE;
+             EnqueueKey(kbdDevice, KeyPress, SHIFT_L_KEY_CODE);
+ 	}
+-	if (shiftMustBeReleased && (kbdDevice->key->state & ShiftMask)) {
++	if (shiftMustBeReleased && (XkbStateFieldFromRec(xkb) & ShiftMask)) {
+ 	    if (KEY_IS_PRESSED(SHIFT_L_KEY_CODE)) {
+ 		fakeShiftLRelease = TRUE;
+                 EnqueueKey(kbdDevice, KeyRelease, SHIFT_L_KEY_CODE);
+--- xorg-server-1.7.4/hw/vnc/rdp.c
++++ xorg-server-1.7.4/hw/vnc/rdp.c
+@@ -27,6 +27,7 @@
+ #include <errno.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
++#include <arpa/inet.h>
+ #include "rfb.h"
+ 
+ typedef struct rdpClientRec {
+--- xorg-server-1.7.4/hw/vnc/rfbkeyb.c
++++ xorg-server-1.7.4/hw/vnc/rfbkeyb.c
+@@ -147,7 +147,7 @@
+ #ifdef XKB
+ 	if (noXkbExtension) {
+ #endif
+-	    InitKeyboardDeviceStruct(pDev, &keySyms, modMap,
++	    InitKeyboardDeviceStruct(device, NULL,
+ 				 (BellProcPtr)rfbSendBell,
+ 				 (KbdCtrlProcPtr)NoopDDA);
+ #ifdef XKB
+@@ -388,7 +388,7 @@
      "xf4vnc Project, see http://xf4vnc.sf.net",
      MODINFOSTRING1,
      MODINFOSTRING2,
@@ -242,11 +340,24 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
      1, 0, 0,
      ABI_CLASS_XINPUT,
      ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/rfbmouse.c
-+++ xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
-@@ -98,10 +98,12 @@ xf86rfbMouseControlProc(DeviceIntPtr dev
+--- xorg-server-1.7.4/hw/vnc/rfbmouse.c
++++ xorg-server-1.7.4/hw/vnc/rfbmouse.c
+@@ -51,7 +51,7 @@
+ #include <mipointer.h>
+ #endif
+ #include "rfb.h"
+-
++#include "xserver-properties.h"
+ 
+ unsigned char ptrAcceleration = 50;
+ 
+@@ -95,13 +95,18 @@
+ {
+     BYTE map[6];
+     DevicePtr pDev = (DevicePtr)device;
++    Atom btn_labels[5] = {0};
++    Atom axes_labels[2] = {0};
++
      void *func1;
      int (*func2)(void);
  
@@ -259,17 +370,31 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
  
      if (LoaderSymbol("GetMotionHistorySize"))
      	func2 = LoaderSymbol("GetMotionHistorySize");
-@@ -120,7 +122,9 @@ xf86rfbMouseControlProc(DeviceIntPtr dev
+@@ -119,10 +124,21 @@
+ 	map[3] = 3;
  	map[4] = 4;
  	map[5] = 5;
- 	InitPointerDeviceStruct(pDev, map, 5, 
+-	InitPointerDeviceStruct(pDev, map, 5, 
++	btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
++	btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
++	btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
++	btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
++	btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
++
++	axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
++	axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
++
++	InitPointerDeviceStruct(pDev, map, 5, btn_labels,
 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
                                  func1,
 +#endif
  				PtrDeviceControl,
-                                 (*func2)(), 2);
+-                                (*func2)(), 2);
++                                (*func2)(), 2, axes_labels);
  	break;
-@@ -243,7 +247,7 @@ static XF86ModuleVersionInfo xf86rfbMous
+ 
+     case DEVICE_ON:
+@@ -243,7 +259,7 @@
      "xf4vnc Project, see http://xf4vnc.sf.net",
      MODINFOSTRING1,
      MODINFOSTRING2,
@@ -278,11 +403,17 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
      1, 0, 0,
      ABI_CLASS_XINPUT,
      ABI_XINPUT_VERSION,
-Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/rfbserver.c
-+++ xorg-server-1.6.3.901/hw/vnc/rfbserver.c
-@@ -1122,8 +1122,8 @@ rfbProcessClientNormalMessage(cl)
+--- xorg-server-1.7.4/hw/vnc/rfbserver.c
++++ xorg-server-1.7.4/hw/vnc/rfbserver.c
+@@ -53,6 +53,7 @@
+ #include "propertyst.h"
+ #include <X11/Xatom.h>
+ #include <mi.h>
++#include <inputstr.h>
+ 
+ #ifdef CORBA
+ #include <vncserverctrl.h>
+@@ -1122,8 +1123,8 @@
  
  	{
  		int x, y;
@@ -293,11 +424,9 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
  	}
  #endif
  
-Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/sprite.c
-+++ xorg-server-1.6.3.901/hw/vnc/sprite.c
-@@ -112,7 +112,8 @@ static void	    rfbSpriteSaveDoomedAreas
+--- xorg-server-1.7.4/hw/vnc/sprite.c
++++ xorg-server-1.7.4/hw/vnc/sprite.c
+@@ -112,7 +112,8 @@
  static RegionPtr    rfbSpriteRestoreAreas(WindowPtr pWin, RegionPtr pRgnExposed);
  static void	    rfbSpriteComputeSaved(ScreenPtr pScreen);
  
@@ -307,7 +436,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  
  #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \
     ((rfbSpriteScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
-@@ -144,7 +145,8 @@ static GCFuncs	rfbSpriteGCFuncs = {
+@@ -144,7 +145,8 @@
      rfbSpriteCopyClip,
  };
  
@@ -317,7 +446,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  
  #define GC_FUNC_PROLOGUE(pGC)					\
      rfbSpriteGCPtr   pGCPriv =					\
-@@ -289,23 +291,27 @@ static GCOps rfbSpriteGCOps = {
+@@ -289,23 +291,27 @@
   * pointer-sprite method table
   */
  
@@ -350,7 +479,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  
  
  /*
-@@ -1963,7 +1969,7 @@ rfbSpriteLineHelper()
+@@ -1963,7 +1969,7 @@
  #define SPRITE_PAD 8
  
  static Bool
@@ -359,7 +488,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  {
      rfbSpriteScreenPtr	pScreenPriv;
  
-@@ -1975,7 +1981,7 @@ rfbSpriteRealizeCursor (ScreenPtr pScree
+@@ -1975,7 +1981,7 @@
  }
  
  static Bool
@@ -368,7 +497,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  {
      rfbSpriteScreenPtr	pScreenPriv;
  
-@@ -1985,7 +1991,7 @@ rfbSpriteUnrealizeCursor (ScreenPtr pScr
+@@ -1985,7 +1991,7 @@
  }
  
  static void
@@ -377,7 +506,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  {
      rfbSpriteScreenPtr	pScreenPriv;
      rfbClientPtr cl, nextCl;
-@@ -2101,13 +2107,24 @@ rfbSpriteSetCursor (ScreenPtr pScreen, C
+@@ -2101,13 +2107,24 @@
  }
  
  static void
@@ -404,7 +533,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  }
  
  /*
-@@ -2215,9 +2232,7 @@ rfbSpriteComputeSaved (pScreen)
+@@ -2215,9 +2232,7 @@
   */
  
  static Bool
@@ -415,7 +544,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  {
      rfbClientPtr cl;
      rfbSpriteScreenPtr pPriv;
-@@ -2230,7 +2245,7 @@ rfbDisplayCursor(pScreen, pCursor)
+@@ -2230,7 +2245,7 @@
  
      pPriv = (rfbSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
  						      rfbSpriteScreenKey);
@@ -424,10 +553,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
  
      /* send new cursor shape to interested viewers */
      for (cl = rfbClientHead; cl ; cl = cl->next) {
-Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/vnc/vncext.c
-+++ xorg-server-1.6.3.901/hw/vnc/vncext.c
+--- xorg-server-1.7.4/hw/vnc/vncext.c
++++ xorg-server-1.7.4/hw/vnc/vncext.c
 @@ -36,8 +36,9 @@
  #include <arpa/inet.h>
  #include <netdb.h>
@@ -440,7 +567,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
  
  int VncSelectNotify(ClientPtr client, BOOL onoff);
  void VncExtensionInit(void);
-@@ -514,7 +515,7 @@ GenerateVncConnectedEvent(int sock)
+@@ -514,7 +515,7 @@
     	  else
  		conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
  
@@ -449,7 +576,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
  				 NoEventMask, NullGrab);
  	}
  	pn = pn->next;
-@@ -557,7 +558,7 @@ GenerateVncChromiumConnectedEvent(int so
+@@ -557,7 +558,7 @@
     	  else
  		conn.ipaddress = (CARD32)peer.sin_addr.s_addr;
  
@@ -458,7 +585,7 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
  				 NoEventMask, NullGrab);
  	}
  	pn = pn->next;
-@@ -586,7 +587,7 @@ GenerateVncDisconnectedEvent(int sock)
+@@ -586,7 +587,7 @@
      	  conn.type = VncEventBase + XVncDisconnected;
      	  conn.sequenceNumber = pn->client->sequence;
      	  conn.connected = sock;
@@ -467,20 +594,28 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
  				 NoEventMask, NullGrab);
  	}
  	pn = pn->next;
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/vnc/vncInit.c
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
-@@ -35,7 +35,7 @@
+--- xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c
++++ xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c
+@@ -34,8 +34,7 @@
+ 
  #include "xf86.h"
  #include "xf86_OSproc.h"
- #include "xf86Resources.h"
+-#include "xf86Resources.h"
 -#include "xf86Version.h"
 +#include "xorgVersion.h"
  
  int vncScreenPrivateIndex = -1;
  int inetdSock = -1;
-@@ -56,11 +56,11 @@ static unsigned long VNCGeneration = 0;
+@@ -48,6 +47,8 @@
+ 
+ extern void VncExtensionInit(void);
+ 
++extern void vncInitMouse(void);
++extern void vncInitKeyb(void);
+ Bool VNCInit(ScreenPtr pScreen, unsigned char *FBStart);
+ 
+ #ifndef XFree86LOADER
+@@ -56,11 +57,11 @@
  static const OptionInfoRec *VNCAvailableOptions(void *unused);
  static void rfbWakeupHandler (int i, pointer blockData, unsigned long err, pointer pReadmask);
  
@@ -497,7 +632,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  
  static miPointerSpriteFuncRec vncCursorSpriteFuncs = {
     vncCursorRealizeCursor,
-@@ -389,23 +389,23 @@ VNCInit(ScreenPtr pScreen, unsigned char
+@@ -389,23 +390,23 @@
  /****** miPointerSpriteFunctions *******/
  
  static Bool
@@ -526,7 +661,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  {
      vncScreenPtr   pScreenPriv = VNCPTR(pScreen);
  
-@@ -426,11 +426,11 @@ vncCursorSetCursor(ScreenPtr pScreen, Cu
+@@ -426,11 +427,11 @@
      pScreenPriv->cursorIsDrawn = TRUE;
  #endif
  
@@ -540,7 +675,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  {
      vncScreenPtr   pScreenPriv = VNCPTR(pScreen);
      rfbClientPtr cl;
-@@ -440,7 +440,7 @@ vncCursorMoveCursor(ScreenPtr pScreen, i
+@@ -440,7 +441,7 @@
  	    cl->cursorWasMoved = TRUE;
      }
  
@@ -549,7 +684,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  }
  
  Bool
-@@ -505,9 +505,7 @@ vncUseHWCursorARGB(pScreen, pCursor)
+@@ -505,9 +506,7 @@
  #endif
  
  static Bool
@@ -560,7 +695,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  {
      vncScreenPtr   pScreenPriv = VNCPTR(pScreen);
      rfbClientPtr cl;
-@@ -520,7 +518,7 @@ vncDisplayCursor(pScreen, pCursor)
+@@ -520,7 +519,7 @@
  	    cl->cursorWasChanged = TRUE;
      }
  
@@ -569,3 +704,19 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
  
      pScreen->DisplayCursor = vncDisplayCursor;
  
+@@ -586,6 +585,7 @@
+     NULL                   /* ModuleTearDownProc */
+ };
+ 
++#if 0
+ ModuleInfoRec VNC = {
+     1,                     /* moduleVersion */
+     "VNC",                 /* moduleName */
+@@ -593,6 +593,7 @@
+     0,                     /* refCount */
+     VNCAvailableOptions,   /* function returning array of OptionsInfoRec */
+ };
++#endif
+ 
+ ExtensionModule vncExtensionModule = {
+         VncExtensionInit,  /* initFunc */
diff --git a/xorg-server-xf4vnc.patch b/xorg-server-xf4vnc.patch
index e49f289..74befda 100644
--- a/xorg-server-xf4vnc.patch
+++ b/xorg-server-xf4vnc.patch
@@ -1,8 +1,8 @@
 Index: xorg-server-1.6.3.901/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/Makefile.am
-+++ xorg-server-1.6.3.901/Makefile.am
-@@ -17,6 +17,10 @@ if RECORD
+================================================================================
+--- xorg-server-1.7.4/Makefile.am
++++ xorg-server-1.7.4/Makefile.am
+@@ -17,6 +17,10 @@
  RECORD_DIR=record
  endif
  
@@ -13,30 +13,28 @@ Index: xorg-server-1.6.3.901/Makefile.am
  SUBDIRS = \
  	doc \
  	include \
-@@ -36,6 +40,7 @@ SUBDIRS = \
+@@ -36,6 +40,7 @@
  	damageext \
  	$(COMPOSITE_DIR) \
  	$(GLX_DIR) \
 +	$(XCLIPLIST_DIR) \
  	exa \
  	config \
- 	hw
-Index: xorg-server-1.6.3.901/configure.ac
-===================================================================
---- xorg-server-1.6.3.901.orig/configure.ac
-+++ xorg-server-1.6.3.901/configure.ac
-@@ -553,6 +553,8 @@ AC_ARG_ENABLE(xfree86-utils,     AS_HELP
+ 	hw \
+--- xorg-server-1.7.4/configure.ac
++++ xorg-server-1.7.4/configure.ac
+@@ -611,6 +611,8 @@
  
  dnl DDXes.
  AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
 +AC_ARG_ENABLE(xcliplist,      AS_HELP_STRING([--enable-xcliplist], [Build XClipList extension (default: auto)]), [XCLIPLIST=$enableval], [XCLIPLIST=auto])
-+AC_ARG_ENABLE(vnc,    	      AS_HELP_STRING([--enable-vnc], [Build Xvnc server (default: yes)]), [VNC=$enableval], [VNC=auto])
- AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: no)]), [DMX=$enableval], [DMX=no])
++AC_ARG_ENABLE(vnc,                  AS_HELP_STRING([--enable-vnc], [Build Xvnc server (default: yes)]), [VNC=$enableval], [VNC=auto])
+ AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
  AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
  AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
-@@ -991,6 +993,20 @@ XI_INC='-I$(top_srcdir)/Xi'
- 
- AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+@@ -1091,6 +1093,20 @@
+ AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
+ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
  
 +if test "x$XCLIPLIST" = xauto; then
 +	if test "x$XORG" = xno; then
@@ -54,8 +52,8 @@ Index: xorg-server-1.6.3.901/configure.ac
 +
  AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
  
- AC_DEFINE(XKB, 1, [Build XKB])
-@@ -1186,6 +1202,40 @@ dnl ------------------------------------
+ AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
+@@ -1373,6 +1389,40 @@
  dnl DDX section.
  dnl ---------------------------------------------------------------------------
  
@@ -96,7 +94,7 @@ Index: xorg-server-1.6.3.901/configure.ac
  dnl Xvfb DDX
  
  AC_MSG_CHECKING([whether to build Xvfb DDX])
-@@ -1828,6 +1878,7 @@ Xext/Makefile
+@@ -2065,6 +2115,7 @@
  Xi/Makefile
  xfixes/Makefile
  exa/Makefile
@@ -104,7 +102,7 @@ Index: xorg-server-1.6.3.901/configure.ac
  hw/Makefile
  hw/xfree86/Makefile
  hw/xfree86/common/Makefile
-@@ -1862,6 +1913,7 @@ hw/xfree86/ramdac/Makefile
+@@ -2098,6 +2149,7 @@
  hw/xfree86/shadowfb/Makefile
  hw/xfree86/vbe/Makefile
  hw/xfree86/vgahw/Makefile
@@ -112,7 +110,7 @@ Index: xorg-server-1.6.3.901/configure.ac
  hw/xfree86/x86emu/Makefile
  hw/xfree86/xaa/Makefile
  hw/xfree86/xf8_16bpp/Makefile
-@@ -1873,8 +1925,10 @@ hw/dmx/doc/Makefile
+@@ -2109,8 +2161,10 @@
  hw/dmx/examples/Makefile
  hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
@@ -123,11 +121,9 @@ Index: xorg-server-1.6.3.901/configure.ac
  hw/xnest/Makefile
  hw/xwin/Makefile
  hw/xquartz/Makefile
-Index: xorg-server-1.6.3.901/hw/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/Makefile.am
-+++ xorg-server-1.6.3.901/hw/Makefile.am
-@@ -22,6 +22,10 @@ if KDRIVE
+--- xorg-server-1.7.4/hw/Makefile.am
++++ xorg-server-1.7.4/hw/Makefile.am
+@@ -22,6 +22,10 @@
  KDRIVE_SUBDIRS = kdrive
  endif
  
@@ -138,7 +134,7 @@ Index: xorg-server-1.6.3.901/hw/Makefile.am
  if XQUARTZ
  XQUARTZ_SUBDIRS = xquartz
  endif
-@@ -32,10 +36,11 @@ SUBDIRS =			\
+@@ -32,10 +36,11 @@
  	$(XVFB_SUBDIRS)		\
  	$(XNEST_SUBDIRS)	\
  	$(DMX_SUBDIRS)		\
@@ -151,10 +147,8 @@ Index: xorg-server-1.6.3.901/hw/Makefile.am
  
  relink:
  	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
-Index: xorg-server-1.6.3.901/hw/dmx/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/Makefile.am
-+++ xorg-server-1.6.3.901/hw/dmx/Makefile.am
+--- xorg-server-1.7.4/hw/dmx/Makefile.am
++++ xorg-server-1.7.4/hw/dmx/Makefile.am
 @@ -1,6 +1,6 @@
 -DIST_SUBDIRS = input config glxProxy examples doc
 +DIST_SUBDIRS = input vnc config glxProxy examples doc
@@ -164,25 +158,19 @@ Index: xorg-server-1.6.3.901/hw/dmx/Makefile.am
  bin_PROGRAMS = Xdmx
  
  if XINERAMA
-Index: xorg-server-1.6.3.901/hw/dmx/dmx-config.h
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/dmx-config.h
-+++ xorg-server-1.6.3.901/hw/dmx/dmx-config.h
-@@ -72,6 +72,9 @@
+--- xorg-server-1.7.4/hw/dmx/dmx-config.h
++++ xorg-server-1.7.4/hw/dmx/dmx-config.h
+@@ -72,4 +72,7 @@
  /* Enable the DMX extension */
  #define DMXEXT
  
 +/* Enable VNC ability */
 +#define DMXVNC 1
 +
- /* Disable the extensions that are not currently supported */
- #undef MULTIBUFFER
- #undef XV
-Index: xorg-server-1.6.3.901/hw/dmx/dmxinit.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/dmxinit.c
-+++ xorg-server-1.6.3.901/hw/dmx/dmxinit.c
-@@ -77,6 +77,10 @@ extern void GlxSetVisualConfigs(
+ #endif /* DMX_CONFIG_H */
+--- xorg-server-1.7.4/hw/dmx/dmxinit.c
++++ xorg-server-1.7.4/hw/dmx/dmxinit.c
+@@ -79,6 +79,10 @@
  );
  #endif /* GLXEXT */
  
@@ -193,7 +181,7 @@ Index: xorg-server-1.6.3.901/hw/dmx/dmxinit.c
  /* Global variables available to all Xserver/hw/dmx routines. */
  int             dmxNumScreens;
  DMXScreenInfo  *dmxScreens;
-@@ -805,6 +809,9 @@ void InitOutput(ScreenInfo *pScreenInfo,
+@@ -807,6 +811,9 @@
  
      dmxLog(dmxInfo, "Shadow framebuffer support %s\n",
  	   dmxShadowFB ? "enabled" : "disabled");
@@ -203,7 +191,7 @@ Index: xorg-server-1.6.3.901/hw/dmx/dmxinit.c
  }
  
  /* RATS: Assuming the fp string (which comes from the command-line argv
-@@ -1031,3 +1038,14 @@ void ddxUseMsg(void)
+@@ -1033,3 +1040,14 @@
      ErrorF("        Ctrl-Alt-q    Quit (core devices only)\n");
      ErrorF("        Ctrl-Alt-F*   Switch to VC (local only)\n");
  }
@@ -218,11 +206,9 @@ Index: xorg-server-1.6.3.901/hw/dmx/dmxinit.c
 +    return tp.tv_sec * 1000 + tp.tv_usec / 1000;
 +}
 +#endif
-Index: xorg-server-1.6.3.901/hw/dmx/dmxsync.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/dmxsync.c
-+++ xorg-server-1.6.3.901/hw/dmx/dmxsync.c
-@@ -99,9 +99,16 @@ static void dmxSyncBlockHandler(pointer
+--- xorg-server-1.7.4/hw/dmx/dmxsync.c
++++ xorg-server-1.7.4/hw/dmx/dmxsync.c
+@@ -99,9 +99,16 @@
      TimerForce(dmxSyncTimer);
  }
  
@@ -239,23 +225,19 @@ Index: xorg-server-1.6.3.901/hw/dmx/dmxsync.c
  }
  
  /** Request the XSync() batching optimization with the specified \a
-Index: xorg-server-1.6.3.901/hw/dmx/input/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/input/Makefile.am
-+++ xorg-server-1.6.3.901/hw/dmx/input/Makefile.am
-@@ -65,6 +65,7 @@ AM_CFLAGS = $(DIX_CFLAGS) \
+--- xorg-server-1.7.4/hw/dmx/input/Makefile.am
++++ xorg-server-1.7.4/hw/dmx/input/Makefile.am
+@@ -61,6 +61,7 @@
+ AM_CFLAGS = $(DIX_CFLAGS) \
              -I$(top_srcdir)/hw/dmx \
-             $(GLX_INCS) \
              -DHAVE_DMX_CONFIG_H \
 +            -DDMXVNC=1 \
              $(GLX_DEFS) \
              @DMXMODULES_CFLAGS@
  
-Index: xorg-server-1.6.3.901/hw/dmx/input/dmxcommon.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxcommon.c
-+++ xorg-server-1.6.3.901/hw/dmx/input/dmxcommon.c
-@@ -655,7 +655,6 @@ void dmxCommonRestoreState(pointer priva
+--- xorg-server-1.7.4/hw/dmx/input/dmxcommon.c
++++ xorg-server-1.7.4/hw/dmx/input/dmxcommon.c
+@@ -648,7 +648,6 @@
              dmxLogInput(dmxInput, "Keyboard busy, waiting\n");
          else
              dmxLogInput(dmxInput, "Keyboard error, waiting\n");
@@ -263,34 +245,34 @@ Index: xorg-server-1.6.3.901/hw/dmx/input/dmxcommon.c
                                  /* Don't generate X11 protocol for a bit */
          for (tmp = GetTimeInMillis(); GetTimeInMillis() - tmp < 250;) {
              usleep(250);            /* This ends up sleeping only until
-Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxinputinit.c
-+++ xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.c
-@@ -391,6 +391,10 @@ static int dmxKeyboardOn(DeviceIntPtr pD
-     DevicePtr pDev = &pDevice->public;
- #endif
- 
+--- xorg-server-1.7.4/hw/dmx/input/dmxinputinit.c
++++ xorg-server-1.7.4/hw/dmx/input/dmxinputinit.c
+@@ -372,6 +372,11 @@
+ static int dmxKeyboardOn(DeviceIntPtr pDevice, DMXLocalInitInfo *info)
+ {
+     GETDMXINPUTFROMPDEVICE;
++
 +#ifdef DMXVNC
 +    vncSetKeyboardDevice(pDevice);
 +#endif
 +
- #ifdef XKB
-     if (noXkbExtension) {
- #endif
-@@ -476,6 +480,9 @@ static int dmxDeviceOnOff(DeviceIntPtr p
-             break;
+     XkbRMLVOSet rmlvo;
+ 
+     rmlvo.rules = dmxConfigGetXkbRules();
+@@ -451,7 +456,9 @@
          }
          if (info.keyClass) {
+             XkbRMLVOSet rmlvo;
+-
 +#ifdef DMXVNC
 +	    vncSetKeyboardDevice(pDevice);
 +#endif
-             DevicePtr pDev = (DevicePtr) pDevice;
-             InitKeyboardDeviceStruct(pDev,
-                                      &info.keySyms,
-@@ -512,6 +519,9 @@ static int dmxDeviceOnOff(DeviceIntPtr p
-                                            info.res[i+1], info.minres[i+1],
-                                            info.maxres[i+1]);
+             rmlvo.rules = dmxConfigGetXkbRules();
+             rmlvo.model = dmxConfigGetXkbModel();
+             rmlvo.layout = dmxConfigGetXkbLayout();
+@@ -499,6 +506,9 @@
+                                            info.res[i], info.minres[i],
+                                            info.maxres[i]);
              }
 +#ifdef DMXVNC
 +            vncSetPointerDevice(pDevice);
@@ -298,11 +280,9 @@ Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.c
          }
          if (info.focusClass)       InitFocusClassDeviceStruct(pDevice);
          if (info.proximityClass)   InitProximityClassDeviceStruct(pDevice);
-Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.h
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/dmx/input/dmxinputinit.h
-+++ xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.h
-@@ -290,4 +290,9 @@ extern int          dmxInputAttachConsol
+--- xorg-server-1.7.4/hw/dmx/input/dmxinputinit.h
++++ xorg-server-1.7.4/hw/dmx/input/dmxinputinit.h
+@@ -288,4 +288,9 @@
  extern int          dmxInputAttachBackend(int physicalScreen, int isCore,
                                            int *id);
  
@@ -312,10 +292,8 @@ Index: xorg-server-1.6.3.901/hw/dmx/input/dmxinputinit.h
 +#endif
 +
  #endif
-Index: xorg-server-1.6.3.901/hw/dmx/vnc/.gitignore
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/dmx/vnc/.gitignore
+--- xorg-server-1.7.4/hw/dmx/vnc/.gitignore
++++ xorg-server-1.7.4/hw/dmx/vnc/.gitignore
 @@ -0,0 +1,36 @@
 +auth.c
 +cmap.c
@@ -353,10 +331,8 @@ Index: xorg-server-1.6.3.901/hw/dmx/vnc/.gitignore
 +vncext.c
 +xistubs.c
 +zlib.c
-Index: xorg-server-1.6.3.901/hw/dmx/vnc/Makefile.am
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/dmx/vnc/Makefile.am
+--- xorg-server-1.7.4/hw/dmx/vnc/Makefile.am
++++ xorg-server-1.7.4/hw/dmx/vnc/Makefile.am
 @@ -0,0 +1,43 @@
 +noinst_LIBRARIES = libdmxvnc.a
 +
@@ -401,10 +377,8 @@ Index: xorg-server-1.6.3.901/hw/dmx/vnc/Makefile.am
 +            @DMXMODULES_CFLAGS@
 +
 +###EXTRA_DIST = dmxdetach.c
-Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncInit.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/dmx/vnc/vncInit.c
+--- xorg-server-1.7.4/hw/dmx/vnc/vncInit.c
++++ xorg-server-1.7.4/hw/dmx/vnc/vncInit.c
 @@ -0,0 +1,453 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -859,10 +833,8 @@ Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncInit.c
 +    rfbCheckFds(pScreen);
 +    httpCheckFds(pScreen);
 +}
-Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncint.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/dmx/vnc/vncint.h
+--- xorg-server-1.7.4/hw/dmx/vnc/vncint.h
++++ xorg-server-1.7.4/hw/dmx/vnc/vncint.h
 @@ -0,0 +1,153 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -1017,10 +989,8 @@ Index: xorg-server-1.6.3.901/hw/dmx/vnc/vncint.h
 +
 +#endif /* _VNCINT_H_ */
 +
-Index: xorg-server-1.6.3.901/hw/vnc/LICENCE.TXT
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/LICENCE.TXT
+--- xorg-server-1.7.4/hw/vnc/LICENCE.TXT
++++ xorg-server-1.7.4/hw/vnc/LICENCE.TXT
 @@ -0,0 +1,340 @@
 +		    GNU GENERAL PUBLIC LICENSE
 +		       Version 2, June 1991
@@ -1362,10 +1332,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/LICENCE.TXT
 +consider it more useful to permit linking proprietary applications with the
 +library.  If this is what you want to do, use the GNU Library General
 +Public License instead of this License.
-Index: xorg-server-1.6.3.901/hw/vnc/Makefile.am
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/Makefile.am
+--- xorg-server-1.7.4/hw/vnc/Makefile.am
++++ xorg-server-1.7.4/hw/vnc/Makefile.am
 @@ -0,0 +1,54 @@
 +# XXX This Makefile.am probably needs some work.
 +
@@ -1421,10 +1389,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/Makefile.am
 +
 +relink:
 +	rm -f Xvnc && $(MAKE) Xvnc
-Index: xorg-server-1.6.3.901/hw/vnc/README
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/README
+--- xorg-server-1.7.4/hw/vnc/README
++++ xorg-server-1.7.4/hw/vnc/README
 @@ -0,0 +1,14 @@
 +
 +This is the directory containing the code specific to the TightVNC X server (Xvnc).
@@ -1440,10 +1406,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/README
 +
 +Moved to X.org modular tree by Brian Paul.
 +
-Index: xorg-server-1.6.3.901/hw/vnc/auth.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/auth.c
+--- xorg-server-1.7.4/hw/vnc/auth.c
++++ xorg-server-1.7.4/hw/vnc/auth.c
 @@ -0,0 +1,566 @@
 +/*
 + * auth.c - deal with authentication.
@@ -2011,10 +1975,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/auth.c
 +    return pVNC->rfbAuthTooManyTries;
 +}
 +
-Index: xorg-server-1.6.3.901/hw/vnc/cmap.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/cmap.c
+--- xorg-server-1.7.4/hw/vnc/cmap.c
++++ xorg-server-1.7.4/hw/vnc/cmap.c
 @@ -0,0 +1,166 @@
 +/*
 + * cmap.c
@@ -2182,10 +2144,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cmap.c
 +    pmap->pScreen->StoreColors = rfbStoreColors;
 +#endif
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/corre.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/corre.c
+--- xorg-server-1.7.4/hw/vnc/corre.c
++++ xorg-server-1.7.4/hw/vnc/corre.c
 @@ -0,0 +1,353 @@
 +/*
 + * corre.c
@@ -2540,10 +2500,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/corre.c
 +  
 +  return maxclr;
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/cursor.c
+--- xorg-server-1.7.4/hw/vnc/cursor.c
++++ xorg-server-1.7.4/hw/vnc/cursor.c
 @@ -0,0 +1,407 @@
 +/*
 + * cursor.c - support for cursor shape updates.
@@ -2952,10 +2910,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cursor.c
 +DEFINE_RICH_ENCODE(16)
 +DEFINE_RICH_ENCODE(32)
 +
-Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/cutpaste.c
+--- xorg-server-1.7.4/hw/vnc/cutpaste.c
++++ xorg-server-1.7.4/hw/vnc/cutpaste.c
 @@ -0,0 +1,87 @@
 +/*
 + * cutpaste.c - routines to deal with cut & paste buffers / selection.
@@ -3044,10 +3000,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/cutpaste.c
 +    if (!inSetXCutText)
 +	rfbSendServerCutText(str, len);
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/d3des.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/d3des.c
+--- xorg-server-1.7.4/hw/vnc/d3des.c
++++ xorg-server-1.7.4/hw/vnc/d3des.c
 @@ -0,0 +1,437 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -3486,10 +3440,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/d3des.c
 + *
 + * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
 + **********************************************************************/
-Index: xorg-server-1.6.3.901/hw/vnc/d3des.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/d3des.h
+--- xorg-server-1.7.4/hw/vnc/d3des.h
++++ xorg-server-1.7.4/hw/vnc/d3des.h
 @@ -0,0 +1,51 @@
 +/*
 + * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -3542,10 +3494,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/d3des.h
 +
 +/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
 + ********************************************************************/
-Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/dispcur.c
+--- xorg-server-1.7.4/hw/vnc/dispcur.c
++++ xorg-server-1.7.4/hw/vnc/dispcur.c
 @@ -0,0 +1,792 @@
 +/*
 + * dispcur.c
@@ -4339,10 +4289,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/dispcur.c
 +			    0, 0, w, h, x, y);
 +    return TRUE;
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/dpmsstubs.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/dpmsstubs.c
+--- xorg-server-1.7.4/hw/vnc/dpmsstubs.c
++++ xorg-server-1.7.4/hw/vnc/dpmsstubs.c
 @@ -0,0 +1,52 @@
 +/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */
 +/*****************************************************************
@@ -4392,14 +4340,12 @@ Index: xorg-server-1.6.3.901/hw/vnc/dpmsstubs.c
 +    return -1;
 +}
 +
-+void DPMSSet(int level)
++int DPMSSet(ClientPtr client, int level)
 +{
-+
++    return FALSE;
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/draw.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/draw.c
+--- xorg-server-1.7.4/hw/vnc/draw.c
++++ xorg-server-1.7.4/hw/vnc/draw.c
 @@ -0,0 +1,2021 @@
 +/*
 + * draw.c - drawing routines for the RFB X server.  This is a set of
@@ -6422,10 +6368,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/draw.c
 +    VNCSCREENPTR(pScreen);
 +    SCHEDULE_FB_UPDATE(pScreen, pVNC);
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/hextile.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/hextile.c
+--- xorg-server-1.7.4/hw/vnc/hextile.c
++++ xorg-server-1.7.4/hw/vnc/hextile.c
 @@ -0,0 +1,350 @@
 +/*
 + * hextile.c
@@ -6777,10 +6721,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/hextile.c
 +DEFINE_SEND_HEXTILES(8)
 +DEFINE_SEND_HEXTILES(16)
 +DEFINE_SEND_HEXTILES(32)
-Index: xorg-server-1.6.3.901/hw/vnc/httpd.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/httpd.c
+--- xorg-server-1.7.4/hw/vnc/httpd.c
++++ xorg-server-1.7.4/hw/vnc/httpd.c
 @@ -0,0 +1,519 @@
 +/*
 + * httpd.c - a simple HTTP server
@@ -7301,10 +7243,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/httpd.c
 +    return TRUE;
 +}
 +
-Index: xorg-server-1.6.3.901/hw/vnc/init.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/init.c
+--- xorg-server-1.7.4/hw/vnc/init.c
++++ xorg-server-1.7.4/hw/vnc/init.c
 @@ -0,0 +1,1078 @@
 +/*
 + * init.c
@@ -8384,10 +8324,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/init.c
 +    rfbLog("");
 +    perror(str);
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/kbdptr.c
+--- xorg-server-1.7.4/hw/vnc/kbdptr.c
++++ xorg-server-1.7.4/hw/vnc/kbdptr.c
 @@ -0,0 +1,458 @@
 +/*
 + * kbdptr.c - deal with keyboard and pointer device over TCP & UDP.
@@ -8847,10 +8785,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/kbdptr.c
 +        break;
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/keyboard.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/keyboard.h
+--- xorg-server-1.7.4/hw/vnc/keyboard.h
++++ xorg-server-1.7.4/hw/vnc/keyboard.h
 @@ -0,0 +1,167 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -9019,10 +8955,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/keyboard.h
 +};
 +
 +#define N_PREDEFINED_KEYS (sizeof(map) / (sizeof(KeySym) * GLYPHS_PER_KEY))
-Index: xorg-server-1.6.3.901/hw/vnc/loginauth.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/loginauth.c
+--- xorg-server-1.7.4/hw/vnc/loginauth.c
++++ xorg-server-1.7.4/hw/vnc/loginauth.c
 @@ -0,0 +1,143 @@
 +/*
 + * loginauth.c - deal with login-style Unix authentication.
@@ -9167,10 +9101,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/loginauth.c
 +    cl->state = RFB_INITIALISATION;
 +}
 +
-Index: xorg-server-1.6.3.901/hw/vnc/rdp.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rdp.c
+--- xorg-server-1.7.4/hw/vnc/rdp.c
++++ xorg-server-1.7.4/hw/vnc/rdp.c
 @@ -0,0 +1,147 @@
 +/*
 + *  Copyright (C) 2004 Alan Hourihane.  All Rights Reserved.
@@ -9319,10 +9251,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rdp.c
 +	rdpNewClient(pScreen, sock);
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/rfb.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rfb.h
+--- xorg-server-1.7.4/hw/vnc/rfb.h
++++ xorg-server-1.7.4/hw/vnc/rfb.h
 @@ -0,0 +1,751 @@
 +/*
 + * rfb.h - header file for RFB DDX implementation.
@@ -10071,14 +10001,12 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfb.h
 +
 +extern Bool DPMSSupported(void);
 +extern int DPSMGet(int *level);
-+extern void DPMSSet(int level);
++extern int DPMSSet(ClientPtr client, int level);
 +
 +
 +#endif /* RFB_H_INCLUDED */
-Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
+--- xorg-server-1.7.4/hw/vnc/rfbkeyb.c
++++ xorg-server-1.7.4/hw/vnc/rfbkeyb.c
 @@ -0,0 +1,405 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -10485,10 +10413,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbkeyb.c
 +
 +#endif /* XFree86LOADER */
 +#endif
-Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
+--- xorg-server-1.7.4/hw/vnc/rfbmouse.c
++++ xorg-server-1.7.4/hw/vnc/rfbmouse.c
 @@ -0,0 +1,260 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -10750,10 +10676,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbmouse.c
 +
 +#endif /* XFree86LOADER */
 +#endif
-Index: xorg-server-1.6.3.901/hw/vnc/rfbproto.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rfbproto.h
+--- xorg-server-1.7.4/hw/vnc/rfbproto.h
++++ xorg-server-1.7.4/hw/vnc/rfbproto.h
 @@ -0,0 +1,1362 @@
 +/*
 + *  Copyright (C) 2000-2004 Constantin Kaplinsky. All Rights Reserved.
@@ -12117,10 +12041,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbproto.h
 +    rfbChromiumStopMsg csd;
 +    rfbChromiumExposeMsg cse;
 +} rfbClientToServerMsg;
-Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rfbserver.c
+--- xorg-server-1.7.4/hw/vnc/rfbserver.c
++++ xorg-server-1.7.4/hw/vnc/rfbserver.c
 @@ -0,0 +1,2308 @@
 +/*
 + * rfbserver.c - deal with server-side of the RFB protocol.
@@ -14430,10 +14352,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rfbserver.c
 +	rfbDisconnectUDPSock(pScreen);
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/rre.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/rre.c
+--- xorg-server-1.7.4/hw/vnc/rre.c
++++ xorg-server-1.7.4/hw/vnc/rre.c
 @@ -0,0 +1,324 @@
 +/*
 + * rre.c
@@ -14759,10 +14679,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/rre.c
 +  
 +  return maxclr;
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/sockets.c
+--- xorg-server-1.7.4/hw/vnc/sockets.c
++++ xorg-server-1.7.4/hw/vnc/sockets.c
 @@ -0,0 +1,656 @@
 +/*
 + * sockets.c - deal with TCP & UDP sockets.
@@ -15420,10 +15338,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
 +    return TRUE;
 +}
 +#endif
-Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/sprite.c
+--- xorg-server-1.7.4/hw/vnc/sprite.c
++++ xorg-server-1.7.4/hw/vnc/sprite.c
 @@ -0,0 +1,2279 @@
 +/*
 + * sprite.c
@@ -17704,10 +17620,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.c
 +    *py = pScreenPriv->y;
 +}
 +
-Index: xorg-server-1.6.3.901/hw/vnc/sprite.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/sprite.h
+--- xorg-server-1.7.4/hw/vnc/sprite.h
++++ xorg-server-1.7.4/hw/vnc/sprite.h
 @@ -0,0 +1,141 @@
 +/*
 + * sprite.h
@@ -17850,10 +17764,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/sprite.h
 +    int *       /*py*/
 +#endif
 +);
-Index: xorg-server-1.6.3.901/hw/vnc/spritest.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/spritest.h
+--- xorg-server-1.7.4/hw/vnc/spritest.h
++++ xorg-server-1.7.4/hw/vnc/spritest.h
 @@ -0,0 +1,138 @@
 +/*
 + * spritest.h
@@ -17993,10 +17905,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/spritest.h
 +
 +#define LINE_OVERLAP(pCbox,x1,y1,x2,y2,lw2) \
 +    BOX_OVERLAP((pCbox), (x1)-(lw2), (y1)-(lw2), (x2)+(lw2), (y2)+(lw2))
-Index: xorg-server-1.6.3.901/hw/vnc/stats.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/stats.c
+--- xorg-server-1.7.4/hw/vnc/stats.c
++++ xorg-server-1.7.4/hw/vnc/stats.c
 @@ -0,0 +1,117 @@
 +/*
 + * stats.c
@@ -18115,10 +18025,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/stats.c
 +			   cl->rfbLastRectBytesSent));
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/symlink-vnc.sh
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/symlink-vnc.sh
+--- xorg-server-1.7.4/hw/vnc/symlink-vnc.sh
++++ xorg-server-1.7.4/hw/vnc/symlink-vnc.sh
 @@ -0,0 +1,198 @@
 +#!/bin/sh
 +
@@ -18318,10 +18226,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/symlink-vnc.sh
 +}
 +
 +main $1 $2
-Index: xorg-server-1.6.3.901/hw/vnc/tableinitcmtemplate.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/tableinitcmtemplate.c
+--- xorg-server-1.7.4/hw/vnc/tableinitcmtemplate.c
++++ xorg-server-1.7.4/hw/vnc/tableinitcmtemplate.c
 @@ -0,0 +1,93 @@
 +/*
 + * tableinitcmtemplate.c - template for initialising lookup tables for
@@ -18416,10 +18322,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/tableinitcmtemplate.c
 +#undef OUT_T
 +#undef SwapOUT
 +#undef rfbInitColourMapSingleTableOUT
-Index: xorg-server-1.6.3.901/hw/vnc/tableinittctemplate.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/tableinittctemplate.c
+--- xorg-server-1.7.4/hw/vnc/tableinittctemplate.c
++++ xorg-server-1.7.4/hw/vnc/tableinittctemplate.c
 @@ -0,0 +1,146 @@
 +/*
 + * tableinittctemplate.c - template for initialising lookup tables for
@@ -18567,10 +18471,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/tableinittctemplate.c
 +#undef rfbInitTrueColourSingleTableOUT
 +#undef rfbInitTrueColourRGBTablesOUT
 +#undef rfbInitOneRGBTableOUT
-Index: xorg-server-1.6.3.901/hw/vnc/tabletranstemplate.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/tabletranstemplate.c
+--- xorg-server-1.7.4/hw/vnc/tabletranstemplate.c
++++ xorg-server-1.7.4/hw/vnc/tabletranstemplate.c
 @@ -0,0 +1,135 @@
 +/*
 + * tabletranstemplate.c - template for translation using lookup tables.
@@ -18707,10 +18609,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/tabletranstemplate.c
 +#undef OUT_T
 +#undef rfbTranslateWithSingleTableINtoOUT
 +#undef rfbTranslateWithRGBTablesINtoOUT
-Index: xorg-server-1.6.3.901/hw/vnc/tight.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/tight.c
+--- xorg-server-1.7.4/hw/vnc/tight.c
++++ xorg-server-1.7.4/hw/vnc/tight.c
 @@ -0,0 +1,1827 @@
 +/*
 + * tight.c
@@ -20539,10 +20439,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/tight.c
 +    cinfo->dest = &jpegDstManager;
 +}
 +
-Index: xorg-server-1.6.3.901/hw/vnc/translate.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/translate.c
+--- xorg-server-1.7.4/hw/vnc/translate.c
++++ xorg-server-1.7.4/hw/vnc/translate.c
 @@ -0,0 +1,502 @@
 +/*
 + * translate.c - translate between different pixel formats
@@ -21046,10 +20944,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/translate.c
 +	}
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/vncauth.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/vncauth.c
+--- xorg-server-1.7.4/hw/vnc/vncauth.c
++++ xorg-server-1.7.4/hw/vnc/vncauth.c
 @@ -0,0 +1,252 @@
 +/*
 + *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
@@ -21303,10 +21199,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncauth.c
 +	des(bytes+i, bytes+i);
 +    }
 +}
-Index: xorg-server-1.6.3.901/hw/vnc/vncauth.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/vncauth.h
+--- xorg-server-1.7.4/hw/vnc/vncauth.h
++++ xorg-server-1.7.4/hw/vnc/vncauth.h
 @@ -0,0 +1,33 @@
 +/*
 + *  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
@@ -21341,10 +21235,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncauth.h
 +extern int vncEncryptAndStorePasswd2(char *passwd, char *passwdViewOnly, char *fname);
 +extern int vncDecryptPasswdFromFile2(char *fname, char *passwdFullControl, char *passwdViewOnly);
 +
-Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/vncext.c
+--- xorg-server-1.7.4/hw/vnc/vncext.c
++++ xorg-server-1.7.4/hw/vnc/vncext.c
 @@ -0,0 +1,800 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -22146,10 +22038,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/vncext.c
 +	(EventSwapPtr)SwapVncChromiumConnectedEvent;
 +#endif
 +} /* VncExtensionInit */
-Index: xorg-server-1.6.3.901/hw/vnc/xistubs.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/xistubs.c
+--- xorg-server-1.7.4/hw/vnc/xistubs.c
++++ xorg-server-1.7.4/hw/vnc/xistubs.c
 @@ -0,0 +1,323 @@
 +/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */
 +
@@ -22474,10 +22364,8 @@ Index: xorg-server-1.6.3.901/hw/vnc/xistubs.c
 +	    return (BadMatch);
 +	}
 +    }
-Index: xorg-server-1.6.3.901/hw/vnc/zlib.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/vnc/zlib.c
+--- xorg-server-1.7.4/hw/vnc/zlib.c
++++ xorg-server-1.7.4/hw/vnc/zlib.c
 @@ -0,0 +1,310 @@
 +/*
 + * zlib.c
@@ -22789,11 +22677,9 @@ Index: xorg-server-1.6.3.901/hw/vnc/zlib.c
 +}
 +
 +
-Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/Makefile.am
-+++ xorg-server-1.6.3.901/hw/xfree86/Makefile.am
-@@ -4,6 +4,10 @@ if DRI
+--- xorg-server-1.7.4/hw/xfree86/Makefile.am
++++ xorg-server-1.7.4/hw/xfree86/Makefile.am
+@@ -4,6 +4,10 @@
  DRI_SUBDIR = dri
  endif
  
@@ -22804,27 +22690,25 @@ Index: xorg-server-1.6.3.901/hw/xfree86/Makefile.am
  if DRI2
  DRI2_SUBDIR = dri2
  endif
-@@ -16,13 +20,13 @@ DOC_SUBDIR = doc
+@@ -32,13 +36,13 @@
  
- SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser \
- 	  ramdac shadowfb vbe vgahw xaa \
+ SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
+ 	  ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
 -	  xf8_16bpp loader dixmods exa modes \
 +	  xf8_16bpp loader dixmods exa modes $(VNC_SUBDIR) \
  	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
  
- DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
+ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
                 parser ramdac shadowfb vbe vgahw xaa \
                 xf8_16bpp loader dixmods dri dri2 exa modes \
 -	       utils doc
 +	       utils doc vnc
  
  bin_PROGRAMS = Xorg
- 
-Index: xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/dixmods/Makefile.am
-+++ xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
-@@ -10,6 +10,10 @@ if DBE
+ Xorg_SOURCES = xorg.c
+--- xorg-server-1.7.4/hw/xfree86/dixmods/Makefile.am
++++ xorg-server-1.7.4/hw/xfree86/dixmods/Makefile.am
+@@ -10,6 +10,10 @@
  DBEMOD = libdbe.la
  endif
  
@@ -22835,7 +22719,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
  if RECORD
  RECORDMOD = librecord.la
  endif
-@@ -21,11 +25,13 @@ module_LTLIBRARIES = libfb.la \
+@@ -21,11 +25,13 @@
  extsmoduledir = $(moduledir)/extensions
  extsmodule_LTLIBRARIES = $(RECORDMOD) \
  			 $(DBEMOD) \
@@ -22849,7 +22733,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
             -I$(top_srcdir)/hw/xfree86/loader \
             -I$(top_srcdir)/miext/shadow \
             -I$(top_srcdir)/glx
-@@ -34,6 +40,10 @@ libdbe_la_LDFLAGS = -avoid-version
+@@ -34,6 +40,10 @@
  libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
  libdbe_la_SOURCES = dbemodule.c
  
@@ -22860,10 +22744,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/dixmods/Makefile.am
  libfb_la_LDFLAGS = -avoid-version
  libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
  libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/.gitignore
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/.gitignore
+--- xorg-server-1.7.4/hw/xfree86/vnc/.gitignore
++++ xorg-server-1.7.4/hw/xfree86/vnc/.gitignore
 @@ -0,0 +1,36 @@
 +auth.c
 +cmap.c
@@ -22901,10 +22783,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/.gitignore
 +vncext.c
 +xistubs.c
 +zlib.c
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/Makefile.am
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/Makefile.am
+--- xorg-server-1.7.4/hw/xfree86/vnc/Makefile.am
++++ xorg-server-1.7.4/hw/xfree86/vnc/Makefile.am
 @@ -0,0 +1,51 @@
 +AM_CFLAGS = $(DIX_CFLAGS)
 +
@@ -22957,16 +22837,12 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/Makefile.am
 +	zlib.c
 +
 +#sdk_HEADERS = vncint.h
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/README
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/README
+--- xorg-server-1.7.4/hw/xfree86/vnc/README
++++ xorg-server-1.7.4/hw/xfree86/vnc/README
 @@ -0,0 +1 @@
 +This directory contains the sources for building the vnc.so server extension module.
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
+--- xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c
++++ xorg-server-1.7.4/hw/xfree86/vnc/vncInit.c
 @@ -0,0 +1,618 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -23586,10 +23462,8 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncInit.c
 +    return (pointer)TRUE;
 +}
 +#endif
-Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncint.h
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/hw/xfree86/vnc/vncint.h
+--- xorg-server-1.7.4/hw/xfree86/vnc/vncint.h
++++ xorg-server-1.7.4/hw/xfree86/vnc/vncint.h
 @@ -0,0 +1,151 @@
 +/*
 + *  Copyright (C) 2002 Alan Hourihane.  All Rights Reserved.
@@ -23742,11 +23616,9 @@ Index: xorg-server-1.6.3.901/hw/xfree86/vnc/vncint.h
 +
 +#endif /* _VNC_H_ */
 +
-Index: xorg-server-1.6.3.901/mi/miinitext.c
-===================================================================
---- xorg-server-1.6.3.901.orig/mi/miinitext.c
-+++ xorg-server-1.6.3.901/mi/miinitext.c
-@@ -78,6 +78,18 @@ SOFTWARE.
+--- xorg-server-1.7.4/mi/miinitext.c
++++ xorg-server-1.7.4/mi/miinitext.c
+@@ -90,6 +90,18 @@
  #undef XF86VIDMODE
  #endif
  
@@ -23765,10 +23637,8 @@ Index: xorg-server-1.6.3.901/mi/miinitext.c
  #include "misc.h"
  #include "extension.h"
  #include "micmap.h"
-Index: xorg-server-1.6.3.901/xcliplist/Makefile.am
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/xcliplist/Makefile.am
+--- xorg-server-1.7.4/xcliplist/Makefile.am
++++ xorg-server-1.7.4/xcliplist/Makefile.am
 @@ -0,0 +1,18 @@
 +#noinst_LTLIBRARIES = libxcliplist.la
 +libxcliplist_la_LTLIBRARIES = libxcliplist.la
@@ -23788,10 +23658,8 @@ Index: xorg-server-1.6.3.901/xcliplist/Makefile.am
 +if XORG
 +sdk_HEADERS =
 +endif
-Index: xorg-server-1.6.3.901/xcliplist/cliplist.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/xcliplist/cliplist.c
+--- xorg-server-1.7.4/xcliplist/cliplist.c
++++ xorg-server-1.7.4/xcliplist/cliplist.c
 @@ -0,0 +1,128 @@
 +/*
 + * Server-side code for the Xcliplist extension
@@ -23921,10 +23789,8 @@ Index: xorg-server-1.6.3.901/xcliplist/cliplist.c
 +      XClipListErrorBase = extEntry->errorBase;
 +   }
 +}
-Index: xorg-server-1.6.3.901/xcliplist/cliplistmod.c
-===================================================================
---- /dev/null
-+++ xorg-server-1.6.3.901/xcliplist/cliplistmod.c
+--- xorg-server-1.7.4/xcliplist/cliplistmod.c
++++ xorg-server-1.7.4/xcliplist/cliplistmod.c
 @@ -0,0 +1,46 @@
 +
 +#include "../hw/xfree86/common/xf86Module.h"
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 3cf8a0b..f10cc25 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Sat Jan 16 19:06:44 CET 2010 - sndirsch@suse.de
+
+- set VIDEO_ABI_VERSION = 6 and INPUT_ABI_VERSION = 7 in specfile
+
+-------------------------------------------------------------------
+Thu Jan 14 01:37:00 CET 2010 - ro@suse.de
+
+- update to 1.7.4
+  - obsoletes acpi_events.diff 
+  - obsoletes loadmod-bug197195.diff
+  - obsoletes events.diff
+  - obsoletes acpi-warning.diff
+  - obsoletes fbdev_fallback_fail_fix.diff
+  - obsoletes bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
+  - obsoletes keyrelease-1.5.2.diff
+  - obsoletes 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
+  - obsoletes 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
+  - obsoletes bug532341.diff
+  - obsoletes no-return-in-nonvoid-function.diff
+  - adjusted 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
+  - adjusted bitmap_always_unscaled.diff
+  - adjusted bug-197858_dpms.diff
+  - adjusted cache-xkbcomp-output-for-fast-start-up.patch
+  - adjusted driver-autoconfig.diff
+  - adjusted fixed-SYNC-extension-trigger-BlockHandler-test.diff
+  - adjusted fpic.diff
+  - adjusted missing_font_paths.diff
+  - adjusted p_default-module-path.diff
+  - adjusted p_ia64-console.diff
+  - adjusted p_xorg_acpi.diff
+  - adjusted xorg-detect-psb.patch
+  - adjusted xorg-server-xf4vnc-disable-dmxvnc.diff
+  - adjusted xorg-server-xf4vnc-fix.diff
+  - adjusted xorg-server-xf4vnc.patch
+  - adjusted xorg-x11-server.changes
+  - adjusted xorg-x11-server.spec
+  - adjusted zap_warning_xserver.diff
+- removed truetype_fontpath.diff
+- removed libdri_noPanoramiXExtension_symbol.patch
+- exa-greedy.diff not applied
+- fixed xorg-detect-psb.patch:
+  rewrite to use second level switch statement for device_id
+- /usr/$lib/X11/Options is gone
+  (Remove xorgcfg 'Options' list.)
+
 -------------------------------------------------------------------
 Sun Dec 13 11:52:48 CET 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c67e55f..5483798 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server (Version 7.4)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define moblin 0
 
 Name:           xorg-x11-server
-%define dirsuffix 1.6.5
+%define dirsuffix 1.7.4
 %define fglrx_driver_hack 0
 ### FIXME
 %define vnc 1
@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        64
+Release:        65
 License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -43,8 +43,8 @@ PreReq:         %fillup_prereq
 Requires:       pkgconfig xorg-x11-fonts-core xorg-x11
 %if %suse_version > 1010
 %ifnarch s390 s390x
-Provides:       VIDEO_ABI_VERSION = 5
-Provides:       INPUT_ABI_VERSION = 4
+Provides:       VIDEO_ABI_VERSION = 6
+Provides:       INPUT_ABI_VERSION = 7
 Requires:       libpixman-1-0 >= 0.15.2
 %endif
 %endif
@@ -73,7 +73,6 @@ Patch18:        p_ia64-console.diff
 Patch23:        disable-fbblt-opt.diff
 Patch27:        mouse.diff
 Patch29:        xephyr.diff
-Patch32:        acpi_events.diff
 Patch34:        p_pci-off-by-one.diff.ia64
 Patch36:        libdrm.diff
 %if %vnc
@@ -88,7 +87,6 @@ Patch46:        xorg-server-xf4vnc-busyloop.diff
 Patch47:        xorg-server-xf4vnc-clientTimeout.diff
 Patch48:        xorg-server-xf4vnc-fix.diff
 %endif
-Patch41:        loadmod-bug197195.diff
 Patch45:        bug-197858_dpms.diff
 Patch63:        xorg-x11-server-1.2.99-unbreak-domain.patch
 Patch67:        xorg-docs.diff
@@ -100,10 +98,7 @@ Patch101:       zap_warning_xserver.diff
 Patch103:       confine_to_shape.diff
 Patch104:       bitmap_always_unscaled.diff
 Patch106:       randr1_1-sig11.diff
-Patch109:       events.diff
 Patch112:       fix-dpi-values.diff
-Patch113:       no-return-in-nonvoid-function.diff
-Patch117:       acpi-warning.diff
 Patch118:       exa-greedy.diff
 Patch123:       vidmode-sig11.diff
 Patch125:       0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
@@ -111,15 +106,10 @@ Patch127:       dpms_screensaver.diff
 Patch128:       pci-legacy-mem-fallback.diff
 Patch129:       bug474071-fix1.diff
 Patch132:       fixed-SYNC-extension-trigger-BlockHandler-test.diff
-Patch140:       fbdev_fallback_fail_fix.diff
-Patch142:       bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
 Patch143:       autoconfig_fallback_fbdev_first.diff
-Patch144:       keyrelease-1.5.2.diff
 Patch145:       driver-autoconfig.diff
-Patch147:       truetype_fontpath.diff
 Patch148:       commit-c941479.diff
 # Moblin
-Patch161:       libdri_noPanoramiXExtension_symbol.patch
 Patch162:       cache-xkbcomp-output-for-fast-start-up.patch
 %if %moblin
 Patch163:       xserver-1.5.0-bg-none-root.patch
@@ -136,10 +126,7 @@ Patch169:       moblin-xorg-x11-nonroot-vesa.patch
 Patch170:       xserver-boottime.patch
 Patch171:       moblin-use_preferred_mode_for_all_outputs.diff
 %endif
-Patch190:       0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
-Patch191:       0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
 Patch200:       bug534768-prefer_local_symbols.patch
-Patch532341:    bug532341.diff
 Patch202:       0001-Check-harder-for-primary-PCI-device.patch
 Patch203:       0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
 Patch204:       missing_font_paths.diff
@@ -214,8 +201,6 @@ popd
 %patch23
 %patch27
 %patch29
-### Bug 197572: X.Org PCI/IA64 patches
-%patch32 -p1
 ### FIXME
 #%patch34 -p0
 %patch36 -p0
@@ -230,7 +215,6 @@ popd
 %patch48 -p1
 chmod 755 hw/vnc/symlink-vnc.sh
 %endif
-%patch41 -p1
 %patch45 -p0
 ### FIXME
 #%patch63 -p1
@@ -246,11 +230,8 @@ popd
 %patch103
 %patch104 -p1
 %patch106 -p1
-%patch109 -p1
 %patch112 -p0
-%patch113 -p0
-%patch117
-%patch118 -p1
+#patch118 -p1
 %patch123 -p0
 %patch125 -p1
 %patch127 -p1
@@ -259,15 +240,10 @@ pushd hw/xfree86/os-support/bus
 %patch129 -p0
 popd
 %patch132 -p1
-%patch140 -p1
-%patch142 -p1
 %patch143 -p0
-%patch144 -p1
 %patch145 -p0
-%patch147 -p0
 ### Bug #528397
 #%patch148 -p1 -R
-%patch161 -p1
 %patch162 -p1
 %if %moblin
 %patch163 -p1
@@ -282,10 +258,7 @@ popd
 %patch171 -p1
 %endif
 #
-%patch190 -p1
-%patch191 -p1
 %patch200 -p1
-%patch532341 -p1
 %patch202 -p1
 %patch203 -p1
 %patch204 -p0
@@ -541,9 +514,9 @@ exit 0
 %dir /etc/modprobe.d
 /etc/modprobe.d/50-nvidia.conf
 %endif
-%ifarch ppc64 x86_64
-%dir /usr/%{_lib}/X11
-%endif
+#%ifarch ppc64 x86_64
+#%dir /usr/%{_lib}/X11
+#%endif
 %dir /usr/%{_lib}/xorg
 %ifnarch s390 s390x
 %dir /var/lib/X11
@@ -571,7 +544,7 @@ exit 0
 /usr/bin/gtf
 %endif
 %ifnarch s390 s390x
-/usr/%{_lib}/X11/*
+#/usr/%{_lib}/X11/*
 /usr/%{_lib}/xorg/modules/
 %{_mandir}/man4/*
 %endif
diff --git a/zap_warning_xserver.diff b/zap_warning_xserver.diff
index 396972d..38ba2b0 100644
--- a/zap_warning_xserver.diff
+++ b/zap_warning_xserver.diff
@@ -1,8 +1,8 @@
 Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
-@@ -706,6 +706,7 @@ typedef enum {
+================================================================================
+--- xorg-server-1.7.4/hw/xfree86/common/xf86Config.c
++++ xorg-server-1.7.4/hw/xfree86/common/xf86Config.c
+@@ -679,6 +679,7 @@
      FLAG_NOTRAPSIGNALS,
      FLAG_DONTVTSWITCH,
      FLAG_DONTZAP,
@@ -10,7 +10,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
      FLAG_DONTZOOM,
      FLAG_DISABLEVIDMODE,
      FLAG_ALLOWNONLOCAL,
-@@ -743,6 +744,8 @@ static OptionInfoRec FlagOptions[] = {
+@@ -717,6 +718,8 @@
  	{0}, FALSE },
    { FLAG_DONTZAP,		"DontZap",			OPTV_BOOLEAN,
  	{0}, FALSE },
@@ -19,7 +19,7 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
    { FLAG_DONTZOOM,		"DontZoom",			OPTV_BOOLEAN,
  	{0}, FALSE },
    { FLAG_DISABLEVIDMODE,	"DisableVidModeExtension",	OPTV_BOOLEAN,
-@@ -855,6 +858,7 @@ configServerFlags(XF86ConfFlagsPtr flags
+@@ -823,6 +826,7 @@
      xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
      xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
      xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
@@ -27,12 +27,10 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c
      xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
  
      xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Events.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
-@@ -191,12 +191,26 @@ xf86ProcessActionEvent(ActionEvent actio
- #endif
+--- xorg-server-1.7.4/hw/xfree86/common/xf86Events.c
++++ xorg-server-1.7.4/hw/xfree86/common/xf86Events.c
+@@ -180,12 +180,26 @@
+     DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
      switch (action) {
      case ACTION_TERMINATE:
 -	if (!xf86Info.dontZap) {
@@ -62,50 +60,40 @@ Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Events.c
  	break;
      case ACTION_NEXT_MODE:
  	if (!xf86Info.dontZoom)
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Globals.c
-@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
-     .vtRequestsPending          = FALSE,
+--- xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c
++++ xorg-server-1.7.4/hw/xfree86/common/xf86Globals.c
+@@ -109,6 +109,7 @@
+ #endif
      .dontVTSwitch               = FALSE,
      .dontZap                    = FALSE,
 +    .ZapWarning                 = TRUE,
      .dontZoom                   = FALSE,
      .notrapSignals              = FALSE,
      .caughtSignal               = FALSE,
-Index: xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/common/xf86Privstr.h
-+++ xorg-server-1.6.3.901/hw/xfree86/common/xf86Privstr.h
-@@ -72,6 +72,7 @@ typedef struct {
-     Bool		vtRequestsPending;
+--- xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h
++++ xorg-server-1.7.4/hw/xfree86/common/xf86Privstr.h
+@@ -67,6 +67,7 @@
+ #endif
      Bool		dontVTSwitch;
      Bool		dontZap;
 +    Bool                ZapWarning;
      Bool		dontZoom;
      Bool		notrapSignals;	/* don't exit cleanly - die at fault */
      Bool		caughtSignal;
-Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/Xorg.man.pre
-+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/Xorg.man.pre
-@@ -452,8 +452,8 @@ are:
- Immediately kills the server -- no questions asked.  This is disabled by
- default.  It can be enabled with the -retro command line flag or by setting
- the
+--- xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre
++++ xorg-server-1.7.4/hw/xfree86/doc/man/Xorg.man.pre
+@@ -431,7 +431,7 @@
+ .B Ctrl+Alt+Backspace
+ Immediately kills the server -- no questions asked. It can be disabled by
+ setting the
 -.B DontZap
--__xconfigfile__(__filemansuffix__) file option to a FALSE value.
 +.B DontZap/ZapWarning
-+__xconfigfile__(__filemansuffix__) file options to a FALSE value.
+ __xconfigfile__(__filemansuffix__) file option to a TRUE value.
  .TP 8
  .B Ctrl+Alt+Keypad-Plus
- Change video mode to next one specified in the configuration file.
-Index: xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
-===================================================================
---- xorg-server-1.6.3.901.orig/hw/xfree86/doc/man/xorg.conf.man.pre
-+++ xorg-server-1.6.3.901/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -470,6 +470,13 @@ This action is normally used to terminat
+--- xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre
++++ xorg-server-1.7.4/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -479,6 +479,13 @@
  When this option is enabled, the action has no effect.
  Default: off.
  .TP 7