Add patches in my 'server-1.4-branch-gentoo' branch that I've submitted upstream and am waiting for them to take.

Package-Manager: portage-2.1.5_rc7

10 files changed, 240 insertions, 12 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b0ae05a087d4..035d3130c11e 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.327 2008/05/09 22:22:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.328 2008/05/10 06:50:16 dberkholz Exp $
+
+  10 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch, +files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  +files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  +files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  +files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, xorg-server-1.4.0.90-r4.ebuild:
+  Add patches in my 'server-1.4-branch-gentoo' branch that I've submitted
+  upstream and am waiting for them to take.
 
   09 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.4.0.90-r4.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index bb0eac6d2bd4..59b06e23eecc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -73,11 +73,18 @@ AUX 1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch 643 RMD160 22b1
 AUX 1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.patch 2084 RMD160 d88362f0aded245643a0983191b577a43a798326 SHA1 c46f7a38e1cdcc2ac8fca295dea84282ba2ba2a8 SHA256 b01b028be25c1732cf89c8d26dd563d44430d93b4d0ef5ec5cf64c31904581a3
 AUX 1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch 1364 RMD160 efdb7e51394df787de77b19fcf2a671e5745c55b SHA1 56a4de5277f41692470eb7f5232abf370915e088 SHA256 01d007f64c4bf8ae70c62cd4fa0fa1b3d598f8776368edbd5e03be4ce680d84b
 AUX 1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch 1953 RMD160 3323165b1e1bac4975125c4484a3b189a9895c44 SHA1 17bb9013d53dcd062c3945af96c7876e2d05c9d0 SHA256 e4d5fad4931d37eedbb1056bc2cc3a45593b850a071851be4ef56ef39a9c3c2b
+AUX 1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch 844 RMD160 b403633c75cf4b27341baa88fa39f0a716b2044f SHA1 3d850a07ea3899bc3e5aece3a5edbbfa187a4d76 SHA256 815cb89e356c5abffa7df007f13d87e7677f4bdee5428da34e358d7fb4bcd5c9
 AUX 1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patch 1350 RMD160 7abec3b4353b95022c5a76cc38493866d2d44381 SHA1 0842a62ed2d0bed558dea0a3df696cc041d4d6e7 SHA256 20a2dc688886de6ac6516c9c15a493fb847460b4c67adf1a247cf104d23c90f6
+AUX 1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch 658 RMD160 ebad04f82bf8215f4ce350c98b8e1bd642483d48 SHA1 77bd15831fbcf345df78ececcba3dbb24063c975 SHA256 fc61491aef890e24403e213d01505284a25140310bacf9ebc680f1240a3e1743
 AUX 1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patch 7279 RMD160 4d3fe2057ccf82b001a3736b3bccbb956f9f3704 SHA1 1930d8d19b2afbd157349199a327548139b3d857 SHA256 3426664369211568b91fb0204b44327600d727efac7467fe7f0021ed64f7b5d9
+AUX 1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch 1227 RMD160 02fea3fd38006e897bec24639795a35f5cf0e462 SHA1 1f170c52a47562053948b0f2d6bf6ad6f9e35be2 SHA256 a193c7ceefbe0d3acc751fa02365cab55683783b4da8526166c1d2538827538c
 AUX 1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.patch 3670 RMD160 465cffebdcde7dc52022ae7133ff335347fd7605 SHA1 c311b2e4b5874718698671f56f89a269a9ebbaf7 SHA256 640f5b876364047fce4754615c159f7f9f527afb3deab5246b86853defb639ec
+AUX 1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch 753 RMD160 2b3240111a84b9b6844a035e4befee8df02f851b SHA1 e1b42eb5107d2b6823a3e192f216f1d4da9a20a4 SHA256 d3097571a53d33bc253af314b1f4907d978ba90a65e73411c8090d242f413153
 AUX 1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.patch 2022 RMD160 d192c17c794335a6397dba46b61afaed60c47152 SHA1 8bd14bc6f88268657d010dbb82572cb8af13ea7e SHA256 4eb5b8066908d1d7b9b359a915bd3e08b6a5cf438459d100ebf5241029dc6408
