Update 1.4.0.90 patches to latest in server-1.4-branch, which incorporates all the Gentoo build/link fixes.

Package-Manager: portage-2.1.5_rc10

18 files changed, 463 insertions, 19 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 035d3130c11e..03a41444cbb2 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,45 @@
 # 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.328 2008/05/10 06:50:16 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.329 2008/05/19 05:18:23 dberkholz Exp $
+
+  19 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/0042-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  -files/1.4.0.90/0043-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  -files/1.4.0.90/0044-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, +files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch,
+  +files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.p
+  atch,
+  +files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
+  tch, +files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.p
+  atch,
+  +files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.pa
+  tch,
+  +files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch,
+  +files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.
+  patch,
+  +files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.
+  patch, +files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch,
+  +files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch,
+  +files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.pa
+  tch,
+  +files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.p
+  atch,
+  +files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.pa
+  tch,
+  +files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.pa
+  tch,
+  +files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.pat
+  ch:
+  Update 1.4.0.90 patches to latest in server-1.4-branch, which incorporates
+  all the Gentoo build/link fixes.
 
   10 May 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   +files/1.4.0.90/0038-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 59b06e23eecc..6c7db1ca1d6c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -73,18 +73,27 @@ 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 1.4.0.90/0044-kdrive-allow-disabling-Composite.patch 1050 RMD160 d2f2412f12e2fb76264f7a24344deff1c9d16321 SHA1 149cfdd3939d3399814413acc71ec6e89179b822 SHA256 b3f4af02b772375b55d27a22a337ffaf172624bed584a734ec1c3f24db9b5970
+AUX 1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.patch 796 RMD160 83848f22aef12d307240ce8b17f099075a64239f SHA1 435295167b05b9adb0d132dbd2a9c02b1f507ef5 SHA256 075362c326cec8b0a6af42bfcec48c215dcf83c1e9d3d4caf4e3a09702045acd
+AUX 1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch 844 RMD160 4663e6dfdf034ba393c9fdc632be98f69c36d19b SHA1 ea4fa753c2e02696d2644d2263b74360b5a9973c SHA256 4c9492948fb0721917419c0556e29343e94cfb238a8e91087f0280423ddc8b4b
+AUX 1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch 658 RMD160 ee1cb45df3c1afafaa816ba42236e15dce1aeafd SHA1 57876467dcd6db53bcb5437a72a9d5763cec5613 SHA256 2f0ffc69141a380d414719f7512a0135ead15e468470491b40a6f7e92893c0da
+AUX 1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch 1227 RMD160 7a6f2c5da36ee4ae94e7f4df8c10ab3c67d02ddb SHA1 220cd64a44daf4d03cae35016704ce685bd616f4 SHA256 e487147bc623cb06ee024d8fd46360877de87f8d52343491dc5421ffa0a162bb
+AUX 1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch 753 RMD160 ef7de4bf03ad713e4a9b69c855329e124d80dbf9 SHA1 bb76d948b27ec9531202f563372faacba0d8236e SHA256 5d61910091e9a64b79da4b45641ad960bb0282cf24e0404581b81de985ad333a
+AUX 1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch 907 RMD160 128ff0b4d09cf5b3f512ae35f82b277fd912ad24 SHA1 532055ecd8b9b961be2b852c6f4c0112269fdaff SHA256 6c67de2a596c1ea4e4c0ca0b6fdcfbde56d28133d690d3e5104bf4ceee777a01
+AUX 1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch 1235 RMD160 704bd4e2bf8a8524ad88cb6ad1fe582b8793b48e SHA1 a45979be8876ab34c101ed6c6b3f3656f99b0100 SHA256 9508abd1f68c6ff38b5d37c8499fea95cf87d92498e890ec8536c9ff72a65143
+AUX 1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch 926 RMD160 442f6da089aa0b395a36a8c9928b42529f33c1ac SHA1 937d3f461cb7cd0df33d2647e8565371e3e57a26 SHA256 2d11a5a09f23bc9d2b892b21025d2c78d608830f2479b48ccbab644fe19f688a
+AUX 1.4.0.90/0053-Fix-hal-shutdown-crash.patch 1432 RMD160 85e5d8c4b04bff37433802b81c2977e05cb9ed40 SHA1 acc9044aeb136a3470e10fdc9ed53f45d434ee57 SHA256 1addcd220f38f8b9f1768050b86aa0e6fe658085a39d094dd7333d8c0cb993ba
+AUX 1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch 794 RMD160 dfb7a79e81a1f87e22afb18650852c0d0897f644 SHA1 c0065bc58e64383801484db9f00e11ded981f728 SHA256 d5ba3eb439bd4d11af74292219950417bdd42fccee990be63df112cdcb2b0f52
+AUX 1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.patch 879 RMD160 40ba09d2c272c15b74e177ef2e903c2177cdd130 SHA1 b22dc48b2801816adf2f7b8f1a50cab6dd538418 SHA256 b49f55c97a073532b3f8b6f05a80e5638a9ca66d312197684286b6db155c918a
+AUX 1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.patch 1561 RMD160 2d875f064ac6ae66185d81d2cfcd1c0513bd93c6 SHA1 8efee6c3889adc5433e1a67165007b010f84be80 SHA256 1ea4bff6b753afb4f6a3cdf708cf6144e5a688d45fdd72cdc55696be1eadd3e5
+AUX 1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.patch 788 RMD160 7e7d5c14ba2de2ff6df29ccd6e9069e747adb542 SHA1 f690819f1477941fa14d42eb281f854f9d98f3ed SHA256 005cd2a03b82eaf6244198fce0a7093a94fc6291b49a7bed36f5b316df04ed9d
+AUX 1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.patch 1214 RMD160 144b843906c0cd7291efecfe3226a3e1e0517137 SHA1 4cd9a1f5b95a97c6bcc343fc66154a271ee22f89 SHA256 82f60198adb225cf8da254974fd31752e850c10ba8c370fadef5d59f69dda843
+AUX 1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.patch 4643 RMD160 960cda511797e67cf4762bfe47e04b41e9cd59e3 SHA1 f4bf815c417745a20789a19b4ed5b906a5f5634a SHA256 5e216b5d93284f2398a75c9843a41b7f1c17d6ed144fbad031aa576c4f2f9e5a
 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
