ChangeLog | 393
configure.ac | 4
debian/changelog | 36
debian/control | 9
debian/patches/100_rethrow_signals.patch | 56
debian/patches/105_nvidia_fglrx_autodetect.patch | 8
debian/patches/111_armel-drv-fallbacks.patch | 4
debian/patches/122_xext_fix_card32_overflow_in_xauth.patch | 4
debian/patches/157_check_null_modes.patch | 4
debian/patches/162_null_crtc_in_rotation.patch | 4
debian/patches/165_man_xorg_conf_no_device_ident.patch | 4
debian/patches/166_nullptr_xinerama_keyrepeat.patch | 4
debian/patches/167_nullptr_xisbread.patch | 4
debian/patches/168_glibc_trace_to_stderr.patch | 6
debian/patches/172_cwgetbackingpicture_nullptr_check.patch | 4
debian/patches/188_default_primary_to_first_busid.patch | 4
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 12
debian/patches/191-Xorg-add-an-extra-module-path.patch | 20
debian/patches/198_nohwaccess.patch | 8
debian/patches/200_randr-null.patch | 4
debian/patches/208_switch_on_release.diff | 4
debian/patches/209_add_legacy_bgnone_option.patch | 4
debian/patches/210_pixman_null_ptr_check.patch | 4
debian/patches/214_glx_dri_searchdirs.patch | 40
debian/patches/217_revert_bgnonevisitwindow.patch | 4
debian/patches/219_fedora-pointer-barriers.diff | 173
debian/patches/220_xi21_always_deliver_raw_events.diff | 12
debian/patches/500_xi2.1.patch | 261
debian/patches/501_xf86CoordinatesToWindow.patch | 20
debian/patches/502_gestures-extension.patch | 68
debian/patches/503_fix_masked_transformed_valuators.patch | 20
debian/patches/504_fix_no_coords.patch | 8
debian/rules | 5
dix/getevents.c | 23
exa/exa_mixed.c | 23
glx/glxscreens.c | 7
glx/glxscreens.h | 1
hw/dmx/glxProxy/glxscreens.h | 1
hw/kdrive/ephyr/ephyrdriext.c | 4
hw/xfree86/common/xf86Config.c | 3
hw/xfree86/common/xf86Init.c | 32
hw/xfree86/common/xf86Option.c | 2
hw/xfree86/common/xf86Xinput.c | 1
hw/xquartz/GL/indirect.c | 18
hw/xquartz/X11Application.h | 3
hw/xquartz/X11Application.m | 47
hw/xquartz/X11Controller.h | 2
hw/xquartz/X11Controller.m | 18
hw/xquartz/bundle/Makefile.am | 9
hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib | 7414
++++-----
hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/English.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/French.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/French.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib | 633
hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/German.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/German.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib | 586
hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib | 7417
++++-----
hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib | 583
hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib | 7430
++++-----
hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/ar.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 375
hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/da.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/da.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib | 652
hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/el.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/el.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib | 3521
++++
hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/fi.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 421
hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/he.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/he.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib | 3523
++++
hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/ko.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib | 7371
++++-----
hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/no.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/no.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib | 325
hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/pl.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib | 7446
++++------
hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/pt.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib | 7417
++++-----
hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib | 416
hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/ru.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib | 7444
++++-----
hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/sk.lproj/locversion.plist | 14
hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib | 3522
++++
hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/sv.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib | 327
hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib | 7389
+++++----
hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings |binary
hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings |binary
hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist | 4
hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib | 581
hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib |binary
hw/xquartz/man/Xquartz.man | 3
hw/xquartz/xpr/dri.c | 61
hw/xquartz/xpr/xprFrame.c | 9
hw/xwin/glx/indirect.c | 8
include/input.h | 9
mi/mipointer.c | 2
randr/rrproperty.c | 2
145 files changed, 43723 insertions(+), 32701 deletions(-)
New commits:
commit edec367245d23f2cf0ff4c8b7bf7996138f58ce8
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Aug 24 12:58:53 2011 +0300
Refresh patches.
diff --git a/debian/changelog b/debian/changelog
index 9650721..204c337 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xorg-server (2:1.10.4-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable.
* debian/rules: Modify the patch stampdir creation.
* Update patch 500_xi2.1.patch to apply.
+ * Refresh patches.
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 01 Aug 2011
16:27:52 +1000
diff --git a/debian/patches/100_rethrow_signals.patch
b/debian/patches/100_rethrow_signals.patch
index 95b9108..5c6b153 100644
--- a/debian/patches/100_rethrow_signals.patch
+++ b/debian/patches/100_rethrow_signals.patch
@@ -1,7 +1,7 @@
Index: xorg-server/hw/dmx/dmxinit.c
===================================================================
---- xorg-server.orig/hw/dmx/dmxinit.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/hw/dmx/dmxinit.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/dmx/dmxinit.c 2011-08-24 12:52:45.965647148 +0300
++++ xorg-server/hw/dmx/dmxinit.c 2011-08-24 12:56:49.545650620 +0300
@@ -821,7 +821,7 @@
/** This function is called in Xserver/os/utils.c from \a AbortServer().
* We must ensure that backend and console state is restored in the
@@ -25,8 +25,8 @@ Index: xorg-server/hw/dmx/dmxinit.c
* main loop without an interruption. */
Index: xorg-server/hw/kdrive/src/kdrive.c
===================================================================
---- xorg-server.orig/hw/kdrive/src/kdrive.c 2011-04-09 10:36:57.000000000
+0300
-+++ xorg-server/hw/kdrive/src/kdrive.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/kdrive/src/kdrive.c 2011-08-24 12:52:45.985647150
+0300
++++ xorg-server/hw/kdrive/src/kdrive.c 2011-08-24 12:56:49.545650620 +0300
@@ -321,7 +321,7 @@
}
@@ -51,8 +51,8 @@ Index: xorg-server/hw/kdrive/src/kdrive.c
AbortDDX ();
Index: xorg-server/hw/vfb/InitOutput.c
===================================================================
---- xorg-server.orig/hw/vfb/InitOutput.c 2011-04-09 10:36:57.000000000
+0300
-+++ xorg-server/hw/vfb/InitOutput.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/vfb/InitOutput.c 2011-08-24 12:52:45.915647150
+0300
++++ xorg-server/hw/vfb/InitOutput.c 2011-08-24 12:56:49.545650620 +0300
@@ -201,11 +201,17 @@
}
@@ -74,8 +74,8 @@ Index: xorg-server/hw/vfb/InitOutput.c
DarwinHandleGUI(int argc, char *argv[])
Index: xorg-server/hw/xfree86/common/xf86Events.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Events.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Events.c 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xf86Events.c 2011-08-24
12:52:45.935647149 +0300
++++ xorg-server/hw/xfree86/common/xf86Events.c 2011-08-24 12:56:49.545650620
+0300
@@ -348,6 +348,8 @@
int
xf86SigWrapper(int signo)
@@ -87,9 +87,9 @@ Index: xorg-server/hw/xfree86/common/xf86Events.c
return 0; /* continue */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2011-04-09 10:44:50.000000000
+0300
-@@ -874,14 +874,17 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-08-24
12:52:45.925647148 +0300
++++ xorg-server/hw/xfree86/common/xf86Init.c 2011-08-24 12:57:56.115651567
+0300
+@@ -896,14 +896,17 @@
}
/*
@@ -109,7 +109,7 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
{
int i;
-@@ -908,24 +911,45 @@
+@@ -930,24 +933,45 @@
if (xorgHWOpenConsole)
xf86CloseConsole();
@@ -159,7 +159,7 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
{
int i;
-@@ -958,7 +982,20 @@
+@@ -980,7 +1004,20 @@
* This is needed for an abnormal server exit, since the normal exit stuff
* MUST also be performed (i.e. the vt must be left in a defined state)
*/
@@ -183,8 +183,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
void
Index: xorg-server/hw/xnest/Init.c
===================================================================
---- xorg-server.orig/hw/xnest/Init.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/hw/xnest/Init.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xnest/Init.c 2011-08-24 12:52:45.955647150 +0300
++++ xorg-server/hw/xnest/Init.c 2011-08-24 12:56:49.555650622 +0300
@@ -117,12 +117,17 @@
/*
* DDX - specific abort routine. Called by AbortServer().
@@ -206,8 +206,8 @@ Index: xorg-server/hw/xnest/Init.c
{
Index: xorg-server/hw/xquartz/darwin.c
===================================================================
---- xorg-server.orig/hw/xquartz/darwin.c 2011-04-09 10:36:57.000000000
+0300
-+++ xorg-server/hw/xquartz/darwin.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xquartz/darwin.c 2011-08-24 12:52:45.995647152
+0300
++++ xorg-server/hw/xquartz/darwin.c 2011-08-24 12:56:49.555650622 +0300
@@ -758,17 +758,22 @@
@@ -235,8 +235,8 @@ Index: xorg-server/hw/xquartz/darwin.c
#include "scrnintstr.h" // for struct _Screen
Index: xorg-server/hw/xwin/InitOutput.c
===================================================================
---- xorg-server.orig/hw/xwin/InitOutput.c 2011-04-09 10:36:57.000000000
+0300
-+++ xorg-server/hw/xwin/InitOutput.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xwin/InitOutput.c 2011-08-24 12:52:45.945647151
+0300
++++ xorg-server/hw/xwin/InitOutput.c 2011-08-24 12:56:49.555650622 +0300
@@ -258,7 +258,7 @@
/* See Porting Layer Definition - p. 57 */
@@ -261,8 +261,8 @@ Index: xorg-server/hw/xwin/InitOutput.c
static const char *winCheckMntOpt(const struct mntent *mnt, const char *opt)
Index: xorg-server/include/os.h
===================================================================
---- xorg-server.orig/include/os.h 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/include/os.h 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/include/os.h 2011-08-24 12:52:46.005647151 +0300
++++ xorg-server/include/os.h 2011-08-24 12:56:49.555650622 +0300
@@ -459,7 +459,9 @@
/* stuff for FlushCallback */
extern _X_EXPORT CallbackListPtr FlushCallback;
@@ -275,9 +275,9 @@ Index: xorg-server/include/os.h
Index: xorg-server/os/log.c
===================================================================
---- xorg-server.orig/os/log.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/os/log.c 2011-04-09 10:38:10.000000000 +0300
-@@ -397,9 +397,11 @@
+--- xorg-server.orig/os/log.c 2011-08-24 12:52:46.025647150 +0300
++++ xorg-server/os/log.c 2011-08-24 12:56:49.555650622 +0300
+@@ -401,9 +401,11 @@
void
AbortServer(void) _X_NORETURN;
@@ -290,7 +290,7 @@ Index: xorg-server/os/log.c
{
#ifdef XF86BIGFONT
XF86BigfontCleanup();
-@@ -407,11 +409,21 @@
+@@ -411,11 +413,21 @@
CloseWellKnownConnections();
OsCleanup(TRUE);
CloseDownDevices();
@@ -316,7 +316,7 @@ Index: xorg-server/os/log.c
}
#define AUDIT_PREFIX "AUDIT: %s: %ld: "
-@@ -512,6 +524,27 @@
+@@ -516,6 +528,27 @@
}
void
@@ -346,8 +346,8 @@ Index: xorg-server/os/log.c
va_list args;
Index: xorg-server/os/osinit.c
===================================================================
---- xorg-server.orig/os/osinit.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/os/osinit.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/os/osinit.c 2011-08-24 12:52:46.015647149 +0300
++++ xorg-server/os/osinit.c 2011-08-24 12:56:49.555650622 +0300
@@ -145,13 +145,13 @@
case SIGBUS:
case SIGILL:
diff --git a/debian/patches/105_nvidia_fglrx_autodetect.patch
b/debian/patches/105_nvidia_fglrx_autodetect.patch
index 1820d3c..5668e71 100644
--- a/debian/patches/105_nvidia_fglrx_autodetect.patch
+++ b/debian/patches/105_nvidia_fglrx_autodetect.patch
@@ -11,8 +11,8 @@ Signed-off-by: Robert Hooker <sarv...@ubuntu.com>
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-04-09
10:45:07.000000000 +0300
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-24
12:52:45.775647148 +0300
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-24
12:58:12.485651804 +0300
@@ -75,6 +75,13 @@
"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
"EndSection\n\n"
@@ -41,8 +41,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
Index: xorg-server/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-04-09
10:38:10.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:44:46.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-08-24
12:56:49.535650619 +0300
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-08-24 12:57:52.775651523
+0300
@@ -1107,7 +1107,10 @@
case 0x1142: driverList[0] = "apm"; break;
case 0xedd8: driverList[0] = "ark"; break;
diff --git a/debian/patches/111_armel-drv-fallbacks.patch
b/debian/patches/111_armel-drv-fallbacks.patch
index 59415dc..540a2d0 100644
--- a/debian/patches/111_armel-drv-fallbacks.patch
+++ b/debian/patches/111_armel-drv-fallbacks.patch
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-11
01:50:04 +0000
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-11 01:52:08
+0000
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2011-08-24
12:56:49.565650621 +0300
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2011-08-24
12:56:49.575650619 +0300
@@ -44,6 +44,12 @@
# include "xf86sbusBus.h"
#endif
diff --git a/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
b/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
index 6c97ab2..69b7300 100644
--- a/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
+++ b/debian/patches/122_xext_fix_card32_overflow_in_xauth.patch
@@ -12,8 +12,8 @@ Bug-Ubuntu: https://launchpad.net/bugs/519049
Index: xorg-server/Xext/security.c
===================================================================
---- xorg-server.orig/Xext/security.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/Xext/security.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/Xext/security.c 2011-08-24 12:52:45.635647146 +0300
++++ xorg-server/Xext/security.c 2011-08-24 12:56:49.595650621 +0300
@@ -271,10 +271,10 @@
/* maxSecs is the number of full seconds that can be expressed in
* 32 bits worth of milliseconds
diff --git a/debian/patches/157_check_null_modes.patch
b/debian/patches/157_check_null_modes.patch
index e9c2193..a0d6370 100644
--- a/debian/patches/157_check_null_modes.patch
+++ b/debian/patches/157_check_null_modes.patch
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86VidMode.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86VidMode.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86VidMode.c 2011-04-09
10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/common/xf86VidMode.c 2011-08-24
12:52:45.565647144 +0300
++++ xorg-server/hw/xfree86/common/xf86VidMode.c 2011-08-24
12:56:49.605650623 +0300
@@ -222,6 +222,9 @@
pScrn = xf86Screens[scrnIndex];
diff --git a/debian/patches/162_null_crtc_in_rotation.patch
b/debian/patches/162_null_crtc_in_rotation.patch
index 3d1df54..0f01921 100644
--- a/debian/patches/162_null_crtc_in_rotation.patch
+++ b/debian/patches/162_null_crtc_in_rotation.patch
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/modes/xf86RandR12.c
===================================================================
---- xorg-server.orig/hw/xfree86/modes/xf86RandR12.c 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/modes/xf86RandR12.c 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/hw/xfree86/modes/xf86RandR12.c 2011-08-24
12:52:45.505647142 +0300
++++ xorg-server/hw/xfree86/modes/xf86RandR12.c 2011-08-24 12:56:49.615650622
+0300
@@ -930,7 +930,8 @@
for (c = 0; c < config->num_crtc; c++) {
xf86CrtcPtr crtc = config->crtc[c];
diff --git a/debian/patches/165_man_xorg_conf_no_device_ident.patch
b/debian/patches/165_man_xorg_conf_no_device_ident.patch
index ca50676..6b4fecb 100644
--- a/debian/patches/165_man_xorg_conf_no_device_ident.patch
+++ b/debian/patches/165_man_xorg_conf_no_device_ident.patch
@@ -11,8 +11,8 @@ Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man 2011-04-09
10:36:57.000000000 +0300
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man 2011-04-09
10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man 2011-08-24
12:52:45.445647143 +0300
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man 2011-08-24
12:56:49.625650620 +0300
@@ -1816,9 +1816,7 @@
.PP
The
diff --git a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
index 2a56051..cbff596 100644
--- a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
+++ b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
@@ -12,8 +12,8 @@ Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
Index: xorg-server/mi/mipointer.c
===================================================================
---- xorg-server.orig/mi/mipointer.c 2011-04-09 10:36:57.000000000 +0300
-+++ xorg-server/mi/mipointer.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/mi/mipointer.c 2011-08-24 12:52:45.385647143 +0300
++++ xorg-server/mi/mipointer.c 2011-08-24 12:57:30.295651201 +0300
@@ -300,6 +300,10 @@
SetupScreen (pScreen);
pPointer = MIPOINTER(pDev);
diff --git a/debian/patches/167_nullptr_xisbread.patch
b/debian/patches/167_nullptr_xisbread.patch
index e14fecc..0fa56bd 100644
--- a/debian/patches/167_nullptr_xisbread.patch
+++ b/debian/patches/167_nullptr_xisbread.patch
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xisb.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xisb.c 2011-04-09 10:36:57.000000000
+0300
-+++ xorg-server/hw/xfree86/common/xisb.c 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xisb.c 2011-08-24 12:52:45.315647139
+0300
++++ xorg-server/hw/xfree86/common/xisb.c 2011-08-24 12:56:49.655650624
+0300
@@ -98,6 +98,9 @@
{
int ret;
diff --git a/debian/patches/168_glibc_trace_to_stderr.patch
b/debian/patches/168_glibc_trace_to_stderr.patch
index 099c270..5503a1c 100644
--- a/debian/patches/168_glibc_trace_to_stderr.patch
+++ b/debian/patches/168_glibc_trace_to_stderr.patch
@@ -3,9 +3,9 @@ to catch the error so it can file a bug report about the crash.
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-04-09
10:38:10.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2011-04-09 10:38:10.000000000
+0300
-@@ -844,6 +844,9 @@
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2011-08-24
12:56:49.555650622 +0300
++++ xorg-server/hw/xfree86/common/xf86Init.c 2011-08-24 12:56:49.665650623
+0300
+@@ -866,6 +866,9 @@
if (!beenHere) {
umask(022);
diff --git a/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
b/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
index 0b90324..8d5bd4b 100644
--- a/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
+++ b/debian/patches/172_cwgetbackingpicture_nullptr_check.patch
@@ -12,8 +12,8 @@ Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
Index: xorg-server/miext/cw/cw_render.c
===================================================================
---- xorg-server.orig/miext/cw/cw_render.c 2011-04-09 10:36:56.000000000
+0300
-+++ xorg-server/miext/cw/cw_render.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/miext/cw/cw_render.c 2011-08-24 12:52:45.195647139
+0300
++++ xorg-server/miext/cw/cw_render.c 2011-08-24 12:56:49.675650621 +0300
@@ -123,10 +123,15 @@
WindowPtr pWindow = (WindowPtr) pDrawable;
PixmapPtr pPixmap = getCwPixmap (pWindow);
diff --git a/debian/patches/188_default_primary_to_first_busid.patch
b/debian/patches/188_default_primary_to_first_busid.patch
index f50b1cc..2115a52 100644
--- a/debian/patches/188_default_primary_to_first_busid.patch
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -5,8 +5,8 @@ signed-off-by: Bryce Harrington <br...@canonical.com>
Index: xorg-server/hw/xfree86/common/xf86pciBus.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-04-09
10:38:10.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-04-09 10:44:27.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2011-08-24
12:56:49.565650621 +0300
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2011-08-24 12:56:49.685650622
+0300
@@ -147,8 +147,8 @@
primaryBus.id.pci = info;
} else {
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index e7e111d..ca4a57c 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -5,8 +5,8 @@ Signed-off-by: Bryce Harrington <br...@canonical.com>
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/configure.ac 2011-04-09 10:44:34.000000000 +0300
+--- xorg-server.orig/configure.ac 2011-08-24 12:56:49.505650620 +0300
++++ xorg-server/configure.ac 2011-08-24 12:57:47.895651453 +0300
@@ -537,9 +537,9 @@
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to
XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH="$withval" ],
@@ -30,8 +30,8 @@ Index: xorg-server/configure.ac
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
Index: xorg-server/xkb/README.compiled
===================================================================
---- xorg-server.orig/xkb/README.compiled 2011-04-09 10:36:56.000000000
+0300
-+++ xorg-server/xkb/README.compiled 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/xkb/README.compiled 2011-08-24 12:52:45.055647137
+0300
++++ xorg-server/xkb/README.compiled 2011-08-24 12:56:49.705650623 +0300
@@ -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
@@ -49,8 +49,8 @@ Index: xorg-server/xkb/README.compiled
different hosts could cause problems.
Index: xorg-server/xkb/ddxLoad.c
===================================================================
---- xorg-server.orig/xkb/ddxLoad.c 2011-04-09 10:36:56.000000000 +0300
-+++ xorg-server/xkb/ddxLoad.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/xkb/ddxLoad.c 2011-08-24 12:52:45.065647139 +0300
++++ xorg-server/xkb/ddxLoad.c 2011-08-24 12:56:49.705650623 +0300
@@ -30,6 +30,12 @@
#include <xkb-config.h>
diff --git a/debian/patches/191-Xorg-add-an-extra-module-path.patch
b/debian/patches/191-Xorg-add-an-extra-module-path.patch
index d10f418..59ae2c1 100644
--- a/debian/patches/191-Xorg-add-an-extra-module-path.patch
+++ b/debian/patches/191-Xorg-add-an-extra-module-path.patch
@@ -10,8 +10,8 @@ used on Mandriva's fglrx package.
---
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/configure.ac 2011-04-09 10:42:59.000000000 +0300
+--- xorg-server.orig/configure.ac 2011-08-24 12:56:49.705650623 +0300
++++ xorg-server/configure.ac 2011-08-24 12:57:34.655651265 +0300
@@ -489,6 +489,10 @@
[Directory where modules are installed
(default: $libdir/xorg/modules)]),
[ moduledir="$withval" ],
@@ -33,8 +33,8 @@ Index: xorg-server/configure.ac
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web
address for support])
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2011-04-09
10:36:56.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2011-08-24
12:52:44.925647137 +0300
++++ xorg-server/hw/xfree86/common/xf86Config.c 2011-08-24 12:56:49.715650621
+0300
@@ -628,11 +628,21 @@
/* ModulePath */
@@ -61,8 +61,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
Index: xorg-server/hw/xfree86/common/xf86Globals.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Globals.c 2011-04-09
10:36:56.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Globals.c 2011-04-09
10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/common/xf86Globals.c 2011-08-24
12:52:44.935647136 +0300
++++ xorg-server/hw/xfree86/common/xf86Globals.c 2011-08-24
12:56:49.715650621 +0300
@@ -139,6 +139,7 @@
const char *xf86ConfigFile = NULL;
const char *xf86ConfigDir = NULL;
@@ -73,8 +73,8 @@ Index: xorg-server/hw/xfree86/common/xf86Globals.c
MessageType xf86LogFileFrom = X_DEFAULT;
Index: xorg-server/hw/xfree86/common/xf86Priv.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Priv.h 2011-04-09
10:36:56.000000000 +0300
-+++ xorg-server/hw/xfree86/common/xf86Priv.h 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/hw/xfree86/common/xf86Priv.h 2011-08-24
12:52:44.945647134 +0300
++++ xorg-server/hw/xfree86/common/xf86Priv.h 2011-08-24 12:56:49.715650621
+0300
@@ -75,6 +75,7 @@
extern _X_EXPORT xf86InfoRec xf86Info;
@@ -85,8 +85,8 @@ Index: xorg-server/hw/xfree86/common/xf86Priv.h
extern _X_EXPORT MessageType xf86LogFileFrom;
Index: xorg-server/include/xorg-config.h.in
===================================================================
---- xorg-server.orig/include/xorg-config.h.in 2011-04-09 10:36:56.000000000
+0300
-+++ xorg-server/include/xorg-config.h.in 2011-04-09 10:38:10.000000000
+0300
+--- xorg-server.orig/include/xorg-config.h.in 2011-08-24 12:52:44.965647137
+0300
++++ xorg-server/include/xorg-config.h.in 2011-08-24 12:56:49.715650621
+0300
@@ -42,6 +42,9 @@
/* Path to loadable modules. */
#undef DEFAULT_MODULE_PATH
diff --git a/debian/patches/198_nohwaccess.patch
b/debian/patches/198_nohwaccess.patch
index bfa387e..0bc9169 100644
--- a/debian/patches/198_nohwaccess.patch
+++ b/debian/patches/198_nohwaccess.patch
@@ -3,8 +3,8 @@ contains just the remainder, which implements a -nohwaccess
option.
Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
===================================================================
---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09
10:38:10.000000000 +0300
-+++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-04-09
10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_init.c 2011-08-24
12:52:44.815647133 +0300
++++ xorg-server/hw/xfree86/os-support/linux/lnx_init.c 2011-08-24
12:56:49.725650622 +0300
@@ -41,6 +41,7 @@
static Bool KeepTty = FALSE;
static Bool VTSwitch = TRUE;
@@ -33,8 +33,8 @@ Index: xorg-server/hw/xfree86/os-support/linux/lnx_init.c
}
Index: xorg-server/hw/xfree86/os-support/linux/lnx_video.c
===================================================================
---- xorg-server.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-04-09
10:36:56.000000000 +0300
-+++ xorg-server/hw/xfree86/os-support/linux/lnx_video.c 2011-04-09
10:38:10.000000000 +0300
+--- xorg-server.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-08-24
12:52:44.825647135 +0300
++++ xorg-server/hw/xfree86/os-support/linux/lnx_video.c 2011-08-24
12:56:49.725650622 +0300
@@ -50,6 +50,7 @@
#define MAP_FAILED ((void *)-1)
#endif
diff --git a/debian/patches/200_randr-null.patch
b/debian/patches/200_randr-null.patch
index 8d8a3fa..d2ddbaa 100644
--- a/debian/patches/200_randr-null.patch
+++ b/debian/patches/200_randr-null.patch
@@ -1,8 +1,8 @@
=== modified file 'randr/randr.c'
Index: xorg-server/randr/randr.c
===================================================================
---- xorg-server.orig/randr/randr.c 2011-04-09 10:36:56.000000000 +0300
-+++ xorg-server/randr/randr.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/randr/randr.c 2011-08-24 12:52:44.745647133 +0300
++++ xorg-server/randr/randr.c 2011-08-24 12:57:30.195651199 +0300
@@ -235,7 +235,7 @@
/*
* Calling function best set these function vectors
diff --git a/debian/patches/208_switch_on_release.diff
b/debian/patches/208_switch_on_release.diff
index 093b18f..6210156 100644
--- a/debian/patches/208_switch_on_release.diff
+++ b/debian/patches/208_switch_on_release.diff
@@ -1,7 +1,7 @@
Index: xorg-server/xkb/xkbActions.c
===================================================================
---- xorg-server.orig/xkb/xkbActions.c 2011-04-09 10:36:56.000000000 +0300
-+++ xorg-server/xkb/xkbActions.c 2011-04-09 10:38:10.000000000 +0300
+--- xorg-server.orig/xkb/xkbActions.c 2011-08-24 12:52:44.685647133 +0300
++++ xorg-server/xkb/xkbActions.c 2011-08-24 12:56:49.755650624 +0300
@@ -328,24 +328,83 @@
return 1;
}
diff --git a/debian/patches/209_add_legacy_bgnone_option.patch
b/debian/patches/209_add_legacy_bgnone_option.patch
index e9df40b..e53d24d 100644
--- a/debian/patches/209_add_legacy_bgnone_option.patch
+++ b/debian/patches/209_add_legacy_bgnone_option.patch
@@ -1,7 +1,7 @@
Index: xorg-server/os/utils.c
===================================================================
---- xorg-server.orig/os/utils.c 2011-04-09 10:36:56.000000000 +0300
-+++ xorg-server/os/utils.c 2011-04-09 10:42:43.000000000 +0300
+--- xorg-server.orig/os/utils.c 2011-08-24 12:52:44.625647130 +0300
++++ xorg-server/os/utils.c 2011-08-24 12:57:14.805650982 +0300
@@ -513,6 +513,7 @@
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
diff --git a/debian/patches/210_pixman_null_ptr_check.patch
b/debian/patches/210_pixman_null_ptr_check.patch
index 1045966..c43df5b 100644
--- a/debian/patches/210_pixman_null_ptr_check.patch
+++ b/debian/patches/210_pixman_null_ptr_check.patch
@@ -1,7 +1,7 @@
Index: xorg-server/fb/fbpict.c
===================================================================
---- xorg-server.orig/fb/fbpict.c 2011-04-09 10:36:56.000000000 +0300
-+++ xorg-server/fb/fbpict.c 2011-04-09 10:38:11.000000000 +0300
+--- xorg-server.orig/fb/fbpict.c 2011-08-24 12:52:44.565647128 +0300
++++ xorg-server/fb/fbpict.c 2011-08-24 12:56:49.775650623 +0300
@@ -163,7 +163,19 @@
pict->format,
pixmap->drawable.width, pixmap->drawable.height,
diff --git a/debian/patches/214_glx_dri_searchdirs.patch
b/debian/patches/214_glx_dri_searchdirs.patch
index 66d18b8..2e5e234 100644
--- a/debian/patches/214_glx_dri_searchdirs.patch
+++ b/debian/patches/214_glx_dri_searchdirs.patch
@@ -1,7 +1,7 @@
Index: xorg-server/glx/glxdri.c
===================================================================
---- xorg-server.orig/glx/glxdri.c 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/glx/glxdri.c 2011-04-09 10:39:42.000000000 +0300
+--- xorg-server.orig/glx/glxdri.c 2011-08-24 12:56:49.535650619 +0300
++++ xorg-server/glx/glxdri.c 2011-08-24 12:56:49.795650626 +0300
@@ -858,8 +858,6 @@
@@ -126,9 +126,9 @@ Index: xorg-server/glx/glxdri.c
Index: xorg-server/glx/glxdri2.c
===================================================================
---- xorg-server.orig/glx/glxdri2.c 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/glx/glxdri2.c 2011-04-09 10:39:42.000000000 +0300
-@@ -599,8 +599,6 @@
+--- xorg-server.orig/glx/glxdri2.c 2011-08-24 12:56:49.535650619 +0300
++++ xorg-server/glx/glxdri2.c 2011-08-24 12:56:49.795650626 +0300
+@@ -600,8 +600,6 @@
NULL
};
@@ -137,7 +137,7 @@ Index: xorg-server/glx/glxdri2.c
static Bool
glxDRIEnterVT (int index, int flags)
{
-@@ -701,14 +699,11 @@
+@@ -702,14 +700,11 @@
__glXDRIscreenProbe(ScreenPtr pScreen)
{
const char *driverName, *deviceName;
@@ -153,7 +153,7 @@ Index: xorg-server/glx/glxdri2.c
screen = calloc(1, sizeof *screen);
if (screen == NULL)
-@@ -730,54 +725,24 @@
+@@ -731,54 +726,24 @@
__glXInitExtensionEnableBits(screen->glx_enable_bits);
@@ -224,7 +224,7 @@ Index: xorg-server/glx/glxdri2.c
initializeExtensions(screen);
-@@ -819,7 +784,7 @@
+@@ -820,7 +785,7 @@
pScrn->LeaveVT = glxDRILeaveVT;
LogMessage(X_INFO,
@@ -233,7 +233,7 @@ Index: xorg-server/glx/glxdri2.c
return &screen->base;
-@@ -829,7 +794,8 @@
+@@ -830,7 +795,8 @@
free(screen);
@@ -245,8 +245,8 @@ Index: xorg-server/glx/glxdri2.c
}
Index: xorg-server/glx/glxdricommon.c
===================================================================
---- xorg-server.orig/glx/glxdricommon.c 2011-04-06 18:25:24.000000000
+0300
-+++ xorg-server/glx/glxdricommon.c 2011-04-09 10:39:42.000000000 +0300
+--- xorg-server.orig/glx/glxdricommon.c 2011-08-24 12:52:44.495647129
+0300
++++ xorg-server/glx/glxdricommon.c 2011-08-24 12:56:49.795650626 +0300
@@ -29,6 +29,7 @@
#include <stdint.h>
@@ -346,8 +346,8 @@ Index: xorg-server/glx/glxdricommon.c
+}
Index: xorg-server/glx/glxdricommon.h
===================================================================
---- xorg-server.orig/glx/glxdricommon.h 2011-04-06 18:25:24.000000000
+0300
-+++ xorg-server/glx/glxdricommon.h 2011-04-09 10:39:42.000000000 +0300
+--- xorg-server.orig/glx/glxdricommon.h 2011-08-24 12:52:44.475647127
+0300
++++ xorg-server/glx/glxdricommon.h 2011-08-24 12:56:49.795650626 +0300
@@ -38,4 +38,9 @@
extern const __DRIsystemTimeExtension systemTimeExtension;
@@ -360,9 +360,9 @@ Index: xorg-server/glx/glxdricommon.h
#endif
Index: xorg-server/glx/glxdriswrast.c
===================================================================
---- xorg-server.orig/glx/glxdriswrast.c 2011-04-06 18:25:24.000000000
+0300
-+++ xorg-server/glx/glxdriswrast.c 2011-04-09 10:39:42.000000000 +0300
-@@ -427,17 +427,13 @@
+--- xorg-server.orig/glx/glxdriswrast.c 2011-08-24 12:52:44.465647129
+0300
++++ xorg-server/glx/glxdriswrast.c 2011-08-24 12:56:49.795650626 +0300
+@@ -435,17 +435,13 @@
}
}
@@ -381,7 +381,7 @@ Index: xorg-server/glx/glxdriswrast.c
screen = calloc(1, sizeof *screen);
if (screen == NULL)
-@@ -449,40 +445,15 @@
+@@ -457,40 +453,15 @@
screen->base.swapInterval = NULL;
screen->base.pScreen = pScreen;
@@ -427,7 +427,7 @@ Index: xorg-server/glx/glxdriswrast.c
screen->driScreen =
(*screen->swrast->createNewScreen)(pScreen->myNum,
loader_extensions,
-@@ -508,7 +479,7 @@
+@@ -516,7 +487,7 @@
screen->base.GLXminor = 4;
LogMessage(X_INFO,
@@ -438,8 +438,8 @@ Index: xorg-server/glx/glxdriswrast.c
Index: xorg-server/configure.ac
===================================================================
---- xorg-server.orig/configure.ac 2011-04-09 10:38:10.000000000 +0300
-+++ xorg-server/configure.ac 2011-04-09 10:42:51.000000000 +0300
+--- xorg-server.orig/configure.ac 2011-08-24 12:56:49.715650621 +0300
++++ xorg-server/configure.ac 2011-08-24 12:57:20.685651066 +0300
@@ -1260,7 +1260,12 @@
AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous
config path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
diff --git a/debian/patches/217_revert_bgnonevisitwindow.patch
b/debian/patches/217_revert_bgnonevisitwindow.patch
index 9f76988..5388925 100644
--- a/debian/patches/217_revert_bgnonevisitwindow.patch
+++ b/debian/patches/217_revert_bgnonevisitwindow.patch
@@ -3,8 +3,8 @@ Subject: Backout commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc
Index: xorg-server/composite/compalloc.c
===================================================================
---- xorg-server.orig/composite/compalloc.c 2011-04-06 18:25:23.000000000
+0300
-+++ xorg-server/composite/compalloc.c 2011-04-09 10:39:42.000000000 +0300
+--- xorg-server.orig/composite/compalloc.c 2011-08-24 12:52:44.405647129
+0300
++++ xorg-server/composite/compalloc.c 2011-08-24 12:56:49.805650625 +0300
@@ -508,17 +508,6 @@
return Success;
}
diff --git a/debian/patches/219_fedora-pointer-barriers.diff
b/debian/patches/219_fedora-pointer-barriers.diff
index a4fab7e..8ec5ab0 100644
--- a/debian/patches/219_fedora-pointer-barriers.diff
+++ b/debian/patches/219_fedora-pointer-barriers.diff
@@ -19,11 +19,11 @@ Subject: [PATCH] CRTC confine and pointer barriers
xfixes/xfixesint.h | 16 ++
14 files changed, 658 insertions(+), 16 deletions(-)
-diff --git a/dix/events.c b/dix/events.c
-index 07f8b05..d2be84f 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -328,6 +328,13 @@ IsMaster(DeviceIntPtr dev)
+Index: xorg-server/dix/events.c
+===================================================================
+--- xorg-server.orig/dix/events.c 2011-08-24 12:52:44.325647127 +0300
++++ xorg-server/dix/events.c 2011-08-24 12:57:24.685651121 +0300
+@@ -328,6 +328,13 @@
return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD;
}
@@ -37,11 +37,11 @@ index 07f8b05..d2be84f 100644
/**
* Max event opcode.
*/
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 794df42..c66e516 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -812,7 +812,11 @@ accelPointer(DeviceIntPtr dev, int first, int num, int
*valuators, CARD32 ms)
+Index: xorg-server/dix/getevents.c
+===================================================================
+--- xorg-server.orig/dix/getevents.c 2011-08-24 12:52:44.315647128 +0300
++++ xorg-server/dix/getevents.c 2011-08-24 12:57:20.625651063 +0300
+@@ -816,7 +816,11 @@
* miPointerSetPosition() and then scale back into device coordinates (if
* needed). miPSP will change x/y if the screen was crossed.
*
@@ -53,7 +53,7 @@ index 794df42..c66e516 100644
* @param x Pointer to current x-axis value, may be modified.
* @param y Pointer to current y-axis value, may be modified.
* @param x_frac Fractional part of current x-axis value, may be modified.
-@@ -824,7 +828,8 @@ accelPointer(DeviceIntPtr dev, int first, int num, int
*valuators, CARD32 ms)
+@@ -828,7 +832,8 @@
* @param screeny_frac Fractional part of screen y coordinate, as above.
*/
static void
@@ -63,7 +63,7 @@ index 794df42..c66e516 100644
ScreenPtr scr, int *screenx, int *screeny, float
*screenx_frac, float *screeny_frac)
{
int old_screenx, old_screeny;
-@@ -863,7 +868,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float
x_frac, float y_frac,
+@@ -867,7 +872,7 @@
old_screeny = *screeny;
/* This takes care of crossing screens for us, as well as clipping
* to the current screen. */
@@ -72,9 +72,9 @@ index 794df42..c66e516 100644
if (dev->u.master) {
dev->u.master->last.valuators[0] = *screenx;
-@@ -1193,7 +1198,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev,
int type, int buttons,
-
- set_raw_valuators(raw, &mask, raw->valuators.data);
+@@ -1202,7 +1207,8 @@
+ if ((flags & POINTER_NORAW) == 0)
+ set_raw_valuators(raw, &mask, raw->valuators.data);
- positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac,
&cy_frac);
+ positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
@@ -82,11 +82,11 @@ index 794df42..c66e516 100644
updateHistory(pDev, &mask, ms);
/* Update the valuators with the true value sent to the client*/
-diff --git a/include/dix.h b/include/dix.h
-index 12e4b59..3f99098 100644
---- a/include/dix.h
-+++ b/include/dix.h
-@@ -570,6 +570,7 @@ extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
+Index: xorg-server/include/dix.h
+===================================================================
+--- xorg-server.orig/include/dix.h 2011-08-24 12:52:44.355647127 +0300
++++ xorg-server/include/dix.h 2011-08-24 12:57:24.695651123 +0300
+@@ -570,6 +570,7 @@
extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
extern Bool IsPointerEvent(InternalEvent *event);
extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
@@ -94,10 +94,10 @@ index 12e4b59..3f99098 100644
extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
-diff --git a/include/protocol-versions.h b/include/protocol-versions.h
-index 1d33bdd..1dc66ad 100644
---- a/include/protocol-versions.h
-+++ b/include/protocol-versions.h
+Index: xorg-server/include/protocol-versions.h
+===================================================================
+--- xorg-server.orig/include/protocol-versions.h 2011-08-24
12:52:44.365647129 +0300
++++ xorg-server/include/protocol-versions.h 2011-08-24 12:57:20.735651065
+0300
@@ -126,7 +126,7 @@
#define SERVER_XF86VIDMODE_MINOR_VERSION 2
@@ -107,11 +107,11 @@ index 1d33bdd..1dc66ad 100644
#define SERVER_XFIXES_MINOR_VERSION 0
/* X Input */
-diff --git a/mi/mipointer.c b/mi/mipointer.c
-index 554397a..85f1949 100644
---- a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -229,6 +229,10 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr
pScreen,
+Index: xorg-server/mi/mipointer.c
+===================================================================
+--- xorg-server.orig/mi/mipointer.c 2011-08-24 12:56:49.645650622 +0300
++++ xorg-server/mi/mipointer.c 2011-08-24 12:56:49.825650624 +0300
+@@ -229,6 +229,10 @@
SetupScreen (pScreen);
GenerateEvent = generateEvent;
@@ -122,7 +122,7 @@ index 554397a..85f1949 100644
/* device dependent - must pend signal and call miPointerWarpCursor */
(*pScreenPriv->screenFuncs->WarpCursor) (pDev, pScreen, x, y);
if (!generateEvent)
-@@ -484,7 +488,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen,
+@@ -488,7 +492,7 @@
}
void
@@ -131,7 +131,7 @@ index 554397a..85f1949 100644
{
miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen;
-@@ -529,6 +533,9 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
+@@ -532,6 +536,9 @@
if (*y >= pPointer->limits.y2)
*y = pPointer->limits.y2 - 1;
@@ -141,7 +141,7 @@ index 554397a..85f1949 100644
if (pPointer->x == *x && pPointer->y == *y &&
pPointer->pScreen == pScreen)
return;
-@@ -536,6 +543,13 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
+@@ -539,6 +546,13 @@
miPointerMoveNoEvent(pDev, pScreen, *x, *y);
}
@@ -155,11 +155,11 @@ index 554397a..85f1949 100644
void
miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
{
-diff --git a/mi/mipointer.h b/mi/mipointer.h
-index 3c86110..6b6010c 100644
---- a/mi/mipointer.h
-+++ b/mi/mipointer.h
-@@ -131,6 +131,12 @@ extern _X_EXPORT void miPointerGetPosition(
+Index: xorg-server/mi/mipointer.h
+===================================================================
+--- xorg-server.orig/mi/mipointer.h 2011-08-24 12:52:44.375647128 +0300
++++ xorg-server/mi/mipointer.h 2011-08-24 12:56:49.825650624 +0300
+@@ -131,6 +131,12 @@
/* Moves the cursor to the specified position. May clip the co-ordinates:
* x and y are modified in-place. */
@@ -172,11 +172,11 @@ index 3c86110..6b6010c 100644
extern _X_EXPORT void miPointerSetPosition(
DeviceIntPtr pDev,
int *x,
-diff --git a/randr/randr.c b/randr/randr.c
-index 6077705..d337129 100644
---- a/randr/randr.c
-+++ b/randr/randr.c
-@@ -270,6 +270,8 @@ Bool RRScreenInit(ScreenPtr pScreen)
+Index: xorg-server/randr/randr.c
+===================================================================
+--- xorg-server.orig/randr/randr.c 2011-08-24 12:56:49.745650625 +0300
++++ xorg-server/randr/randr.c 2011-08-24 12:56:49.825650624 +0300
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qwafc-0008eb...@vasks.debian.org