+AUX 1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch 907 RMD160 6951917f9ed0005490c1d1908c638fceeec887a3 SHA1 bb49c492df6d4bd1fa55e51cf38d176eb8bbc75e SHA256 f31beb77e7b5ce4173c8a01d6c98b43aeca5105e2fbc3a3b76fabc92972ba50b
+AUX 1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch 1235 RMD160 eb625a3c0b7c0a9112e6f99b13a8eda6d5aa1334 SHA1 ec47d3e0f91cae6cf1adee96d487e4bfe3bd23df SHA256 0547825792034eb1eae2d766804f14c5188e8db7fc7fe200f9c8ddd349770775
 AUX 1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch 4163 RMD160 f9747730ee551ec64dd386aab41d4f560b313407 SHA1 29c45125eea26dc0a2163f19e0180e47fb886494 SHA256 bc9ca4b91b89a18db0fba597a0673f5b747a9fd79b1e046c769fca50239acea1
+AUX 1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch 926 RMD160 b8b86b6e3f3ed97ad41ed0b9a2c7a2c3b4380864 SHA1 407e4b06030fab315940a2ae55723f9e7fea20ba SHA256 642ce62840b3cb2135855871132263afcb9e47c9bcf6fc3bbdf1122b53ba7b13
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
 AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 RMD160 06d03313a419fcad6b3668888e32dad28defb3a4 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
@@ -91,13 +98,13 @@ DIST xorg-server-1.4.0.90.tar.bz2 6315011 RMD160 181b3c682710265df3c6ed30e164be9
 EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928dd2e11e015 SHA1 2552f8fc12bc8b446e65b912dbd86f7cf4019ec5 SHA256 fcf3d38047d812e887769b17ffe7c94035fc6376bc6b307b04190851bb3ed19c
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18114 RMD160 e6fffcc39506db21aafee5e70b8bb043026d5290 SHA1 3e716d92bc096757eb29c3e1e7ae9365a1925f07 SHA256 bb90fb9650d061d42625d99aefefe4de9e032c0b8e517be7c19a5b9ea15a742d
 EBUILD xorg-server-1.4.0.90-r3.ebuild 19019 RMD160 9fd7322fc14c5f0aba0eba2852aac1cac55a89ee SHA1 791569ee44e071ac8151b0169e002f3b873ebcd7 SHA256 be61c04dd39bcd8262151491b86a323a5a818d3800772c0c868a715487052a10