@@ -99,12 +108,12 @@ EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928
 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 18074 RMD160 370bd30e947489301d22856da4040ae7c3c5b100 SHA1 b6232bc0c29b437408cb232862c37fbbc8e63637 SHA256 1d439f7c83c4dc9b69285d6722dab2fb840f099cafd6104784d72b16b1c96aba
-MISC ChangeLog 74894 RMD160 f2e42b2ed340ba85c790c75a6a46b55f05fb54e2 SHA1 93765d77c93beeaaddfb1d46b150d462ee077948 SHA256 c65162462d5c49b30a66ec95a571b33b84d3eb952c4faf549fe89717669e5a4c
+MISC ChangeLog 76838 RMD160 831842276878a19f49efaa256c8eb07eb52b9f7d SHA1 ec955f599d11e0843e675fbd62ed157d641b696d SHA256 7ea3c3d546362ba52df032208a594d530f01ed04f2310bcc7365162ace805704
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkglRbIACgkQXVaO67S1rtuacQCggRNxRkycQVY6y7E4q50idoNE
-CDcAn1D2lOONXig6f5nqxv8xHKleVBfS
-=eXOo
+iEYEARECAAYFAkgxDakACgkQXVaO67S1rtvCJQCdHtor9Wuno+qCElnJZOEAQCG7
++vwAoKk5Bf1he9Ce71WlqFWjv88LIbr7
+=4LGb
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch b/x11-base/xorg-server/files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch
new file mode 100644
index 000000000000..b81bf80d0149
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch
@@ -0,0 +1,33 @@
+From 3f8ba890762513edc7eddbbbd4bb26f908540c8d Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sun, 11 May 2008 23:17:27 +0200
+Subject: [PATCH] kdrive: allow disabling Composite
+
+KdInitOutput() used to enable Composite when it was disabled by default,
+but now this hack prevents ``-extension Composite'' from working.
+Remove it, as Composite is enabled by default anyway.
+(cherry picked from commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082)
+---
+ hw/kdrive/src/kdrive.c |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
+index 2bb7b53..cd4ea7d 100644
+--- a/hw/kdrive/src/kdrive.c
++++ b/hw/kdrive/src/kdrive.c
+@@ -1387,12 +1387,6 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
+     KdCardInfo	    *card;
+     KdScreenInfo    *screen;
+ 
+-#ifdef COMPOSITE
+-    /* kind of a hack: we want Composite enabled, but it's disabled per
+-     * default. */
+-    noCompositeExtension = FALSE;
+-#endif
+-    
+     if (!kdCardInfo)
+     {
+ 	InitCard (0);
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.patch b/x11-base/xorg-server/files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.patch
new file mode 100644
index 000000000000..37e99ebcd33a
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.patch
@@ -0,0 +1,26 @@
+From d0554a57489e272233bcb38cb453f2c0bc0b1729 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue, 13 May 2008 16:39:30 -0700
+Subject: [PATCH] When XKB fails to open rules file, log the file name, not the NULL file pointer
+ (cherry picked from commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0)
+
+---
+ xkb/ddxLoad.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
+index ea9c3ff..eb03cde 100644
+--- a/xkb/ddxLoad.c
++++ b/xkb/ddxLoad.c
+@@ -525,7 +525,7 @@ XkbRF_RulesPtr	rules;
+ 
+     file = fopen(buf, "r");
+     if (!file) {
+-        LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file);
++        LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
+ 	return False;
+     }
+ 
+-- 
+1.5.5.1
+
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/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch
index aa7ce15a7f62..2f9e037513c9 100644
--- 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/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch
@@ -1,4 +1,4 @@
-From 57af7704ec129ae0dbd941dece62bba3401e008f Mon Sep 17 00:00:00 2001
+From 71f0711f40d825de3f1a7a09de78c6181fb3a521 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.
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/0047-dmx-link-in-XSERVER_LIBS.patch
index b82859a52b53..052fc2a88519 100644
--- 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/0047-dmx-link-in-XSERVER_LIBS.patch
@@ -1,4 +1,4 @@
-From 2ab2b7ced1241afa48c4af953c761c905ec04aee Mon Sep 17 00:00:00 2001
+From 6c5c1c5c9819fe9a5f2e2a6995017e414662d6cf 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.
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/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch
index c5ad8c92b37c..23c3dafa1767 100644
--- 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/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch
@@ -1,4 +1,4 @@
-From 09df8eb5321d92817f2dd398ad0ae4551163fc82 Mon Sep 17 00:00:00 2001
+From 9df3886354152250983171825daeb93a6a845369 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.
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/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch
index 73a857ced794..a70727c1e2bc 100644
--- 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/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch
@@ -1,4 +1,4 @@
-From a678833702ca931687252799fa3453f7decb2e93 Mon Sep 17 00:00:00 2001
+From 1022c7774b0a92946e87c61aa79b076a6ffe95ff 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.
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/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch
index eee0891016ef..d31bedb23c6b 100644
--- 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/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch
@@ -1,4 +1,4 @@
-From 1b2d80aa7862397309c59819d42d27dab879b08d Mon Sep 17 00:00:00 2001
+From 9db5401d69f1fab8db4bdd166536a25e4516e231 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.
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/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch
index e4a501a265e7..6c9b60bdc99a 100644
--- 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/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch
@@ -1,4 +1,4 @@
-From 0c30521759eb9ad4cbb47b6fd79630a424352bc6 Mon Sep 17 00:00:00 2001
+From 2621380cf680941a0423d64d827fb3513545ebf5 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
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/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch
index a919ece55e6e..0a7561f295f4 100644
--- 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/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch
@@ -1,4 +1,4 @@
-From 2dcdad6747b6af7ffdda2e6374d404d4df4bff22 Mon Sep 17 00:00:00 2001
+From 458b487723a7beb792857c920e9be22c2ce4625d 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.
diff --git a/x11-base/xorg-server/files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch b/x11-base/xorg-server/files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch
new file mode 100644
index 000000000000..4d24c51c3a04
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch
@@ -0,0 +1,44 @@
+From d5a7badd6a0ea4ecbe76f0205aa53b42f7cd90dc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 5 May 2008 14:37:07 -0400
+Subject: [PATCH] Fix hal shutdown crash.
+
+Removing the device invalidates its ->next pointer.  Copy it aside before
+destroying the device.
+(cherry picked from commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d)
+---
+ config/hal.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/config/hal.c b/config/hal.c
+index 16f16ec..bdf7d6c 100644
+--- a/config/hal.c
++++ b/config/hal.c
+@@ -63,7 +63,7 @@ remove_device(DeviceIntPtr dev)
+ static void
+ device_removed(LibHalContext *ctx, const char *udi)
+ {
+-    DeviceIntPtr dev;
++    DeviceIntPtr dev, next;
+     char *value;
+ 
+     value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
+@@ -71,11 +71,13 @@ device_removed(LibHalContext *ctx, const char *udi)
+         return;
+     sprintf(value, "hal:%s", udi);
+ 
+-    for (dev = inputInfo.devices; dev; dev = dev->next) {
++    for (dev = inputInfo.devices; dev; dev = next) {
++	next = dev->next;
+         if (dev->config_info && strcmp(dev->config_info, value) == 0)
+             remove_device(dev);
+     }
+-    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
++    for (dev = inputInfo.off_devices; dev; dev = next) {
++	next = dev->next;
+         if (dev->config_info && strcmp(dev->config_info, value) == 0)
+             remove_device(dev);
+     }
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch b/x11-base/xorg-server/files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch
new file mode 100644
index 000000000000..776521146874
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch
@@ -0,0 +1,27 @@
+From a08f848d4cd4c8c6e055a1182542d053a0a32c6b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@aspartame.nwnk.net>
+Date: Sun, 18 Nov 2007 11:57:01 -0500
+Subject: [PATCH] Bump DEFAULT_DPI to 96.
+
+75 is just nonsense.
+(cherry picked from commit db9ae863536fff80b5463d99e71dc47ae587980d)
+---
+ hw/xfree86/common/xf86Priv.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
+index b6fbd3a..5a3cba3 100644
+--- a/hw/xfree86/common/xf86Priv.h
++++ b/hw/xfree86/common/xf86Priv.h
+@@ -119,7 +119,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
+ #define DEFAULT_LOG_VERBOSE	3
+ #endif
+ #ifndef DEFAULT_DPI
+-#define DEFAULT_DPI		75
++#define DEFAULT_DPI		96
+ #endif
+ 
+ #define DEFAULT_UNRESOLVED	TRUE
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.patch b/x11-base/xorg-server/files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.patch
new file mode 100644
index 000000000000..5c468a8733a5
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.patch
@@ -0,0 +1,35 @@
+From 33a9ee9ba0ab44548afafa965bbd0a715cb1509c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 24 Mar 2008 12:22:19 -0400
+Subject: [PATCH] Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
+ (cherry picked from commit 536f2ff5382aaaace3b55481e15366bb15d87801)
+
+---
+ Xext/dpms.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Xext/dpms.c b/Xext/dpms.c
+index aced406..0557523 100644
+--- a/Xext/dpms.c
++++ b/Xext/dpms.c
+@@ -200,12 +200,15 @@ static int
+ ProcDPMSEnable(client)
+     register ClientPtr client;
+ {
+-    /* REQUEST(xDPMSEnableReq); */
++    Bool was_enabled = DPMSEnabled;
+ 
+     REQUEST_SIZE_MATCH(xDPMSEnableReq);
+ 
+-    if (DPMSCapableFlag)
++    if (DPMSCapableFlag) {
+ 	DPMSEnabled = TRUE;
++	if (!was_enabled)
++	    SetScreenSaverTimer();
++    }
+ 
+     return(client->noClientException);
+ }
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.patch b/x11-base/xorg-server/files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.patch
new file mode 100644
index 000000000000..8b47563d461b
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.patch
@@ -0,0 +1,47 @@
+From 2989f1071648770b5bbbfd80979f04d949f3dc57 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel@fooishbar.org>
+Date: Fri, 16 May 2008 19:49:05 +0300
+Subject: [PATCH] Prevent the -wm command line option from causing a SEGV
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+The -wm (when mapped) option for the BackingStore support has been
+causing the server to dereference a NULL pointer.
+
+This has probably been the case since backing store has been
+implemented on top of Composite.
+
+It looks like (some of?) Composite didn’t expect its WIndowPtr
+argument to be the root window.
+
+In Composite’s compCheckRedirect() function we now avoid calling
+compAllocPixmap() and compFreePixmap() when the pWin pointer’s
+parent member is NULL, as is it the case with a server’s root window.
+
+This addresses:
+
+https://bugs.freedesktop.org/show_bug.cgi?id=15878
+(cherry picked from commit 04211c3532ca078420e3745a5eac3d9de120bc32)
+---
+ composite/compwindow.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/composite/compwindow.c b/composite/compwindow.c
+index 33192ad..65f77cf 100644
+--- a/composite/compwindow.c
++++ b/composite/compwindow.c
+@@ -146,8 +146,8 @@ compCheckRedirect (WindowPtr pWin)
+     Bool	    should;
+ 
+     should = pWin->realized && (pWin->drawable.class != InputOnly) &&
+-	     (cw != NULL);
+-    
++	     (cw != NULL) && (pWin->parent != NULL);
++
+     /* Never redirect the overlay window */
+     if (cs->pOverlayWin != NULL) {
+ 	if (pWin == cs->pOverlayWin) {
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.patch b/x11-base/xorg-server/files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.patch
new file mode 100644
index 000000000000..92a2eb610b70
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.patch
@@ -0,0 +1,24 @@
+From 22b1a9dd0f68e3307cdcf3e6f8fcaeda34acd483 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
+Date: Thu, 18 Oct 2007 17:44:48 +0200
+Subject: [PATCH] EXA: Skip empty glyphs. (cherry picked from commit ce50bfd3369686cfecee5a138bd84ef1107a249d)
+
+---
+ exa/exa_render.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/exa/exa_render.c b/exa/exa_render.c
+index 2dd3fc1..ad1c02b 100644
+--- a/exa/exa_render.c
++++ b/exa/exa_render.c
+@@ -1184,6 +1184,7 @@ exaGlyphs (CARD8	op,
+ 	    y1 = y - glyph->info.y;
+ 
+ 	    if (x1 >= pCmpDrw->width || y1 >= pCmpDrw->height ||
++		glyph->info.width == 0 || glyph->info.height == 0 ||
+ 		(x1 + glyph->info.width) <= 0 || (y1 + glyph->info.height) <= 0)
+ 		goto nextglyph;
+ 
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.patch b/x11-base/xorg-server/files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.patch
new file mode 100644
index 000000000000..94ee0fa271ff
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.patch
@@ -0,0 +1,39 @@
+From 4e5cf76ecaa6b20f825738b07c257f4929e4652a Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <mart.raudsepp@artecdesign.ee>
+Date: Fri, 16 May 2008 20:06:31 +0300
+Subject: [PATCH] xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
+
+(cherry picked from commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c)
+(cherry picked from commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd)
+... and backported to 1.4 (back to no new devprivates and "amd" driver name)
+---
+ hw/xfree86/common/xf86AutoConfig.c |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 4f6a98a..703d156 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -160,12 +160,17 @@ videoPtrToDriverName(pciVideoPtr info)
+ {
+     /*
+      * things not handled yet:
+-     * amd/cyrix/nsc
+-     * xgi
++     * cyrix/nsc.  should be merged into geode anyway.
++     * xgi.
+      */
+ 
+     switch (info->vendor)
+     {
++	case 0x1022:
++		if (info->chipType == 0x2081)
++			return "amd";
++		else
++			return NULL;
+ 	case 0x1142:		    return "apm";
+ 	case 0xedd8:		    return "ark";
+ 	case 0x1a03:		    return "ast";
+-- 
+1.5.5.1
+
diff --git a/x11-base/xorg-server/files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.patch b/x11-base/xorg-server/files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.patch
new file mode 100644
index 000000000000..2c04964973c3
--- /dev/null
+++ b/x11-base/xorg-server/files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.patch
@@ -0,0 +1,121 @@
+From ddcca23a81abf5215f906a7ad097f1ed088ed92b Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu, 7 Feb 2008 15:48:04 +1030
+Subject: [PATCH] xkb: when copying the keymap, make sure the structs default to 0/NULL.
+
+It actually does help if a pointer is NULL rather than pointing to nirvana
+when you're trying to free it lateron. Who would have thought?
+(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
+(cherry picked from commit 0b0a09797302ac2171db5df20fc5110aafc8efbb)
+---
+ xkb/xkbUtils.c |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
+index e90df0d..ce4df4c 100644
+--- a/xkb/xkbUtils.c
++++ b/xkb/xkbUtils.c
+@@ -1707,9 +1707,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+         else {
+             if (dst->geom->sz_shapes) {
+                 xfree(dst->geom->shapes);
+-                dst->geom->shapes = NULL;
+             }
+-            
++            dst->geom->shapes = NULL;
+             dst->geom->num_shapes = 0;
+             dst->geom->sz_shapes = 0;
+         }
+@@ -1758,6 +1757,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+             }
+ 
+             dst->geom->num_sections = 0;
++            dst->geom->sections = NULL;
+         }
+ 
+         if (src->geom->num_sections) {
+@@ -1769,6 +1769,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+                 tmp = xalloc(src->geom->num_sections * sizeof(XkbSectionRec));
+             if (!tmp)
+                 return FALSE;
++            memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
+             dst->geom->sections = tmp;
+             dst->geom->num_sections = src->geom->num_sections;
+ 
+@@ -1804,6 +1805,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+                         return FALSE;
+                     dsection->doodads = tmp;
+                 }
++                else {
++                    dsection->doodads = NULL;
++                }
++
+                 for (k = 0,
+                       sdoodad = ssection->doodads,
+                       ddoodad = dsection->doodads;
+@@ -1831,9 +1836,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+         else {
+             if (dst->geom->sz_sections) {
+                 xfree(dst->geom->sections);
+-                dst->geom->sections = NULL;
+             }
+ 
++            dst->geom->sections = NULL;
+             dst->geom->num_sections = 0;
+             dst->geom->sz_sections = 0;
+         }
+@@ -1862,6 +1867,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+                     }
+                 }
+             }
++            dst->geom->num_doodads = 0;
++            dst->geom->doodads = NULL;
+         }
+ 
+         if (src->geom->num_doodads) {
+@@ -1874,7 +1881,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+                               sizeof(XkbDoodadRec));
+             if (!tmp)
+                 return FALSE;
+-            bzero(tmp, src->geom->num_doodads * sizeof(XkbDoodadRec));
++            memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec));
+             dst->geom->doodads = tmp;
+ 
+             dst->geom->sz_doodads = src->geom->num_doodads;
+@@ -1903,9 +1910,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+         else {
+             if (dst->geom->sz_doodads) {
+                 xfree(dst->geom->doodads);
+-                dst->geom->doodads = NULL;
+             }
+ 
++            dst->geom->doodads = NULL;
+             dst->geom->num_doodads = 0;
+             dst->geom->sz_doodads = 0;
+         }
+@@ -1933,10 +1940,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+             dst->geom->num_key_aliases = dst->geom->sz_key_aliases;
+         }
+         else {
+-            if (dst->geom->sz_key_aliases && dst->geom->key_aliases) {
++            if (dst->geom->key_aliases) {
+                 xfree(dst->geom->key_aliases);
+-                dst->geom->key_aliases = NULL;
+             }
++            dst->geom->key_aliases = NULL;
+             dst->geom->num_key_aliases = 0;
+             dst->geom->sz_key_aliases = 0;
+         }
+@@ -1967,8 +1974,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
+         else {
+             if (dst->geom->label_font) {
+                 xfree(dst->geom->label_font);
+-                dst->geom->label_font = NULL;
+             }
++            dst->geom->label_font = NULL;
+             dst->geom->label_color = NULL;
+             dst->geom->base_color = NULL;
+         }
+-- 
+1.5.5.1
+