xorg-server: Version bump to 1.8.0 + DontLie.

[gentoo-draconx.git] / x11-base / xorg-server / files / 0001-xfree86-Add-DontLie-server-flag.patch

diff --git a/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch b/x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch
similarity index 91%
rename from x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
rename to x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch
index 7826994a28617b103b4be3ad97076ead0c2229dd..939aab1855a186f4f416093ad9213a606ba926e0 100644 (file)
--- a/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
+++ b/x11-base/xorg-server/files/0001-xfree86-Add-DontLie-server-flag.patch
@@ -1,4 +1,4 @@
-From 3f5e8e89ea149a105ac191e3b7ebee922f78868f Mon Sep 17 00:00:00 2001
+From 1557c71c858c7e16a54f959135faa1620cad11ab Mon Sep 17 00:00:00 2001
 From: Nick Bowler <nbowler@draconx.ca>
 Date: Wed, 6 Jan 2010 10:42:17 -0500
 Subject: [PATCH] xfree86: Add DontLie server flag.
@@ -21,10 +21,10 @@ Signed-off-by: Nick Bowler <nbowler@draconx.ca>
  5 files changed, 26 insertions(+), 1 deletions(-)
 
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 6fbf613..88c8a56 100644
+index 1e9543f..eb0b23e 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -703,7 +703,8 @@ typedef enum {
+@@ -715,7 +715,8 @@ typedef enum {
      FLAG_AUTO_ENABLE_DEVICES,
      FLAG_GLX_VISUALS,
      FLAG_DRI2,
@@ -34,7 +34,7 @@ index 6fbf613..88c8a56 100644
  } FlagValues;
  
  /**
-@@ -767,6 +768,8 @@ static OptionInfoRec FlagOptions[] = {
+@@ -779,6 +780,8 @@ static OptionInfoRec FlagOptions[] = {
        {0}, FALSE },
    { FLAG_USE_SIGIO,           "UseSIGIO",                     OPTV_BOOLEAN,
        {0}, FALSE },
@@ -43,7 +43,7 @@ index 6fbf613..88c8a56 100644
    { -1,                               NULL,                           OPTV_NONE,
        {0}, FALSE },
  };
-@@ -824,6 +827,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+@@ -836,6 +839,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
      xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
      xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
      xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
@@ -52,7 +52,7 @@ index 6fbf613..88c8a56 100644
      xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
      if (xf86Info.ignoreABI) {
 diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
-index 98f8284..c7d03a4 100644
+index 8b483f3..6402329 100644
 --- a/hw/xfree86/common/xf86Globals.c
 +++ b/hw/xfree86/common/xf86Globals.c
 @@ -110,6 +110,7 @@ xf86InfoRec xf86Info = {
@@ -77,10 +77,10 @@ index b2095aa..05166f9 100644
      Bool              caughtSignal;
  
 diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index f0a7373..21ea017 100644
+index f7ff6f6..e2e5a55 100644
 --- a/hw/xfree86/doc/man/xorg.conf.man.pre
 +++ b/hw/xfree86/doc/man/xorg.conf.man.pre
-@@ -490,6 +490,12 @@ When this option is enabled, those key sequences have no special meaning
+@@ -550,6 +550,12 @@ When this option is enabled, those key sequences have no special meaning
  and are passed to clients.
  Default: off.
  .TP 7
@@ -124,5 +124,5 @@ index 7ba09b6..c51857b 100644
            {
                /*
 -- 
-1.7.0
+1.7.0.4