-EBUILD xorg-server-1.4.0.90-r4.ebuild 18275 RMD160 1ee81ce3ab0faf6300669b8d2a4054a5dab119e7 SHA1 74fdea5d96a6799b8db8f92f4f390069bdcf325e SHA256 462457aad1578f15cec28494ae29f30fcab97eebffd8b25ba0fad55c3d79fe13
-MISC ChangeLog 74135 RMD160 8434e88bc6df6aa8eebdd4fbc354d8079116b3bb SHA1 21bc0f3a772113078b26ccdf6d3dac777a055a6e SHA256 0e131130bd51e8d19ca7203e15f84e24169293ae4f671932609ed3b867a49bb6
+EBUILD xorg-server-1.4.0.90-r4.ebuild 18074 RMD160 370bd30e947489301d22856da4040ae7c3c5b100 SHA1 b6232bc0c29b437408cb232862c37fbbc8e63637 SHA256 1d439f7c83c4dc9b69285d6722dab2fb840f099cafd6104784d72b16b1c96aba
+MISC ChangeLog 74894 RMD160 f2e42b2ed340ba85c790c75a6a46b55f05fb54e2 SHA1 93765d77c93beeaaddfb1d46b150d462ee077948 SHA256 c65162462d5c49b30a66ec95a571b33b84d3eb952c4faf549fe89717669e5a4c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgkzscACgkQXVaO67S1rtsAWgCfRbasih9aZMnxd89kKiwnlWn+
-lSwAoPuoTIG+QzoOsQcc5LtO9BKbbcPo
-=UVYB
+iEYEARECAAYFAkglRbIACgkQXVaO67S1rtuacQCggRNxRkycQVY6y7E4q50idoNE
+CDcAn1D2lOONXig6f5nqxv8xHKleVBfS
+=eXOo
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch b/x11-base/xorg-server/files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch
new file mode 100644
index 000000000000..aa7ce15a7f62
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch
@@ -0,0 +1,31 @@
+From 57af7704ec129ae0dbd941dece62bba3401e008f Mon Sep 17 00:00:00 2001
+From: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Thu, 8 May 2008 00:04:36 -0700
+Subject: [PATCH] dmx: fix build by adding {New,Delete}InputDeviceRequest.
+
+---
+ hw/dmx/dmxinput.c |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
+index d644b5d..83f8a4a 100644
+--- a/hw/dmx/dmxinput.c
++++ b/hw/dmx/dmxinput.c
+@@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
+         if (!dmxInput->detached && dmxInput->updateWindowInfo)
+             dmxInput->updateWindowInfo(dmxInput, type, pWindow);
+ }
++
++int
++NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
++{
++    return BadRequest;
++}
++
++void
++DeleteInputDeviceRequest(DeviceIntPtr pDev)
++{
++}
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch b/x11-base/xorg-server/files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch
new file mode 100644
index 000000000000..b82859a52b53
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0039-dmx-link-in-XSERVER_LIBS.patch
@@ -0,0 +1,24 @@
+From 2ab2b7ced1241afa48c4af953c761c905ec04aee Mon Sep 17 00:00:00 2001
+From: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Thu, 8 May 2008 00:05:00 -0700
+Subject: [PATCH] dmx: link in XSERVER_LIBS.
+
+---
+ hw/dmx/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
+index 002ea11..15dc281 100644
+--- a/hw/dmx/Makefile.am
++++ b/hw/dmx/Makefile.am
+@@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
+              $(GLX_LIBS) \
+              input/libdmxinput.a \
+              config/libdmxconfig.a \
++             @XSERVER_LIBS@ \
+              @DMXMODULES_LIBS@
+ 
+ # Man page
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch b/x11-base/xorg-server/files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch
new file mode 100644
index 000000000000..c5ad8c92b37c
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0040-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch
@@ -0,0 +1,38 @@
+From 09df8eb5321d92817f2dd398ad0ae4551163fc82 Mon Sep 17 00:00:00 2001
+From: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Thu, 8 May 2008 00:06:16 -0700
+Subject: [PATCH] xephyr: fix linking by adding pixman and using XSERVER_LIBS.
+
+---
+ configure.ac                |    2 +-
+ hw/kdrive/ephyr/Makefile.am |    1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c73f4a7..6145aa2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1814,7 +1814,7 @@ if test "$KDRIVE" = yes; then
+        XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
+     fi
+ 
+-    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
++    PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
+     if test "x$XEPHYR" = xauto; then
+         XEPHYR=$xephyr
+     fi
+diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
+index cc3019f..1738d0f 100644
+--- a/hw/kdrive/ephyr/Makefile.am
++++ b/hw/kdrive/ephyr/Makefile.am
+@@ -28,6 +28,7 @@ Xephyr_LDADD = 						\
+ 	libxephyr-hostx.a			        \
+ 	../../../exa/libexa.la				\
+ 	@KDRIVE_LIBS@					\
++	@XSERVER_LIBS@					\
+         @XEPHYR_LIBS@
+ 
+ Xephyr_DEPENDENCIES =	\
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch b/x11-base/xorg-server/files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch
new file mode 100644
index 000000000000..73a857ced794
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0041-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch
@@ -0,0 +1,34 @@
+From a678833702ca931687252799fa3453f7decb2e93 Mon Sep 17 00:00:00 2001
+From: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Thu, 8 May 2008 00:07:57 -0700
+Subject: [PATCH] xprint: fix build by adding {New,Delete}InputDeviceRequest.
+
+---
+ hw/xprint/ddxInit.c |   11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
+index a465c4c..1e7652e 100644
+--- a/hw/xprint/ddxInit.c
++++ b/hw/xprint/ddxInit.c
+@@ -310,6 +310,17 @@ ChangeDeviceControl (
+     return BadMatch;
+ }
+ 
++int
++NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
++{
++    return BadValue;
++}
++
++void
++DeleteInputDeviceRequest(DeviceIntPtr dev)
++{
++}
++
+ void
+ OpenInputDevice (
+     DeviceIntPtr dev,
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch b/x11-base/xorg-server/files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch
new file mode 100644
index 000000000000..eee0891016ef
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch
@@ -0,0 +1,25 @@
+From 1b2d80aa7862397309c59819d42d27dab879b08d Mon Sep 17 00:00:00 2001
+From: Donnie Berkholz <dberkholz@gentoo.org>
+Date: Thu, 8 May 2008 00:08:12 -0700
+Subject: [PATCH] xprint: fix linking by including XSERVER_LIBS.
+
+---
+ hw/xprint/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
+index f834966..2269544 100644
+--- a/hw/xprint/Makefile.am
++++ b/hw/xprint/Makefile.am
+@@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir)
+ Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
+ 	pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
+ 	$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
+-	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@
++	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@ @XSERVER_LIBS@
+ 
+ miinitext-wrapper.c:
+ 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch b/x11-base/xorg-server/files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch
new file mode 100644
index 000000000000..e4a501a265e7
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch
@@ -0,0 +1,31 @@
+From 0c30521759eb9ad4cbb47b6fd79630a424352bc6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
+Date: Thu, 20 Mar 2008 09:18:29 -0400
+Subject: [PATCH] Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
+
+This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
+platforms) fixes it for me with the radeon driver and doesn't break intel.
+
+Correct patch this time :)
+(cherry picked from commit da973e962d09854b571320dee7dd9569060bc39e)
+---
+ hw/xfree86/modes/xf86Cursors.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
+index b510164..a7616e0 100644
+--- a/hw/xfree86/modes/xf86Cursors.c
++++ b/hw/xfree86/modes/xf86Cursors.c
+@@ -137,7 +137,8 @@ cursor_bitpos (int flags, int x, Bool mask)
+ 	mask = !mask;
+     if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
+ 	x = (x & ~3) | (3 - (x & 3));
+-    if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST)
++    if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
++	(X_BYTE_ORDER == X_BIG_ENDIAN))
+ 	x = (x & ~7) | (7 - (x & 7));
+     if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
+ 	x = (x << 1) + mask;
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch b/x11-base/xorg-server/files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch
new file mode 100644
index 000000000000..a919ece55e6e
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch
@@ -0,0 +1,28 @@
+From 2dcdad6747b6af7ffdda2e6374d404d4df4bff22 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 17 Aug 2007 12:14:16 -0700
+Subject: [PATCH] Fix overly-restrictive integer overflow check in EXA pixmap creation.
+
+The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
+created, due to treating a pitch value as a width.
+(cherry picked from commit bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98)
+---
+ exa/exa.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/exa/exa.c b/exa/exa.c
+index aa42b92..b2faf2f 100644
+--- a/exa/exa.c
++++ b/exa/exa.c
+@@ -253,7 +253,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
+ 				     pExaScr->info->pixmapPitchAlign);
+     pExaPixmap->fb_size = pExaPixmap->fb_pitch * h;
+ 
+-    if (pExaPixmap->fb_pitch > 32767) {
++    if (pExaPixmap->fb_pitch > 131071) {
+ 	fbDestroyPixmap(pPixmap);
+ 	return NULL;
+     }
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
index 0d6124308d64..5698d0d8197c 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild,v 1.3 2008/05/09 22:22:54 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild,v 1.4 2008/05/10 06:50:16 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -284,11 +284,6 @@ GENTOO_PATCHES=(
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
 	"${FILESDIR}/${PV}/"
-	"${FILESDIR}/1.4-fix-dmx-build.patch"
-	"${FILESDIR}/1.4-fix-dmx-link.patch"
-	"${FILESDIR}/1.4-fix-xephyr-link.patch"
-	"${FILESDIR}/1.4-fix-xprint-build.patch"
-	"${FILESDIR}/1.4-fix-xprint-link.patch"
 	)
 
 PATCHES=(