diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2008-06-11 21:13:33 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-06-11 21:13:33 +0000 |
| commit | 8772ef7f89d9eb48fad529669a858bfbb77bc41a (patch) | |
| tree | 43fa93426a561426fc4921de2ace7a01141e654f /x11-base | |
| parent | Marking freetype-2.3.6 ppc64 for bug 225851 (diff) | |
| download | historical-8772ef7f89d9eb48fad529669a858bfbb77bc41a.tar.gz historical-8772ef7f89d9eb48fad529669a858bfbb77bc41a.tar.bz2 historical-8772ef7f89d9eb48fad529669a858bfbb77bc41a.zip | |
This had pretty much the same patches that are in 1.4.2.
Package-Manager: portage-2.1.5.4
Diffstat (limited to 'x11-base')
62 files changed, 104 insertions, 3664 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 6d343ade2757..a215426e1ccb 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,98 @@ # 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.334 2008/06/11 21:06:11 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.335 2008/06/11 21:13:32 dberkholz Exp $ + + 11 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; + -files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch, + -files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.p + atch, -files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch, + -files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch, + -files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.pa + tch, + -files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.pa + tch, + -files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch + , + -files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patc + h, + -files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.pa + tch, + -files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.pa + tch, + -files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.pa + tch, + -files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.pa + tch, + -files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.pa + tch, + -files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patc + h, + -files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.pa + tch, -files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch, + -files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch, + -files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.p + atch, -files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch, + -files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch, + -files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.p + atch, + -files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.pa + tch, + -files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.pat + ch, + -files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.p + atch, + -files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.pat + ch, + -files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window. + patch, + -files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch, + -files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r. + patch, -files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch, + -files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.pa + tch, + -files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts. + patch, + -files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn. + patch, -files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch, + -files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch, + -files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch, + -files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch, + -files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.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/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch, + -files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch, + -files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch, + -files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.pat + ch, + -files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.pa + tch, + -files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch, + -files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.pa + tch, + -files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patc + h, -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, -xorg-server-1.4.0.90-r4.ebuild: + This had pretty much the same patches that are in 1.4.2. 11 Jun 2008; Brent Baude <ranger@gentoo.org> xorg-server-1.3.0.0-r6.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index c36deb35a622..47c6d0921048 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd @@ -32,65 +35,6 @@ AUX 1.4-fix-xprint-link.patch 588 RMD160 4a5ec1cd69047a94917c0bf29f1f557ec05059c AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7 -AUX 1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.patch 1066 RMD160 7a7d2f10eba4e2f20ecf793a54faa22dabdde573 SHA1 e00b0e764771bddaf2541b6b8c2d0da4999733ca SHA256 aafce7a98dcfea631c44504ab5bff78e7010ca9899bfb8749d5190b3cb171d86 -AUX 1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch 1115 RMD160 4fa84411171f2e6f965bd7a1911f603fdd4dbbf9 SHA1 60f5914ec97dec52e72a29cdfb36558f81ecda15 SHA256 55824948145bf996a43868dd93cdcd5df043e3ac3a672cdc5cf52abe06005eba -AUX 1.4.0.90/0003-Xprint-Clean-up-generated-files.patch 719 RMD160 4bc21f3eac1c2ea737fbc5c46a4e6628795c6bcc SHA1 3803df8e78f91e0b069a87f2b1b8ab22da85b46e SHA256 f1afa2d771072bdb04e47228ef0067ed180f19e8967277e7aa0deab69104372c -AUX 1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch 1353 RMD160 c745c7d25659d5d2a1694d4cd10e3e4af4385b33 SHA1 c3cb5a8f94c969825e6e4af83b082bc3fa754055 SHA256 22a3764f72cd888de7756965cdd7650c4bae1d34791604c7a073bbc2218668eb -AUX 1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.patch 1919 RMD160 7d0f9d86e7eb5fe732203a7af52b9033e890ccad SHA1 bce54d3f452ea020e05ff012c279c6cc5d49cab9 SHA256 a46cafdfa293dc16b35a9977f449a84cc8deb347a1aabcb305546d9e3efc8711 -AUX 1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.patch 830 RMD160 fdd8a862086307bdfc3379ca24b94a6eb49b145c SHA1 41a08647dd535a45b0adb81401c8b8358b43cf7c SHA256 74b4171174d67ea019e961d562aff504704c815136d8bfff79ecbd166a017bcf -AUX 1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch 872 RMD160 eaec47dfad778585659a4d6ba90dc67e94cb63a4 SHA1 be85ab848e1ad57076bf4852d2e7c8b88ed29c3c SHA256 bb950597d42649e799bca994c0a7958bdc28a64ac8e81e537e4ac10e2e5c7a0c -AUX 1.4.0.90/0008-Input-Don-t-reinit-devices.patch 921 RMD160 4b7f1a8e27c65dee361aa75fc6738d823f0383b1 SHA1 8493c75328f58a882cc919541d4e0ecebed31852 SHA256 338b148789a84087f5208e2eda5925aa5e80e86c75e902640d0141e6034b619c -AUX 1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.patch 1489 RMD160 f17760b034b1e71dfe4a2e950d8624b973141ae8 SHA1 6467bfee92765e15355c3b7a4e7f45e86c265ba9 SHA256 d010e9bd9f5ecd47ca2de1995a390502dcfdbc9d73ac434e9e04229b7ba96365 -AUX 1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch 861 RMD160 0f6ac780a880dfab70159fbd770b7fbaf070e8f8 SHA1 36faf03d4133ae742479987ac90758aeedfa2193 SHA256 e220b704b72db42ea62c5a1b2fcf644137c4fd19dcb61f4b74d4b987222ff1a3 -AUX 1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch 941 RMD160 49d4dca11b70ae89ff21800fe85df7f82be34170 SHA1 20a243ba686462b857a022f2052988be9706593b SHA256 ac4fad50d2baf4988d53567d6a9ca59cd19aa9a5435ee4ad4a3b69a6c4028f9c -AUX 1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch 912 RMD160 75a735c8763090de987371cb13e76b2b12453d14 SHA1 62ca71d5f158f76edcab37e954b3b16798b82e61 SHA256 ea73a5ec0b0d75c88b852dbba533d0be66634f2df883ece2f938f250d47a4ec8 -AUX 1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch 980 RMD160 5088fb0cb840b9f6e77187a76bd2d48e397b9eba SHA1 8318fb14dee695e11771a3d83a669c63497f4c41 SHA256 22f66fb059e03e64d869d43aff6292271b830c64fd79d0d2a190f141f0da588d -AUX 1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch 747 RMD160 3fc0e01aa2cf0f1f22691caff9001b35afb937ab SHA1 26b9473115e4e891364f0ef2d4f2702aa7654edf SHA256 31023b19e4731027b7f141da58a0b73e668f6479283d8d6a32b18c94dde5987e -AUX 1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch 7342 RMD160 eca6339c9c94d3dba77a38ab5b18ba284db647ff SHA1 a018b5f3d83924c16c97a3f33ebf4c6244959210 SHA256 771f6f0b8d7db8df4a7a020684bd1f4bf67967e00fe18b8b178b0d396983380a -AUX 1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch 6830 RMD160 4a5d691c978ad37440474710ed24c65a406ae77d SHA1 f5a8be495d0dcc97b2de9f63b92012e5b253982c SHA256 2b70079c797d3dee6ba7778f7abe86c9f2ffdef1e37cdbb02b5ca2ff49e82d5a -AUX 1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch 912 RMD160 cbce0d132c50cca78c49e19452e191ef68814816 SHA1 d44cf3bb2d43a932599b013c0acb8dc7a9b67ff9 SHA256 9f7a61d4c27cf3212e0403f3815a0ee1aa9c9834d536b26637960e777deda65e -AUX 1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch 870 RMD160 5a1590a2c0ff8fa05f42bc521c6ff4eab835ed1c SHA1 168f778221d4946d23916ee90b8b23cef2e384a1 SHA256 c0cbaf1b750b7b34cdc6ac759927bde2c10fb9358c6f792b6762a690755a3d2f -AUX 1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch 2663 RMD160 df43d1007c2d7929cc905578ce16e9190f86e5f9 SHA1 e441902688afceb3a69743f983d0cf8757583e5d SHA256 5879807da70afa579ca3cb4950e05ea4753e5c04393ebdf67bf3aea472246b42 -AUX 1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.patch 1141 RMD160 46d0bbc11476b5387dc6f40dc6ed364b91ed85e9 SHA1 6ec2db7ab5875001d697072603f7bbb0dd5b0918 SHA256 c1bcd5408be9ec752a0e9fbefc446cfba66e175a68fec7bbb4784b2afd84e690 -AUX 1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.patch 1018 RMD160 74973f08908b1886771918c0d09d74bc18973291 SHA1 33bcdf1f34438b82f2f49f1230c454d44db806f7 SHA256 f01010eb2ebb0004ca5021d7d82e4ca9a7ca97fc601575c75458186113c89e59 -AUX 1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.patch 778 RMD160 583086061e91f8bcabc65e8ca532ca17f3b33f62 SHA1 057838b8e32b1372e7fe5e9cacd3db26a3170e63 SHA256 16239f6f3eede01a10fc188664d5ec65bfc7abe2323c6a69eb3ce15b8e463c94 -AUX 1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.patch 2001 RMD160 564a712f423ed253f3cb81cf095501a2058db25a SHA1 a58feb741cbb822a9662348ea8955db84309a669 SHA256 f6a012697d9c82b70f79f15e40dcd15eda1ea3712837ea489924a2f174fc9fff -AUX 1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch 1160 RMD160 5f73d797e973e5bf7725d4e1676e0cc382c40658 SHA1 d8addba81bae9a2150c162b896619bd42ca4397d SHA256 c8b90041b3b2d30cfe203690064a5d377613b4518e3baffd8657d275c58b98e4 -AUX 1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch 1353 RMD160 45f37da1ee642fc182d9977a59bf7b45403b8467 SHA1 c10b77bed7f2f016cb2d43a097a431461915af8d SHA256 215cd3641d36511a1184cffd248e580e8411caaf865c53b37ab5b1e32d1291c9 -AUX 1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch 1332 RMD160 63011b66b47f30a4426559bb68aafac152b7c037 SHA1 219ca0a2bb455192c1944b7b18d4963cef499545 SHA256 e3e23bfd39b0d16fb31bef0ef3218e8548de43eee2b011e0a5d9b409d7d15b02 -AUX 1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.patch 1019 RMD160 1939ba0bf9ede3b4f4742a987d89e3f3d85d0edf SHA1 d6125ad5ee945417fdf4c7adc1e9624d00e425a7 SHA256 caf657582c25de122ddebc930ebea9c0535a162192ac1338fcb6721485ef1627 -AUX 1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.patch 2993 RMD160 e843dd1b627bc669337b4de0fd2202c861897f8c SHA1 69e312c2687cfe2278ad57ab438808ba79ef9f37 SHA256 f7d2a501e60cf0f9eab3866a14852df8d4bfa57c12236506b5866fb77a7e733f -AUX 1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch 1570 RMD160 10234d211dc79ac71bcef7606700db66d6f2dc5b SHA1 54b7ebe23e4efb9276b9413d2dde9c9d4edc7dcd SHA256 918d5a558afa80ad0c179652d23e6ef36f7316c5444ca3836540081ec4518d25 -AUX 1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch 780 RMD160 3c59fbd4af8344349bdd7c6c2b06a017a41946fe SHA1 2878663b1794200bae152631b63e3b26ffd9e94f SHA256 857e61a19a0acfb4e4ed4dca8943e72c2d0859b33c4968f5a48393e0ceea8423 -AUX 1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch 862 RMD160 ee5b9ed8ed0ac4499704a008c6e79254a6e508e7 SHA1 4bdad4e4a8100e18ae511292b34ca4bdf9bd45c9 SHA256 a00c0ebb2a523a5ecbe79b78af040df95ea25fb93c313507137add7530e35439 -AUX 1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch 3158 RMD160 7aecd1b497f126ae520c2dff358ea7db762d9e37 SHA1 91ab28e5f463c22142112d3c0f03c205fe39be11 SHA256 9cc487dba264d9c170e8deae56ab42860fb40f9503b13b5b5b07ff84a0956fe7 -AUX 1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch 1119 RMD160 9afa1abfa053ce22cf9106536b32367b963e2f15 SHA1 e8af7f18d14373e1b64f42a0af6cf51c9ac15a58 SHA256 6fca5d008038282ac4ea05ae80b68709be5902a5e6cfbb604636e3d454400173 -AUX 1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch 1718 RMD160 81c0003858710177ddd879b67c301a1442996a98 SHA1 031231c784f39940281a2cf68387c09c821fa487 SHA256 4c7d930aa63f4e91e069552246097e6e3318718e740b8fa23bc8159e566d8bb9 -AUX 1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch 643 RMD160 22b1f3f586856c511ed6a4504c19623a22b53a81 SHA1 511eb3b79ce670a7246080989e778713e384de5c SHA256 943bedf7d50aa2edfdc863956c6d8aa421a8bcc117ee27553a9aa399b36493d2 -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/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patch 1350 RMD160 7abec3b4353b95022c5a76cc38493866d2d44381 SHA1 0842a62ed2d0bed558dea0a3df696cc041d4d6e7 SHA256 20a2dc688886de6ac6516c9c15a493fb847460b4c67adf1a247cf104d23c90f6 -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/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.patch 3670 RMD160 465cffebdcde7dc52022ae7133ff335347fd7605 SHA1 c311b2e4b5874718698671f56f89a269a9ebbaf7 SHA256 640f5b876364047fce4754615c159f7f9f527afb3deab5246b86853defb639ec -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/0043-XKB-Actually-explain-keymap-failures.patch 4163 RMD160 f9747730ee551ec64dd386aab41d4f560b313407 SHA1 29c45125eea26dc0a2163f19e0180e47fb886494 SHA256 bc9ca4b91b89a18db0fba597a0673f5b747a9fd79b1e046c769fca50239acea1 -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 @@ -113,8 +57,14 @@ 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.3.0.0-r6.ebuild 18360 RMD160 765467f2f583284f2cf4c4d5496a2e1e6c261af1 SHA1 e064e4740ad87574cb96f127f1fe75e815aa4d64 SHA256 c61902207a7b6c7f91c1f9edcf53fa853f6fe2e377f5fd7905247b8264a92789 EBUILD xorg-server-1.4.0.90-r3.ebuild 19023 RMD160 6e6f374d79d0fb7ca2404e33314816829766085b SHA1 0c3707ddbf15604cf887843a52dcccc43c94db70 SHA256 3530c253f1087d4c7c782a2260294b0ca0d1bdd0eb11e4b1553ce93c68a1f319 -EBUILD xorg-server-1.4.0.90-r4.ebuild 18073 RMD160 91ec7eb6b104a41a0310ccec7ea3bd95e9997eb0 SHA1 98e48accd059cdcd77069ca35b5cd3f9a3e3e960 SHA256 f929b07a3387b77a5654507c8d126f1d6d18cfb8b38a4480d967469ef8d34ed1 EBUILD xorg-server-1.4.2.ebuild 17913 RMD160 6201c56afdb27a6496aa308b5e5919df81721daa SHA1 25a69e5fea191dab8d5d2429b68763967df569df SHA256 a3d6e4bd073781b82f3360cf7f1711ae085d656f96df8a903214830215735987 EBUILD xorg-server-1.4.99.902.ebuild 17595 RMD160 354412d2e44c6169e1967fdbcc552920050ef087 SHA1 fc57a9b7179aabd4c0281ef5a9770cb847cc3cf3 SHA256 3da84ccbca046dbb2184f5d5e621423d360d405c497b50d4693cf64eb6b20fa5 -MISC ChangeLog 78402 RMD160 0797152d780c53db9e752c2dbf2ff776f117a573 SHA1 cb9d0e6b81045636ef8029342f3af031f14fe3ed SHA256 ede9dd2ecfc211a27103078d37b4b2c9465aadf0e99ada2edc64f5445a32b59a +MISC ChangeLog 83110 RMD160 38334520449010269839d15e5df4e955d99e87d0 SHA1 fb71ba36cb0389b82f0c93662422649b4f7bd63f SHA256 aef226ff71558ad76c68cb74d5112a3415e8559ef6a68ca23457b430540bd95a MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkhQQAQACgkQXVaO67S1rtu76wCgkQWcThje5A6OwGpIG68+Pqfe +P/cAoKpIu1RmbboSSq8dKc2FdihN74LH +=l4sU +-----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.patch b/x11-base/xorg-server/files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.patch deleted file mode 100644 index 5a7c1aad6058..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0001-Bug-13308-Verify-and-reject-obviously-broken-modes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f4bcb53e86bb103b6bcf8a3a170a36137c34d272 Mon Sep 17 00:00:00 2001 -From: Hong Liu <hong.liu@intel.com> -Date: Wed, 5 Dec 2007 17:48:28 +0100 -Subject: [PATCH] Bug 13308: Verify and reject obviously broken modes. - (cherry picked from commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1) - ---- - hw/xfree86/modes/xf86EdidModes.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c -index 8b5e69d..e2ae665 100644 ---- a/hw/xfree86/modes/xf86EdidModes.c -+++ b/hw/xfree86/modes/xf86EdidModes.c -@@ -239,6 +239,12 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing, - Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width; - Mode->VTotal = timing->v_active + timing->v_blanking; - -+ /* perform basic check on the detail timing */ -+ if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) { -+ xfree(Mode); -+ return NULL; -+ } -+ - xf86SetModeDefaultName(Mode); - - /* We ignore h/v_size and h/v_border for now. */ --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch b/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch deleted file mode 100644 index 9ec86c51e4b0..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0002-bgPixel-unsigned-long-is-64-bit-on-x86_64-so-1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 41f735fbe02f59bc7bcca335c6e743c72c2fc44c Mon Sep 17 00:00:00 2001 -From: Hong Liu <hong.liu@intel.com> -Date: Tue, 4 Sep 2007 08:46:46 +0100 -Subject: [PATCH] bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff - -This patch should fix bug 8080. -(cherry picked from commit 9adea807038b64292403ede982075fe1dcfd4c9a) ---- - hw/xfree86/xaa/xaaGC.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c -index f3434c9..b3dc83a 100644 ---- a/hw/xfree86/xaa/xaaGC.c -+++ b/hw/xfree86/xaa/xaaGC.c -@@ -80,10 +80,11 @@ XAAValidateGC( - } - - if(pGC->depth != 32) { -- if(pGC->bgPixel == -1) /* -1 is reserved for transparency */ -- pGC->bgPixel = 0x7fffffff; -- if(pGC->fgPixel == -1) /* -1 is reserved for transparency */ -- pGC->fgPixel = 0x7fffffff; -+ /* 0xffffffff is reserved for transparency */ -+ if(pGC->bgPixel == 0xffffffff) -+ pGC->bgPixel = 0x7fffffff; -+ if(pGC->fgPixel == 0xffffffff) -+ pGC->fgPixel = 0x7fffffff; - } - - if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){ --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch b/x11-base/xorg-server/files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch deleted file mode 100644 index 79d927ea6e0c..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0003-Xprint-Clean-up-generated-files.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d988da6eee8422774dff364050bf431b843a714a Mon Sep 17 00:00:00 2001 -From: Arkadiusz Miskiewicz <arekm@maven.pl> -Date: Thu, 13 Dec 2007 00:09:08 +0200 -Subject: [PATCH] Xprint: Clean up generated files - -Remember to clean generated wrapper files. -(cherry picked from commit 977fcdea8198906936a64b8117e6a6d027c617e3) ---- - hw/xprint/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am -index dc8764a..f834966 100644 ---- a/hw/xprint/Makefile.am -+++ b/hw/xprint/Makefile.am -@@ -41,3 +41,5 @@ Xprt_SOURCES = \ - $(top_srcdir)/fb/fbcmap_mi.c - - EXTRA_DIST = ValTree.c -+ -+CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch b/x11-base/xorg-server/files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch deleted file mode 100644 index badf8a4bab30..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0004-Config-D-Bus-Don-t-leak-timers.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 81c5950d0af8d5859f850b98c98a532784e9a757 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 28 Dec 2007 15:47:21 +0200 -Subject: [PATCH] Config: D-Bus: Don't leak timers - -TimerCancel doesn't free the timer: you need TimerFree for that. -(cherry picked from commit 25deaa7e6b29b3913b35efa39b9c8b25de5e6d95) ---- - config/dbus-core.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/config/dbus-core.c b/config/dbus-core.c -index eab72a5..9cf1530 100644 ---- a/config/dbus-core.c -+++ b/config/dbus-core.c -@@ -76,7 +76,7 @@ teardown(void) - struct config_dbus_core_hook *hook; - - if (bus_info.timer) { -- TimerCancel(bus_info.timer); -+ TimerFree(bus_info.timer); - bus_info.timer = NULL; - } - -@@ -116,6 +116,8 @@ message_filter(DBusConnection *connection, DBusMessage *message, void *data) - bus_info.connection = NULL; - teardown(); - -+ if (bus_info.timer) -+ TimerFree(bus_info.timer); - bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); - - return DBUS_HANDLER_RESULT_HANDLED; -@@ -186,6 +188,7 @@ static CARD32 - reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg) - { - if (connect_to_bus()) { -+ TimerFree(bus_info.timer); - bus_info.timer = NULL; - return 0; - } --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.patch b/x11-base/xorg-server/files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.patch deleted file mode 100644 index bd49b58cbbf6..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0005-Config-HAL-Don-t-leak-options-on-failure-to-add-de.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 30fc8053a5e734c3b70156bdae94fd7d5d7865a5 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 28 Dec 2007 15:47:57 +0200 -Subject: [PATCH] Config: HAL: Don't leak options on failure to add device - -This showed up in Xephyr in particular, which denies new device requests. -(cherry picked from commit 2bb199056edf6c63cf978d1a8ad49a57ce1938f3) ---- - config/hal.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/config/hal.c b/config/hal.c -index 4427deb..16f16ec 100644 ---- a/config/hal.c -+++ b/config/hal.c -@@ -92,6 +92,8 @@ add_option(InputOption **options, const char *key, const char *value) - for (; *options; options = &(*options)->next) - ; - *options = xcalloc(sizeof(**options), 1); -+ if (!*options) /* Yeesh. */ -+ return; - (*options)->key = xstrdup(key); - (*options)->value = xstrdup(value); - (*options)->next = NULL; -@@ -156,7 +158,7 @@ device_added(LibHalContext *hal_ctx, const char *udi) - char *path = NULL, *driver = NULL, *name = NULL, *xkb_rules = NULL; - char *xkb_model = NULL, *xkb_layout = NULL, *xkb_variant = NULL; - char *xkb_options = NULL, *config_info = NULL; -- InputOption *options = NULL; -+ InputOption *options = NULL, *tmpo = NULL; - DeviceIntPtr dev; - DBusError error; - int type = TYPE_NONE; -@@ -232,6 +234,7 @@ device_added(LibHalContext *hal_ctx, const char *udi) - - if (NewInputDeviceRequest(options, &dev) != Success) { - DebugF("[config/hal] NewInputDeviceRequest failed\n"); -+ dev = NULL; - goto unwind; - } - -@@ -255,6 +258,12 @@ unwind: - xfree(xkb_options); - if (config_info) - xfree(config_info); -+ while (!dev && (tmpo = options)) { -+ options = tmpo->next; -+ xfree(tmpo->key); -+ xfree(tmpo->value); -+ xfree(tmpo); -+ } - - out_error: - dbus_error_free(&error); --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.patch b/x11-base/xorg-server/files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.patch deleted file mode 100644 index d688b5bea13f..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0006-OS-Don-t-leak-connection-translation-table-on-regen.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 38d8cfaaff0ae6273d9e921aae08b2706355f0d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 28 Dec 2007 15:48:25 +0200 -Subject: [PATCH] OS: Don't leak connection translation table on regeneration - (cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154) - ---- - os/connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/os/connection.c b/os/connection.c -index b944593..d1ba845 100644 ---- a/os/connection.c -+++ b/os/connection.c -@@ -353,7 +353,8 @@ InitConnectionLimits(void) - #endif - - #if !defined(WIN32) -- ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1)); -+ if (!ConnectionTranslation) -+ ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1)); - #else - InitConnectionTranslation(); - #endif --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch b/x11-base/xorg-server/files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch deleted file mode 100644 index 73b0fdb7302b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0007-KDrive-Xephyr-Don-t-leak-screen-damage-structure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a304fc1d4a7062f65161ef8748fd358639ec73de Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 28 Dec 2007 15:48:57 +0200 -Subject: [PATCH] KDrive: Xephyr: Don't leak screen damage structure - (cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5) - ---- - hw/kdrive/ephyr/ephyr.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c -index e8001df..27165a5 100644 ---- a/hw/kdrive/ephyr/ephyr.c -+++ b/hw/kdrive/ephyr/ephyr.c -@@ -394,6 +394,7 @@ ephyrUnsetInternalDamage (ScreenPtr pScreen) - - pPixmap = (*pScreen->GetScreenPixmap) (pScreen); - DamageUnregister (&pPixmap->drawable, scrpriv->pDamage); -+ DamageDestroy (scrpriv->pDamage); - - RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler, - ephyrInternalDamageWakeupHandler, --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch b/x11-base/xorg-server/files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch deleted file mode 100644 index 1ecac07ccb57..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0008-Input-Don-t-reinit-devices.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 102c012c206cbb3bbf0fa5b0c8f0ce2ce9bba72a Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 28 Dec 2007 15:49:50 +0200 -Subject: [PATCH] Input: Don't reinit devices - -If a device is already initialised (i.e. the virtual core devices) during -IASD, don't init them again. This fixes a leak. -(cherry picked from commit 1f6015c8fe62c28cfaa82cc855b5b9c28fd34607) ---- - dix/devices.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/dix/devices.c b/dix/devices.c -index 287d730..f6f3c8e 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -473,7 +473,8 @@ InitAndStartDevices(void) - - for (dev = inputInfo.off_devices; dev; dev = dev->next) { - DebugF("(dix) initialising device %d\n", dev->id); -- ActivateDevice(dev); -+ if (!dev->inited) -+ ActivateDevice(dev); - } - for (dev = inputInfo.off_devices; dev; dev = next) - { --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.patch b/x11-base/xorg-server/files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.patch deleted file mode 100644 index aa9019b64f2e..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0009-include-never-overwrite-realInputProc-with-enqueueI.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 60144ac814ee26e151186f7c93cb1a273468d497 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Wed, 19 Dec 2007 16:20:36 +1030 -Subject: [PATCH] include: never overwrite realInputProc with enqueueInputProc. Bug #13511 - -In some cases (triggered by a key repeat during a sync grab) XKB unwrapping -can overwrite the device's realInputProc with the enqueueInputProc. When the -grab is released and the events are replayed, we end up in an infinite loop. -Each event is replayed and in replaying pushed to the end of the queue again. - -This fix is a hack only. It ensures that the realInputProc is never -overwritten with the enqueueInputProc. - -This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511) -(cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335) -(cherry picked from commit 50e80c39870adfdc84fdbc00dddf1362117ad443) ---- - include/xkbsrv.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index 167dbec..9174eb6 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -258,7 +258,8 @@ typedef struct - device->public.processInputProc = proc; \ - oldprocs->processInputProc = \ - oldprocs->realInputProc = device->public.realInputProc; \ -- device->public.realInputProc = proc; \ -+ if (proc != device->public.enqueueInputProc) \ -+ device->public.realInputProc = proc; \ - oldprocs->unwrapProc = device->unwrapProc; \ - device->unwrapProc = unwrapproc; - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch b/x11-base/xorg-server/files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch deleted file mode 100644 index 2102d4bef552..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0010-OS-IO-Zero-out-client-buffers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 02e805f0ff4b6af551372ba5fc5fb369c8834d1d Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Sat, 5 Jan 2008 10:38:16 +0200 -Subject: [PATCH] OS: IO: Zero out client buffers - -For alignment reasons, we can write out uninitialised bytes, so allocate -the whole thing with xcalloc. -(cherry picked from commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2) ---- - os/io.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/os/io.c b/os/io.c -index 9de75ee..a8b84fb 100644 ---- a/os/io.c -+++ b/os/io.c -@@ -1197,7 +1197,7 @@ AllocateOutputBuffer(void) - oco = (ConnectionOutputPtr)xalloc(sizeof(ConnectionOutput)); - if (!oco) - return (ConnectionOutputPtr)NULL; -- oco->buf = (unsigned char *) xalloc(BUFSIZE); -+ oco->buf = (unsigned char *) xcalloc(1, BUFSIZE); - if (!oco->buf) - { - xfree(oco); --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch b/x11-base/xorg-server/files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch deleted file mode 100644 index 9aa87c8a9985..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0011-XKB-XkbCopyKeymap-Don-t-leak-all-the-sections.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8a3acd3ec41b887b4aeaa0b2932265522c1e2836 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Sat, 5 Jan 2008 10:43:53 +0200 -Subject: [PATCH] XKB: XkbCopyKeymap: Don't leak all the sections - -Previously, we'd just keep num_sections at 0, which would break the -geometry and lead us to leak sections. Don't do that. -(cherry picked from commit 0137b0394a248f694448a7d97c9a1a3efcf24e81) ---- - xkb/xkbUtils.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c -index c7f9a26..e90df0d 100644 ---- a/xkb/xkbUtils.c -+++ b/xkb/xkbUtils.c -@@ -1770,6 +1770,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies) - if (!tmp) - return FALSE; - dst->geom->sections = tmp; -+ dst->geom->num_sections = src->geom->num_sections; - - for (i = 0, - ssection = src->geom->sections, --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch b/x11-base/xorg-server/files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch deleted file mode 100644 index a26dce5bf835..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0012-Xephyr-One-time-keyboard-leak-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 636aa9e7be2822a0148067a11499ad48fe682cd9 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Sat, 5 Jan 2008 10:47:39 +0200 -Subject: [PATCH] Xephyr: One-time keyboard leak fix - -Don't leak the originally-allocated keysym map. -(cherry picked from commit e85130c85f727466fc27be1cfa46c88b257499fb) ---- - hw/kdrive/ephyr/ephyr.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c -index 27165a5..86e8f1f 100644 ---- a/hw/kdrive/ephyr/ephyr.c -+++ b/hw/kdrive/ephyr/ephyr.c -@@ -915,6 +915,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki) - ki->minScanCode = ki->keySyms.minKeyCode; - ki->maxScanCode = ki->keySyms.maxKeyCode; - ki->keySyms.mapWidth = ephyrKeySyms.mapWidth; -+ xfree(ki->keySyms.map); - ki->keySyms.map = ephyrKeySyms.map; - ki->name = KdSaveString("Xephyr virtual keyboard"); - ephyrKbd = ki; --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch b/x11-base/xorg-server/files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch deleted file mode 100644 index e63fc49b8378..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0013-Fix-for-CVE-2007-5760-XFree86-Misc-extension-out-o.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 59a3b83922c810316a374a19484b24901c7437ae Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 15:26:41 +0100 -Subject: [PATCH] Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index - ---- - hw/xfree86/common/xf86MiscExt.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c -index c1b9c60..40c196a 100644 ---- a/hw/xfree86/common/xf86MiscExt.c -+++ b/hw/xfree86/common/xf86MiscExt.c -@@ -548,6 +548,10 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval, - { - ScrnInfoPtr pScr = xf86Screens[scrnIndex]; - -+ /* should check this in the protocol, but xf86NumScreens isn't exported */ -+ if (scrnIndex >= xf86NumScreens) -+ return BadValue; -+ - if (*pScr->HandleMessage == NULL) - return BadImplementation; - return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr); --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch b/x11-base/xorg-server/files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch deleted file mode 100644 index c5d0a946ea4f..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0014-Fix-for-CVE-2007-6428-TOG-cup-extension-memory-cor.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4848d49d05a318559afe7a17a19ba055947ee1f5 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 15:28:03 +0100 -Subject: [PATCH] Fix for CVE-2007-6428 - TOG-cup extension memory corruption. - ---- - Xext/cup.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/Xext/cup.c b/Xext/cup.c -index 6bfa278..781b9ce 100644 ---- a/Xext/cup.c -+++ b/Xext/cup.c -@@ -196,6 +196,9 @@ int ProcGetReservedColormapEntries( - - REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq); - -+ if (stuff->screen >= screenInfo.numScreens) -+ return BadValue; -+ - #ifndef HAVE_SPECIAL_DESKTOP_COLORS - citems[CUP_BLACK_PIXEL].pixel = - screenInfo.screens[stuff->screen]->blackPixel; --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch b/x11-base/xorg-server/files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch deleted file mode 100644 index b69a980f7f76..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0015-Fix-for-CVE-2007-6427-Xinput-extension-memory-corr.patch +++ /dev/null @@ -1,262 +0,0 @@ -From d244c8272e0ac47c41a9416e37293903b842a78b Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 15:27:34 +0100 -Subject: [PATCH] Fix for CVE-2007-6427 - Xinput extension memory corruption. - ---- - Xi/chgfctl.c | 7 +------ - Xi/chgkmap.c | 13 ++++++------- - Xi/chgprop.c | 10 +++------- - Xi/grabdev.c | 12 +++++------- - Xi/grabdevb.c | 10 +++------- - Xi/grabdevk.c | 9 ++------- - Xi/selectev.c | 11 ++++------- - Xi/sendexev.c | 14 ++++++++------ - 8 files changed, 32 insertions(+), 54 deletions(-) - -diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c -index 2e0e13c..235d659 100644 ---- a/Xi/chgfctl.c -+++ b/Xi/chgfctl.c -@@ -327,18 +327,13 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, - xStringFeedbackCtl * f) - { - char n; -- long *p; - int i, j; - KeySym *syms, *sup_syms; - - syms = (KeySym *) (f + 1); - if (client->swapped) { - swaps(&f->length, n); /* swapped num_keysyms in calling proc */ -- p = (long *)(syms); -- for (i = 0; i < f->num_keysyms; i++) { -- swapl(p, n); -- p++; -- } -+ SwapLongs((CARD32 *) syms, f->num_keysyms); - } - - if (f->num_keysyms > s->ctrl.max_symbols) { -diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c -index eac520f..f8f85bc 100644 ---- a/Xi/chgkmap.c -+++ b/Xi/chgkmap.c -@@ -79,18 +79,14 @@ int - SProcXChangeDeviceKeyMapping(ClientPtr client) - { - char n; -- long *p; -- int i, count; -+ unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); -- p = (long *)&stuff[1]; - count = stuff->keyCodes * stuff->keySymsPerKeyCode; -- for (i = 0; i < count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), count); - return (ProcXChangeDeviceKeyMapping(client)); - } - -@@ -106,10 +102,13 @@ ProcXChangeDeviceKeyMapping(ClientPtr client) - int ret; - unsigned len; - DeviceIntPtr dev; -+ unsigned int count; - - REQUEST(xChangeDeviceKeyMappingReq); - REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq); - -+ count = stuff->keyCodes * stuff->keySymsPerKeyCode; -+ REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); - dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) { - SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, -diff --git a/Xi/chgprop.c b/Xi/chgprop.c -index 59a93c6..21bda5b 100644 ---- a/Xi/chgprop.c -+++ b/Xi/chgprop.c -@@ -81,19 +81,15 @@ int - SProcXChangeDeviceDontPropagateList(ClientPtr client) - { - char n; -- long *p; -- int i; - - REQUEST(xChangeDeviceDontPropagateListReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); - return (ProcXChangeDeviceDontPropagateList(client)); - } - -diff --git a/Xi/grabdev.c b/Xi/grabdev.c -index e2809ef..d0b4ae7 100644 ---- a/Xi/grabdev.c -+++ b/Xi/grabdev.c -@@ -82,8 +82,6 @@ int - SProcXGrabDevice(ClientPtr client) - { - char n; -- long *p; -- int i; - - REQUEST(xGrabDeviceReq); - swaps(&stuff->length, n); -@@ -91,11 +89,11 @@ SProcXGrabDevice(ClientPtr client) - swapl(&stuff->grabWindow, n); - swapl(&stuff->time, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ -+ if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count) -+ return BadLength; -+ -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDevice(client)); - } -diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c -index df62d0c..18db1f7 100644 ---- a/Xi/grabdevb.c -+++ b/Xi/grabdevb.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceButton(ClientPtr client) - { - char n; -- long *p; -- int i; - - REQUEST(xGrabDeviceButtonReq); - swaps(&stuff->length, n); -@@ -89,11 +87,9 @@ SProcXGrabDeviceButton(ClientPtr client) - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceButtonReq, -+ stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - - return (ProcXGrabDeviceButton(client)); - } -diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c -index b74592f..429b2f7 100644 ---- a/Xi/grabdevk.c -+++ b/Xi/grabdevk.c -@@ -80,8 +80,6 @@ int - SProcXGrabDeviceKey(ClientPtr client) - { - char n; -- long *p; -- int i; - - REQUEST(xGrabDeviceKeyReq); - swaps(&stuff->length, n); -@@ -89,11 +87,8 @@ SProcXGrabDeviceKey(ClientPtr client) - swapl(&stuff->grabWindow, n); - swaps(&stuff->modifiers, n); - swaps(&stuff->event_count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->event_count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return (ProcXGrabDeviceKey(client)); - } - -diff --git a/Xi/selectev.c b/Xi/selectev.c -index d52db1b..19415c5 100644 ---- a/Xi/selectev.c -+++ b/Xi/selectev.c -@@ -131,19 +131,16 @@ int - SProcXSelectExtensionEvent(ClientPtr client) - { - char n; -- long *p; -- int i; - - REQUEST(xSelectExtensionEventReq); - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); - swapl(&stuff->window, n); - swaps(&stuff->count, n); -- p = (long *)&stuff[1]; -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ REQUEST_FIXED_SIZE(xSelectExtensionEventReq, -+ stuff->count * sizeof(CARD32)); -+ SwapLongs((CARD32 *) (&stuff[1]), stuff->count); -+ - return (ProcXSelectExtensionEvent(client)); - } - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index eac9abe..9803cf3 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -83,7 +83,7 @@ int - SProcXSendExtensionEvent(ClientPtr client) - { - char n; -- long *p; -+ CARD32 *p; - int i; - xEvent eventT; - xEvent *eventP; -@@ -94,6 +94,11 @@ SProcXSendExtensionEvent(ClientPtr client) - REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq); - swapl(&stuff->destination, n); - swaps(&stuff->count, n); -+ -+ if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + -+ (stuff->num_events * (sizeof(xEvent) >> 2))) -+ return BadLength; -+ - eventP = (xEvent *) & stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { - proc = EventSwapVector[eventP->u.u.type & 0177]; -@@ -103,11 +108,8 @@ SProcXSendExtensionEvent(ClientPtr client) - *eventP = eventT; - } - -- p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events); -- for (i = 0; i < stuff->count; i++) { -- swapl(p, n); -- p++; -- } -+ p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); -+ SwapLongs(p, stuff->count); - return (ProcXSendExtensionEvent(client)); - } - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch b/x11-base/xorg-server/files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch deleted file mode 100644 index 48448dd550ba..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0016-Fix-for-CVE-2007-6429-MIT-SHM-and-EVI-extensions-i.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 8b14f7b74284900b95a319ec80c4333e63af2296 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 15:28:42 +0100 -Subject: [PATCH] Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows. - ---- - Xext/EVI.c | 15 ++++++++++++++- - Xext/sampleEVI.c | 29 ++++++++++++++++++++++++----- - Xext/shm.c | 46 ++++++++++++++++++++++++++++++++++++++-------- - 3 files changed, 76 insertions(+), 14 deletions(-) - -diff --git a/Xext/EVI.c b/Xext/EVI.c -index 8fe3481..13bd32a 100644 ---- a/Xext/EVI.c -+++ b/Xext/EVI.c -@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include <X11/extensions/XEVIstr.h> - #include "EVIstruct.h" - #include "modinit.h" -+#include "scrnintstr.h" - - #if 0 - static unsigned char XEVIReqCode = 0; -@@ -87,10 +88,22 @@ ProcEVIGetVisualInfo(ClientPtr client) - { - REQUEST(xEVIGetVisualInfoReq); - xEVIGetVisualInfoReply rep; -- int n, n_conflict, n_info, sz_info, sz_conflict; -+ int i, n, n_conflict, n_info, sz_info, sz_conflict; - VisualID32 *conflict; -+ unsigned int total_visuals = 0; - xExtendedVisualInfo *eviInfo; - int status; -+ -+ /* -+ * do this first, otherwise REQUEST_FIXED_SIZE can overflow. we assume -+ * here that you don't have more than 2^32 visuals over all your screens; -+ * this seems like a safe assumption. -+ */ -+ for (i = 0; i < screenInfo.numScreens; i++) -+ total_visuals += screenInfo.screens[i]->numVisuals; -+ if (stuff->n_visual > total_visuals) -+ return BadValue; -+ - REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32); - status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual, - &eviInfo, &n_info, &conflict, &n_conflict); -diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c -index 7508aa7..b871bfd 100644 ---- a/Xext/sampleEVI.c -+++ b/Xext/sampleEVI.c -@@ -34,6 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include <X11/extensions/XEVIstr.h> - #include "EVIstruct.h" - #include "scrnintstr.h" -+ -+#if HAVE_STDINT_H -+#include <stdint.h> -+#elif !defined(UINT32_MAX) -+#define UINT32_MAX 0xffffffffU -+#endif -+ - static int sampleGetVisualInfo( - VisualID32 *visual, - int n_visual, -@@ -42,24 +49,36 @@ static int sampleGetVisualInfo( - VisualID32 **conflict_rn, - int *n_conflict_rn) - { -- int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens; -+ unsigned int max_sz_evi; - VisualID32 *temp_conflict; - xExtendedVisualInfo *evi; -- int max_visuals = 0, max_sz_conflict, sz_conflict = 0; -+ unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0; - register int visualI, scrI, sz_evi = 0, conflictI, n_conflict; -- *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi); -- if (!*evi_rn) -- return BadAlloc; -+ -+ if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens)) -+ return BadAlloc; -+ max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens; -+ - for (scrI = 0; scrI < screenInfo.numScreens; scrI++) { - if (screenInfo.screens[scrI]->numVisuals > max_visuals) - max_visuals = screenInfo.screens[scrI]->numVisuals; - } -+ -+ if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens -+ * max_visuals)) -+ return BadAlloc; - max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals; -+ -+ *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi); -+ if (!*evi_rn) -+ return BadAlloc; -+ - temp_conflict = (VisualID32 *)xalloc(max_sz_conflict); - if (!temp_conflict) { - xfree(*evi_rn); - return BadAlloc; - } -+ - for (scrI = 0; scrI < screenInfo.numScreens; scrI++) { - for (visualI = 0; visualI < n_visual; visualI++) { - evi[sz_evi].core_visual_id = visual[visualI]; -diff --git a/Xext/shm.c b/Xext/shm.c -index ac587be..5633be9 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -711,6 +711,8 @@ ProcPanoramiXShmCreatePixmap( - int i, j, result, rc; - ShmDescPtr shmdesc; - REQUEST(xShmCreatePixmapReq); -+ unsigned int width, height, depth; -+ unsigned long size; - PanoramiXRes *newPix; - - REQUEST_SIZE_MATCH(xShmCreatePixmapReq); -@@ -724,11 +726,26 @@ ProcPanoramiXShmCreatePixmap( - return rc; - - VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); -- if (!stuff->width || !stuff->height) -+ -+ width = stuff->width; -+ height = stuff->height; -+ depth = stuff->depth; -+ if (!width || !height || !depth) - { - client->errorValue = 0; - return BadValue; - } -+ if (width > 32767 || height > 32767) -+ return BadAlloc; -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; -@@ -739,9 +756,7 @@ ProcPanoramiXShmCreatePixmap( - return BadValue; - } - CreatePmap: -- VERIFY_SHMSIZE(shmdesc, stuff->offset, -- PixmapBytePad(stuff->width, stuff->depth) * stuff->height, -- client); -+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - - if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) - return BadAlloc; -@@ -1040,6 +1055,8 @@ ProcShmCreatePixmap(client) - register int i, rc; - ShmDescPtr shmdesc; - REQUEST(xShmCreatePixmapReq); -+ unsigned int width, height, depth; -+ unsigned long size; - - REQUEST_SIZE_MATCH(xShmCreatePixmapReq); - client->errorValue = stuff->pid; -@@ -1052,11 +1069,26 @@ ProcShmCreatePixmap(client) - return rc; - - VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); -- if (!stuff->width || !stuff->height) -+ -+ width = stuff->width; -+ height = stuff->height; -+ depth = stuff->depth; -+ if (!width || !height || !depth) - { - client->errorValue = 0; - return BadValue; - } -+ if (width > 32767 || height > 32767) -+ return BadAlloc; -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - if (stuff->depth != 1) - { - pDepth = pDraw->pScreen->allowedDepths; -@@ -1067,9 +1099,7 @@ ProcShmCreatePixmap(client) - return BadValue; - } - CreatePmap: -- VERIFY_SHMSIZE(shmdesc, stuff->offset, -- PixmapBytePad(stuff->width, stuff->depth) * stuff->height, -- client); -+ VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( - pDraw->pScreen, stuff->width, - stuff->height, stuff->depth, --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch b/x11-base/xorg-server/files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch deleted file mode 100644 index c16294c055f4..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0017-Fix-for-CVE-2008-0006-PCF-Font-parser-buffer-overf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f09b8007e7f6e60e0b9c9665ec632b578ae08b6f Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 15:29:06 +0100 -Subject: [PATCH] Fix for CVE-2008-0006 - PCF Font parser buffer overflow. - ---- - dix/dixfonts.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index c21b3ec..7bb2404 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -325,6 +325,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c) - err = BadFontName; - goto bail; - } -+ /* check values for firstCol, lastCol, firstRow, and lastRow */ -+ if (pfont->info.firstCol > pfont->info.lastCol || -+ pfont->info.firstRow > pfont->info.lastRow || -+ pfont->info.lastCol - pfont->info.firstCol > 255) { -+ err = AllocError; -+ goto bail; -+ } - if (!pfont->fpe) - pfont->fpe = fpe; - pfont->refcnt++; --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch b/x11-base/xorg-server/files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch deleted file mode 100644 index 889e57adc3e7..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0018-Fix-for-CVE-2007-5958-File-existence-disclosure.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 19b95cdd1d14a1e7d1abba1880ab023c96f19bf5 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Thu, 17 Jan 2008 17:03:39 +0100 -Subject: [PATCH] Fix for CVE-2007-5958 - File existence disclosure. - ---- - Xext/security.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Xext/security.c b/Xext/security.c -index ba057de..e9d48c9 100644 ---- a/Xext/security.c -+++ b/Xext/security.c -@@ -1563,7 +1563,7 @@ SecurityLoadPropertyAccessList(void) - if (!SecurityPolicyFile) - return; - -- f = fopen(SecurityPolicyFile, "r"); -+ f = Fopen(SecurityPolicyFile, "r"); - if (!f) - { - ErrorF("error opening security policy file %s\n", -@@ -1646,7 +1646,7 @@ SecurityLoadPropertyAccessList(void) - } - #endif /* PROPDEBUG */ - -- fclose(f); -+ Fclose(f); - } /* SecurityLoadPropertyAccessList */ - - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch b/x11-base/xorg-server/files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch deleted file mode 100644 index bd5758fbf908..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0019-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch +++ /dev/null @@ -1,86 +0,0 @@ -From b6d4cdf64f43ae805beada6122c8be2ed138742c Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Fri, 18 Jan 2008 14:41:20 -0500 -Subject: [PATCH] CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps. - -Move size validation after depth validation, and only validate size if -the bpp of the pixmap format is > 8. If bpp < 8 then we're already -protected from overflow by the width and height checks. -(cherry picked from commit e9fa7c1c88a8130a48f772c92b186b8b777986b5) ---- - Xext/shm.c | 36 ++++++++++++++++++++---------------- - 1 files changed, 20 insertions(+), 16 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 5633be9..6f99e90 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -737,14 +737,6 @@ ProcPanoramiXShmCreatePixmap( - } - if (width > 32767 || height > 32767) - return BadAlloc; -- size = PixmapBytePad(width, depth) * height; -- if (sizeof(size) == 4) { -- if (size < width * height) -- return BadAlloc; -- /* thankfully, offset is unsigned */ -- if (stuff->offset + size < size) -- return BadAlloc; -- } - - if (stuff->depth != 1) - { -@@ -755,7 +747,17 @@ ProcPanoramiXShmCreatePixmap( - client->errorValue = stuff->depth; - return BadValue; - } -+ - CreatePmap: -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - - if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)))) -@@ -1080,14 +1082,6 @@ ProcShmCreatePixmap(client) - } - if (width > 32767 || height > 32767) - return BadAlloc; -- size = PixmapBytePad(width, depth) * height; -- if (sizeof(size) == 4) { -- if (size < width * height) -- return BadAlloc; -- /* thankfully, offset is unsigned */ -- if (stuff->offset + size < size) -- return BadAlloc; -- } - - if (stuff->depth != 1) - { -@@ -1098,7 +1092,17 @@ ProcShmCreatePixmap(client) - client->errorValue = stuff->depth; - return BadValue; - } -+ - CreatePmap: -+ size = PixmapBytePad(width, depth) * height; -+ if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { -+ if (size < width * height) -+ return BadAlloc; -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; -+ } -+ - VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( - pDraw->pScreen, stuff->width, --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.patch b/x11-base/xorg-server/files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.patch deleted file mode 100644 index 12bdac48926c..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0020-dix-set-the-correct-number-of-valuators-in-valuator.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e98027c3ac7195fec665ef393d980b02870ca1b8 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Tue, 18 Dec 2007 13:57:07 +1030 -Subject: [PATCH] dix: set the correct number of valuators in valuator events. - -(first_valuator + num_valuators) must never be larger than the number of axes, -otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is -wrong too. -(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e) ---- - dix/getevents.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 12d8189..b7ba69b 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -344,7 +344,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator, - for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) { - xv->type = DeviceValuator; - xv->first_valuator = i; -- xv->num_valuators = num_valuators; -+ xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i); - xv->deviceid = pDev->id; - switch (final_valuator - i) { - case 6: --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.patch b/x11-base/xorg-server/files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.patch deleted file mode 100644 index 5bbcfc33dcc5..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0021-xkb-don-t-update-LEDs-if-they-don-t-exist.-Bug-13.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc72ef3a159efd67067322c043bba444869dc356 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Wed, 30 Jan 2008 10:39:54 +1030 -Subject: [PATCH] xkb: don't update LEDs if they don't exist. (Bug #13961) - -In some weird cases we call this function when there is no SrvLedInfo on the -device. And it turns out null-pointer dereferences are bad. - -X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961> -(cherry picked from commit d954f9c80348de294602d931d387e5cd1ef4b9a5) ---- - xkb/xkbLEDs.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c -index d607d90..d28973c 100644 ---- a/xkb/xkbLEDs.c -+++ b/xkb/xkbLEDs.c -@@ -63,6 +63,9 @@ XkbSrvLedInfoPtr sli; - - sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0); - -+ if (!sli) -+ return update; -+ - if (state_changes&(XkbModifierStateMask|XkbGroupStateMask)) - update|= sli->usesEffective; - if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask)) --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.patch b/x11-base/xorg-server/files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.patch deleted file mode 100644 index 0df2277305d0..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0022-security-Fix-for-Bug-14480-untrusted-access-broke.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 74b40bba327a2e97780e8e3f995f784add2d6231 Mon Sep 17 00:00:00 2001 -From: Eamon Walsh <ewalsh@tycho.nsa.gov> -Date: Thu, 14 Feb 2008 19:47:44 -0500 -Subject: [PATCH] security: Fix for Bug #14480: untrusted access broken in 7.3. - ---- - Xext/security.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xext/security.c b/Xext/security.c -index e9d48c9..14ad354 100644 ---- a/Xext/security.c -+++ b/Xext/security.c -@@ -1014,7 +1014,7 @@ CALLBACK(SecurityCheckResourceIDAccess) - } - else /* server-owned resource - probably a default colormap or root window */ - { -- if (RT_WINDOW == rtype || RC_DRAWABLE == rtype) -+ if (RC_DRAWABLE & rtype) - { - switch (reqtype) - { /* the following operations are allowed on root windows */ --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.patch b/x11-base/xorg-server/files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.patch deleted file mode 100644 index 53864528fa3d..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0023-Resize-composite-overlay-window-when-the-root-window.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3db5930c61aeb849de3b21e7ba0d86d3c0cf72bb Mon Sep 17 00:00:00 2001 -From: Maarten Maathuis <madman2003@gmail.com> -Date: Sun, 17 Feb 2008 11:21:01 +0100 -Subject: [PATCH] Resize composite overlay window when the root window changes. - -- This allows some compositing managers to work, even after randr12 has changed the root window size. -- Thanks to ajax for figuring out the best place to put this. -- Example: - - xf86RandR12SetMode() calls EnableDisableFBAccess(). - - That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize(). - - The final step is the call to PositionWindow(). -(cherry picked from commit 70c0592a97c7dc9db0576d32b3bdbe4766520509) ---- - composite/compwindow.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -diff --git a/composite/compwindow.c b/composite/compwindow.c -index bfd2946..33192ad 100644 ---- a/composite/compwindow.c -+++ b/composite/compwindow.c -@@ -165,6 +165,29 @@ compCheckRedirect (WindowPtr pWin) - return TRUE; - } - -+static int -+updateOverlayWindow(ScreenPtr pScreen) -+{ -+ CompScreenPtr cs; -+ WindowPtr pWin; /* overlay window */ -+ XID vlist[2]; -+ -+ cs = GetCompScreen(pScreen); -+ if ((pWin = cs->pOverlayWin) != NULL) { -+ if ((pWin->drawable.width == pScreen->width) && -+ (pWin->drawable.height == pScreen->height)) -+ return Success; -+ -+ /* Let's resize the overlay window. */ -+ vlist[0] = pScreen->width; -+ vlist[1] = pScreen->height; -+ return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin)); -+ } -+ -+ /* Let's be on the safe side and not assume an overlay window is always allocated. */ -+ return Success; -+} -+ - Bool - compPositionWindow (WindowPtr pWin, int x, int y) - { -@@ -203,6 +226,8 @@ compPositionWindow (WindowPtr pWin, int x, int y) - cs->PositionWindow = pScreen->PositionWindow; - pScreen->PositionWindow = compPositionWindow; - compCheckTree (pWin->drawable.pScreen); -+ if (updateOverlayWindow(pScreen) != Success) -+ ret = FALSE; - return ret; - } - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch b/x11-base/xorg-server/files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch deleted file mode 100644 index 33a9cc04f728..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0024-Fix-rotation-for-multi-monitor-situation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dc30ade6496c7cc24e38c419e229159525fe042f Mon Sep 17 00:00:00 2001 -From: Maarten Maathuis <madman2003@gmail.com> -Date: Sun, 17 Feb 2008 18:47:28 +0100 -Subject: [PATCH] Fix rotation for multi-monitor situation. - -- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find. -- Fix bug #13787. -(cherry picked from commit a48cc88ea2674c28b69b8d738b168cbafcf4001f) ---- - hw/xfree86/modes/xf86Rotate.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c -index 380478f..dd0e659 100644 ---- a/hw/xfree86/modes/xf86Rotate.c -+++ b/hw/xfree86/modes/xf86Rotate.c -@@ -579,9 +579,9 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation) - } - else - { -- PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y); -+ PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y)); - PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc); -- -+ - /* - * these are the size of the shadow pixmap, which - * matches the mode, not the pre-rotated copy in the --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch b/x11-base/xorg-server/files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch deleted file mode 100644 index 9e5904dd2110..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0025-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bcbfd619f8da888224afd80ee3a2db7d500523eb Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com> -Date: Wed, 16 Jan 2008 20:24:11 -0500 -Subject: [PATCH] Don't break grab and focus state for a window when redirecting it. - -Composite uses an unmap/map cycle to trigger backing pixmap allocation -and cliprect recomputation when a window is redirected or unredirected. -To avoid protocol visible side effects, map and unmap events are -disabled temporarily. However, when a window is unmapped it is also -removed from grabs and loses focus, but these state changes are not -disabled. - -This change supresses the unmap side effects during the composite -unmap/map cycle and fixes this bug: - - http://bugzilla.gnome.org/show_bug.cgi?id=488264 - -where compiz would cause gnome-screensaver to lose its grab when -compiz unredirects the fullscreen lock window. ---- - dix/window.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/dix/window.c b/dix/window.c -index be4ea2c..961c02a 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -3023,7 +3023,8 @@ UnrealizeTree( - } - #endif - (* Unrealize)(pChild); -- DeleteWindowFromAnyEvents(pChild, FALSE); -+ if (MapUnmapEventsEnabled(pWin)) -+ DeleteWindowFromAnyEvents(pChild, FALSE); - if (pChild->viewable) - { - #ifdef DO_SAVE_UNDERS --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch b/x11-base/xorg-server/files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch deleted file mode 100644 index aa4900834e0d..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0026-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 44f46bfb981ca69515dafc520f62f33654711194 Mon Sep 17 00:00:00 2001 -From: Matthias Hopf <mhopf@suse.de> -Date: Mon, 21 Jan 2008 16:13:21 +0100 -Subject: [PATCH] CVE-2007-6429: Always test for size+offset wrapping. - ---- - Xext/shm.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 6f99e90..376f123 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -753,10 +753,10 @@ CreatePmap: - if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { - if (size < width * height) - return BadAlloc; -- /* thankfully, offset is unsigned */ -- if (stuff->offset + size < size) -- return BadAlloc; - } -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; - - VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - -@@ -1098,10 +1098,10 @@ CreatePmap: - if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) { - if (size < width * height) - return BadAlloc; -- /* thankfully, offset is unsigned */ -- if (stuff->offset + size < size) -- return BadAlloc; - } -+ /* thankfully, offset is unsigned */ -+ if (stuff->offset + size < size) -+ return BadAlloc; - - VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client); - pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)( --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.patch b/x11-base/xorg-server/files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.patch deleted file mode 100644 index 07642e134f94..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0027-Fix-context-sharing-between-direct-indirect-contexts.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a65d4aed06acd839fb21153f74144498abda3e18 Mon Sep 17 00:00:00 2001 -From: Alan Hourihane <alanh@tungstengraphics.com> -Date: Wed, 27 Feb 2008 16:49:34 +0000 -Subject: [PATCH] Fix context sharing between direct/indirect contexts - ---- - GL/glx/glxdri.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c -index 685683d..09abca3 100644 ---- a/GL/glx/glxdri.c -+++ b/GL/glx/glxdri.c -@@ -598,6 +598,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, - else - sharePrivate = NULL; - -+ if (baseShareContext && baseShareContext->isDirect) -+ return NULL; -+ - context = xalloc(sizeof *context); - if (context == NULL) - return NULL; -@@ -617,6 +620,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen, - 0, /* render type */ - sharePrivate, - &context->driContext); -+ -+ if (!context->driContext.private) { -+ xfree(context); -+ return NULL; -+ } - - context->driContext.mode = modes; - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.patch b/x11-base/xorg-server/files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.patch deleted file mode 100644 index 7f1e0dda5d80..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0028-Add-some-more-support-for-DragonFly.-From-Joerg-Sonn.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 76b950cd6e03f0060afe463871de4570fca90213 Mon Sep 17 00:00:00 2001 -From: Jeremy C. Reed <reed@glacier.reedmedia.net> -Date: Thu, 16 Aug 2007 11:20:12 -0500 -Subject: [PATCH] Add some more support for DragonFly. From Joerg Sonnenberger - and pkgsrc. - (cherry picked from commit 1d4bea6106d7a1c83e1dfe37fad8268589feaa0b) - ---- - Xext/shm.c | 2 +- - Xext/xf86bigfont.c | 2 +- - hw/xfree86/loader/os.c | 2 ++ - hw/xfree86/os-support/bus/Pci.h | 2 +- - hw/xfree86/os-support/bus/freebsdPci.c | 2 +- - 5 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 376f123..3c0d1ee 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -154,7 +154,7 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage}; - } - - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) - #include <sys/signal.h> - - static Bool badSysCall = FALSE; -diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c -index f50481f..c2f891a 100644 ---- a/Xext/xf86bigfont.c -+++ b/Xext/xf86bigfont.c -@@ -104,7 +104,7 @@ static unsigned int pagesize; - - static Bool badSysCall = FALSE; - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) - - #include <sys/signal.h> - -diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c -index fdddce8..12cf3d8 100644 ---- a/hw/xfree86/loader/os.c -+++ b/hw/xfree86/loader/os.c -@@ -42,6 +42,8 @@ - #define OSNAME "linux" - #elif defined(__FreeBSD__) - #define OSNAME "freebsd" -+#elif defined(__DragonFly__) -+#define OSNAME "dragonfly" - #elif defined(__NetBSD__) - #define OSNAME "netbsd" - #elif defined(__OpenBSD__) -diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h -index f0cb916..5ebbdd5 100644 ---- a/hw/xfree86/os-support/bus/Pci.h -+++ b/hw/xfree86/os-support/bus/Pci.h -@@ -235,7 +235,7 @@ - # if defined(linux) - # define ARCH_PCI_INIT axpPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# elif defined(__FreeBSD__) || defined(__OpenBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c -index 61cb405..63c00b2 100644 ---- a/hw/xfree86/os-support/bus/freebsdPci.c -+++ b/hw/xfree86/os-support/bus/freebsdPci.c -@@ -83,7 +83,7 @@ static pciBusInfo_t freebsdPci0 = { - /* bridge */ NULL - }; - --#if !defined(__OpenBSD__) && !defined(__FreeBSD__) -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - #if X_BYTE_ORDER == X_BIG_ENDIAN - #ifdef __sparc__ - #ifndef ASI_PL --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch b/x11-base/xorg-server/files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch deleted file mode 100644 index 27320bdd19ea..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0029-configure.ac-DragonFly-BSD-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From dd6b0de38d649617600a8357e576955c9b831328 Mon Sep 17 00:00:00 2001 -From: Hasso Tepper <hasso@estpak.ee> -Date: Mon, 7 Apr 2008 14:09:04 +0300 -Subject: [PATCH] configure.ac: DragonFly BSD support - -Add support for DragonFly BSD, which is just the same as FreeBSD for all -of these cases. -(cherry picked from commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2) ---- - configure.ac | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 72d9819..dfb2950 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -291,6 +291,7 @@ case $host_cpu in - darwin*) use_x86_asm="no" ;; - *linux*) DEFAULT_INT10=vm86 ;; - *freebsd*) AC_DEFINE(USE_DEV_IO) ;; -+ *dragonfly*) AC_DEFINE(USE_DEV_IO) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL) - SYS_LIBS=-li386 - ;; -@@ -316,6 +317,7 @@ case $host_cpu in - case $host_os in - darwin*) use_x86_asm="no" ;; - *freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; -+ *dragonfly*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) - SYS_LIBS=-lx86_64 - ;; -@@ -337,7 +339,7 @@ DRI=no - KDRIVE_HW=no - dnl it would be nice to autodetect these *CONS_SUPPORTs - case $host_os in -- *freebsd*) -+ *freebsd* | *dragonfly*) - case $host_os in - kfreebsd*-gnu) ;; - *) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;; -@@ -1363,7 +1365,7 @@ return 0;} - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - XORG_OS="freebsd" - XORG_OS_SUBDIR="bsd" - case $host_cpu in --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch b/x11-base/xorg-server/files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch deleted file mode 100644 index cd4ba964abb2..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0030-Fixed-configure.ac-for-autoconf-2.62.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9e9eeca2b094fa9edb9c20002d42aeafb14ad1e4 Mon Sep 17 00:00:00 2001 -From: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Thu, 10 Apr 2008 21:36:19 +0200 -Subject: [PATCH] Fixed configure.ac for autoconf 2.62. - (cherry picked from commit 3c337e18b933881e22b0d03312511f1d23a8640b) - ---- - configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dfb2950..4841d26 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1964,7 +1964,9 @@ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" - - AC_SUBST([DIX_CFLAGS]) - --AC_SUBST([libdir exec_prefix prefix]) -+AC_SUBST([libdir]) -+AC_SUBST([exec_prefix]) -+AC_SUBST([prefix]) - - # Man page sections - used in config utils & generating man pages - XORG_MANPAGE_SECTIONS --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch b/x11-base/xorg-server/files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch deleted file mode 100644 index 07ea963dcb90..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0031-EXA-Fix-off-by-one-in-polyline-drawing.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6afcf996cade0c9464d6af9b04b177b1de138cfd Mon Sep 17 00:00:00 2001 -From: Pierre Willenbrock <pierre@pirsoft.dnsalias.org> -Date: Tue, 23 Oct 2007 16:45:13 +0200 -Subject: [PATCH] EXA: Fix off-by-one in polyline drawing. - (cherry picked from commit d502521c3669f3f22b94c39a64ab63bfd92c6a97) - ---- - exa/exa_accel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/exa/exa_accel.c b/exa/exa_accel.c -index aed4e42..e8444c6 100644 ---- a/exa/exa_accel.c -+++ b/exa/exa_accel.c -@@ -535,7 +535,7 @@ exaPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, - x1 = ppt[0].x; - y1 = ppt[0].y; - /* If we have any non-horizontal/vertical, fall back. */ -- for (i = 0; i < npt; i++) { -+ for (i = 0; i < npt - 1; i++) { - if (mode == CoordModePrevious) { - x2 = x1 + ppt[i + 1].x; - y2 = y1 + ppt[i + 1].y; --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch b/x11-base/xorg-server/files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch deleted file mode 100644 index e3efcdad3724..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0032-XKB-Fix-processInputProc-wrapping.patch +++ /dev/null @@ -1,83 +0,0 @@ -From fdfb57d342da0ace14eed635804ebc31441240c5 Mon Sep 17 00:00:00 2001 -From: Thomas Jaeger <thjaeger@gmail.com> -Date: Tue, 1 Apr 2008 15:27:06 +0300 -Subject: [PATCH] XKB: Fix processInputProc wrapping - -If input processing is frozen, only wrap realInputProc: don't smash -processInputProc as well. When input processing is thawed, pIP will be -rewrapped correctly. - -This supersedes the previous workaround in 50e80c9. - -Signed-off-by: Daniel Stone <daniel@fooishbar.org> -(cherry picked from commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96) ---- - include/xkbsrv.h | 16 ++++++++++++---- - xkb/xkbActions.c | 9 ++++----- - 2 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index 9174eb6..acf3bb0 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -241,6 +241,14 @@ typedef struct _XkbSrvLedInfo { - typedef struct - { - ProcessInputProc processInputProc; -+ /* If processInputProc is set to something different than realInputProc, -+ * UNWRAP and COND_WRAP will not touch processInputProc and update only -+ * realInputProc. This ensures that -+ * processInputProc == (frozen ? EnqueueEvent : realInputProc) -+ * -+ * WRAP_PROCESS_INPUT_PROC should only be called during initialization, -+ * since it may destroy this invariant. -+ */ - ProcessInputProc realInputProc; - DeviceUnwrapProc unwrapProc; - } xkbDeviceInfoRec, *xkbDeviceInfoPtr; -@@ -258,14 +266,14 @@ typedef struct - device->public.processInputProc = proc; \ - oldprocs->processInputProc = \ - oldprocs->realInputProc = device->public.realInputProc; \ -- if (proc != device->public.enqueueInputProc) \ -- device->public.realInputProc = proc; \ -+ device->public.realInputProc = proc; \ - oldprocs->unwrapProc = device->unwrapProc; \ - device->unwrapProc = unwrapproc; - - #define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \ -- backupproc = device->public.processInputProc; \ -- device->public.processInputProc = oldprocs->processInputProc; \ -+ backupproc = device->public.realInputProc; \ -+ if (device->public.processInputProc == device->public.realInputProc)\ -+ device->public.processInputProc = oldprocs->realInputProc; \ - device->public.realInputProc = oldprocs->realInputProc; \ - device->unwrapProc = oldprocs->unwrapProc; - -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 6edac29..59d34c5 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -50,15 +50,14 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, - pointer data) - { - xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device); -- ProcessInputProc tmp = device->public.processInputProc; -- ProcessInputProc dummy; /* unused, but neede for macro */ -+ ProcessInputProc backupproc; - if(xkbPrivPtr->unwrapProc) - xkbPrivPtr->unwrapProc = NULL; - -- UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, dummy); -+ UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, backupproc); - proc(device,data); -- WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, -- tmp,xkbUnwrapProc); -+ COND_WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, -+ backupproc,xkbUnwrapProc); - } - - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch b/x11-base/xorg-server/files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch deleted file mode 100644 index 4f99da55be7b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0033-xfree86-fix-AlwaysCore-handling.-Bug-14256.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ff4006bd5a71d39cc5655679447c5c47a99a2751 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Tue, 29 Jan 2008 10:01:37 +1030 -Subject: [PATCH] xfree86: fix AlwaysCore handling. (Bug #14256) - -Assume AlwaysCore being set by default, just like the other options. - -X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256> -(cherry picked from commit 5b8641a5fdc112c19e78ca2954878712e328d403) ---- - hw/xfree86/common/xf86Xinput.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index b939fb7..ca2be5c 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -116,7 +116,7 @@ _X_EXPORT void - xf86ProcessCommonOptions(LocalDevicePtr local, - pointer list) - { -- if (xf86SetBoolOption(list, "AlwaysCore", 0) || -+ if (!xf86SetBoolOption(list, "AlwaysCore", 1) || - !xf86SetBoolOption(list, "SendCoreEvents", 1) || - !xf86SetBoolOption(list, "CorePointer", 1) || - !xf86SetBoolOption(list, "CoreKeyboard", 1)) { --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch b/x11-base/xorg-server/files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch deleted file mode 100644 index da020faa9bf0..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0034-Ignore-not-just-block-SIGALRM-around-Popen-Pcl.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6a5066c2e9e872d4ef85ec70745c34d93580177e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Tue, 11 Sep 2007 11:37:06 -0400 -Subject: [PATCH] Ignore - not just block - SIGALRM around Popen()/Pclose(). - -Because our "popen" implementation uses stdio, and because nobody's stdio -library is capable of surviving signals, we need to make absolutely sure -that we hide the SIGALRM from the smart scheduler. Otherwise, when you -open a menu in openoffice, and it recompiles XKB to deal with the -accelerators, and you popen xkbcomp because we suck, then the scheduler -will tell you you're taking forever doing something stupid, and the -wait() code will get confused, and input will hang and your CPU usage -slams to 100%. Down, not across. ---- - os/utils.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/os/utils.c b/os/utils.c -index 3bb7dbe..afcaae4 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -1720,6 +1720,8 @@ static struct pid { - int pid; - } *pidlist; - -+static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */ -+ - pointer - Popen(char *command, char *type) - { -@@ -1741,11 +1743,15 @@ Popen(char *command, char *type) - return NULL; - } - -+ /* Ignore the smart scheduler while this is going on */ -+ old_alarm = signal(SIGALRM, SIG_IGN); -+ - switch (pid = fork()) { - case -1: /* error */ - close(pdes[0]); - close(pdes[1]); - xfree(cur); -+ signal(SIGALRM, old_alarm); - return NULL; - case 0: /* child */ - if (setgid(getgid()) == -1) -@@ -1921,6 +1927,8 @@ Pclose(pointer iop) - /* allow EINTR again */ - OsReleaseSignals (); - -+ signal(SIGALRM, old_alarm); -+ - return pid == -1 ? -1 : pstat; - } - --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch b/x11-base/xorg-server/files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch deleted file mode 100644 index 9436d951964b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0035-Fix-build-on-FreeBSD-after-Popen-changes.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a02b989c68864a7388553fb96e4fbaf91f941c4a Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Wed, 12 Sep 2007 13:23:13 +0000 -Subject: [PATCH] Fix build on FreeBSD after Popen changes. - ---- - os/utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/os/utils.c b/os/utils.c -index afcaae4..144098b 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -1720,7 +1720,7 @@ static struct pid { - int pid; - } *pidlist; - --static sighandler_t old_alarm = NULL; /* XXX horrible awful hack */ -+void (*old_alarm)(int) = NULL; /* XXX horrible awful hack */ - - pointer - Popen(char *command, char *type) --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.patch b/x11-base/xorg-server/files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.patch deleted file mode 100644 index 72379f3c2c91..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0036-So-like-checking-return-codes-of-system-calls-sig.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0fab9843c7b553bb59d57e68d9c3ea2d754bf809 Mon Sep 17 00:00:00 2001 -From: Ben Byer <bbyer@bbyer.apple.com> -Date: Fri, 21 Sep 2007 17:07:36 -0700 -Subject: [PATCH] So, like, checking return codes of system calls (signal, etc) is good. - Also, only restore an old signal handler if one was actually set - (prevents the server from dying on OS X). - ---- - os/utils.c | 24 ++++++++++++++++++++---- - 1 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/os/utils.c b/os/utils.c -index 144098b..36c8dfe 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -285,7 +285,8 @@ OsSignal(sig, handler) - sigaddset(&act.sa_mask, sig); - act.sa_flags = 0; - act.sa_handler = handler; -- sigaction(sig, &act, &oact); -+ if (sigaction(sig, &act, &oact)) -+ perror("sigaction"); - return oact.sa_handler; - #endif - } -@@ -1684,6 +1685,10 @@ System(char *command) - - #ifdef SIGCHLD - csig = signal(SIGCHLD, SIG_DFL); -+ if (csig == SIG_ERR) { -+ perror("signal"); -+ return -1; -+ } - #endif - - #ifdef DEBUG -@@ -1708,7 +1713,10 @@ System(char *command) - } - - #ifdef SIGCHLD -- signal(SIGCHLD, csig); -+ if (signal(SIGCHLD, csig) == SIG_ERR) { -+ perror("signal"); -+ return -1; -+ } - #endif - - return p == -1 ? -1 : status; -@@ -1745,13 +1753,18 @@ Popen(char *command, char *type) - - /* Ignore the smart scheduler while this is going on */ - old_alarm = signal(SIGALRM, SIG_IGN); -+ if (old_alarm == SIG_ERR) { -+ perror("signal"); -+ return NULL; -+ } - - switch (pid = fork()) { - case -1: /* error */ - close(pdes[0]); - close(pdes[1]); - xfree(cur); -- signal(SIGALRM, old_alarm); -+ if (signal(SIGALRM, old_alarm) == SIG_ERR) -+ perror("signal"); - return NULL; - case 0: /* child */ - if (setgid(getgid()) == -1) -@@ -1927,7 +1940,10 @@ Pclose(pointer iop) - /* allow EINTR again */ - OsReleaseSignals (); - -- signal(SIGALRM, old_alarm); -+ if (old_alarm && signal(SIGALRM, old_alarm) == SIG_ERR) { -+ perror("signal"); -+ return -1; -+ } - - return pid == -1 ? -1 : pstat; - } --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch b/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch deleted file mode 100644 index bac9999a9428..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0037-Check-for-sys-sdt.h-as-well-when-determining-to-en.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b95befdfd2c9bcb6b0cd896f2b8dfaaeb129dbff Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri, 7 Dec 2007 17:28:37 -0800 -Subject: [PATCH] Check for <sys/sdt.h> as well when determining to enable dtrace probes - -Avoids auto-detecting dtrace is present on systems with the ISDN trace tool -named dtrace installed, but not the dynamic tracing facility named dtrace ---- - configure.ac | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4841d26..c73f4a7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,6 +66,8 @@ AC_SYS_LARGEFILE - XORG_PROG_RAWCPP - - dnl Check for dtrace program (needed to build Xserver dtrace probes) -+dnl Also checks for <sys/sdt.h>, since some Linux distros have an -+dnl ISDN trace program named dtrace - AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH], - [Enable dtrace probes (default: enabled if dtrace found)]), - [WDTRACE=$withval], [WDTRACE=auto]) -@@ -76,6 +78,11 @@ if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then - AC_MSG_FAILURE([dtrace requested but not found]) - fi - WDTRACE="no" -+ else -+ AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"]) -+ if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then -+ WDTRACE="no" -+ fi - fi - fi - if test "x$WDTRACE" != "xno" ; then --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch b/x11-base/xorg-server/files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch deleted file mode 100644 index 76f0dd8c6641..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0038-dix-Always-add-valuator-information-if-present.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7fa7031cfa9145f55881b87bc39f6e2c8a49ff76 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se> -Date: Sat, 2 Feb 2008 22:44:31 +0100 -Subject: [PATCH] dix: Always add valuator information if present - -Send valuator information for all event types, not only for -MotionEvents and absolute button events. -(cherry picked from commit 12e532403210c15a25200ef448bfe9701735ab20) ---- - dix/getevents.c | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index b7ba69b..36c1bcf 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -523,9 +523,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - int num_events = 0, final_valuator = 0; - CARD32 ms = 0; - deviceKeyButtonPointer *kbp = NULL; -- /* Thanks to a broken lib, we _always_ have to chase DeviceMotionNotifies -- * with DeviceValuators. */ -- Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE); - DeviceIntPtr cp = inputInfo.pointer; - int x = 0, y = 0; - Bool coreOnly = (pDev == inputInfo.pointer); -@@ -551,7 +548,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - return 0; - - /* Do we need to send a DeviceValuator event? */ -- if (!coreOnly && sendValuators) { -+ if (!coreOnly && num_valuators) { - if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS) - num_valuators = MAX_VALUATOR_EVENTS * 6; - num_events += ((num_valuators - 1) / 6) + 1; -@@ -682,7 +679,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - kbp->root_y = y; - - events++; -- if (sendValuators) { -+ if (num_valuators) { - kbp->deviceid |= MORE_EVENTS; - clipValuators(pDev, first_valuator, num_valuators, valuators); - events = getValuatorEvents(events, pDev, first_valuator, --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patch b/x11-base/xorg-server/files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patch deleted file mode 100644 index 7bcedb804e64..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0039-Bug-10324-dix-Allow-arbitrary-value-ranges-in-Ge.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1d79ba8193e9584370ffaaa8dffb4db604125dea Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se> -Date: Sat, 2 Feb 2008 22:45:31 +0100 -Subject: [PATCH] Bug # 10324: dix: Allow arbitrary value ranges in GetPointerEvents - -Don't use a possitive value as a marker for if a max-value -is defined on the valuators. Use the existence of a valid -value range instead. This will also make it possible to -define arbitrary start and end-values for min and max as -long as min < max. -(cherry picked from commit f04c0838699f1a733735838e74cfbb1677b15dc4) ---- - dix/getevents.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 36c1bcf..8595eaf 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -306,10 +306,13 @@ clipAxis(DeviceIntPtr pDev, int axisNum, int *val) - { - AxisInfoPtr axes = pDev->valuator->axes + axisNum; - -- if (*val < axes->min_value) -- *val = axes->min_value; -- if (axes->max_value >= 0 && *val > axes->max_value) -- *val = axes->max_value; -+ /* No clipping if the value-range <= 0 */ -+ if(axes->min_value < axes->min_value) { -+ if (*val < axes->min_value) -+ *val = axes->min_value; -+ if (*val > axes->max_value) -+ *val = axes->max_value; -+ } - } - - /** --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patch b/x11-base/xorg-server/files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patch deleted file mode 100644 index 560aad1f7957..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0040-Bug-10324-dix-Add-scaling-of-X-and-Y-on-the-repo.patch +++ /dev/null @@ -1,173 +0,0 @@ -From b51ca35a7578b64190f663dc825d7fb551b92e73 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se> -Date: Sat, 2 Feb 2008 22:57:32 +0100 -Subject: [PATCH] Bug # 10324: dix: Add scaling of X and Y on the reported pointer-events - -Restore the rescaling code for x and y axis when generating -motion events. -(cherry picked from commit d9e23c4ff1607a62164b34717ef9afd352ce2b94) ---- - dix/getevents.c | 97 +++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 76 insertions(+), 21 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 8595eaf..e0bc326 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -529,6 +529,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - DeviceIntPtr cp = inputInfo.pointer; - int x = 0, y = 0; - Bool coreOnly = (pDev == inputInfo.pointer); -+ ScreenPtr scr = miPointerGetScreen(pDev); - - /* Sanity checks. */ - if (type != MotionNotify && type != ButtonPress && type != ButtonRelease) -@@ -572,20 +573,39 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - x = valuators[0]; - } - else { -- if (pDev->coreEvents) -- x = cp->valuator->lastx; -- else -- x = pDev->valuator->lastx; -+ /* If we're sending core events but didn't provide a value, -+ * translate the core value (but use the device coord if -+ * it translates to the same coord to preserve sub-pixel -+ * coord information). If we're not sending core events use -+ * whatever value we have */ -+ x = pDev->valuator->lastx; -+ if(pDev->coreEvents) { -+ int min = pDev->valuator->axes[0].min_value; -+ int max = pDev->valuator->axes[0].max_value; -+ if(min < max) { -+ if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx) -+ x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min; -+ } -+ else -+ x = cp->valuator->lastx; -+ } - } - - if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) { - y = valuators[1 - first_valuator]; - } - else { -- if (pDev->coreEvents) -- y = cp->valuator->lasty; -- else -- y = pDev->valuator->lasty; -+ y = pDev->valuator->lasty; -+ if(pDev->coreEvents) { -+ int min = pDev->valuator->axes[1].min_value; -+ int max = pDev->valuator->axes[1].max_value; -+ if(min < max) { -+ if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty) -+ y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min; -+ } -+ else -+ y = cp->valuator->lasty; -+ } - } - } - else { -@@ -594,15 +614,35 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - valuators); - - if (pDev->coreEvents) { -- if (first_valuator == 0 && num_valuators >= 1) -- x = cp->valuator->lastx + valuators[0]; -+ /* Get and convert the core pointer coordinate space into -+ * device coordinates. Use the device coords if it translates -+ * into the same position as the core to preserve relative sub- -+ * pixel movements from the device. */ -+ int min = pDev->valuator->axes[0].min_value; -+ int max = pDev->valuator->axes[0].max_value; -+ if(min < max) { -+ x = pDev->valuator->lastx; -+ if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx) -+ x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min; -+ } - else - x = cp->valuator->lastx; - -- if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) -- y = cp->valuator->lasty + valuators[1 - first_valuator]; -+ min = pDev->valuator->axes[1].min_value; -+ max = pDev->valuator->axes[1].max_value; -+ if(min < max) { -+ y = pDev->valuator->lasty; -+ if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty) -+ y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min; -+ } - else - y = cp->valuator->lasty; -+ -+ /* Add relative movement */ -+ if (first_valuator == 0 && num_valuators >= 1) -+ x += valuators[0]; -+ if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) -+ y += valuators[1 - first_valuator]; - } - else { - if (first_valuator == 0 && num_valuators >= 1) -@@ -621,11 +661,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - clipAxis(pDev, 0, &x); - clipAxis(pDev, 1, &y); - -- /* This takes care of crossing screens for us, as well as clipping -- * to the current screen. Right now, we only have one history buffer, -- * so we don't set this for both the device and core.*/ -- miPointerSetPosition(pDev, &x, &y, ms); -- - /* Drop x and y back into the valuators list, if they were originally - * present. */ - if (first_valuator == 0 && num_valuators >= 1) -@@ -635,12 +670,32 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - - updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); - -+ pDev->valuator->lastx = x; -+ pDev->valuator->lasty = y; -+ /* Convert the dev coord back to screen coord if we're -+ * sending core events */ -+ if (pDev->coreEvents) { -+ int min = pDev->valuator->axes[0].min_value; -+ int max = pDev->valuator->axes[0].max_value; -+ if(min < max) -+ x = (int)((float)(x-min)*scr->width/(max-min+1)); -+ cp->valuator->lastx = x; -+ min = pDev->valuator->axes[1].min_value; -+ max = pDev->valuator->axes[1].max_value; -+ if(min < max) -+ y = (int)((float)(y-min)*scr->height/(max-min+1)); -+ cp->valuator->lasty = y; -+ } -+ -+ /* This takes care of crossing screens for us, as well as clipping -+ * to the current screen. Right now, we only have one history buffer, -+ * so we don't set this for both the device and core.*/ -+ miPointerSetPosition(pDev, &x, &y, ms); -+ - if (pDev->coreEvents) { - cp->valuator->lastx = x; - cp->valuator->lasty = y; - } -- pDev->valuator->lastx = x; -- pDev->valuator->lasty = y; - - /* for some reason inputInfo.pointer does not have coreEvents set */ - if (coreOnly || pDev->coreEvents) { -@@ -678,8 +733,8 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - kbp->detail = pDev->button->map[buttons]; - } - -- kbp->root_x = x; -- kbp->root_y = y; -+ kbp->root_x = pDev->valuator->lastx; -+ kbp->root_y = pDev->valuator->lasty; - - events++; - if (num_valuators) { --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.patch b/x11-base/xorg-server/files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.patch deleted file mode 100644 index b9e56ce3733c..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0041-dix-Skip-call-to-clipAxis-for-relative-core-events.patch +++ /dev/null @@ -1,93 +0,0 @@ -From a68d0ef4a65bcd52c52ba54e6925082a9145fad3 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se> -Date: Sat, 2 Feb 2008 23:03:51 +0100 -Subject: [PATCH] dix: Skip call to clipAxis for relative core-events - -Relative events that generates both core and extention -events will have its axis cliped and screen changed by -miPointerSetPosition when the events are processed. For -absolute and non core-generating relative events the -axis must be clipped if we shouldn't end up completely -outside the defined ranges (if any). -(cherry picked from commit a0284d577aabea8406b72dd63773e341430ebe56) ---- - dix/getevents.c | 44 +++++++++++++++++++++++++++++++++----------- - 1 files changed, 33 insertions(+), 11 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index e0bc326..c33371b 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -607,6 +607,10 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - y = cp->valuator->lasty; - } - } -+ -+ /* Clip both x and y to the defined limits (usually co-ord space limit). */ -+ clipAxis(pDev, 0, &x); -+ clipAxis(pDev, 1, &y); - } - else { - if (flags & POINTER_ACCELERATE) -@@ -645,22 +649,22 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - y += valuators[1 - first_valuator]; - } - else { -+ x = pDev->valuator->lastx; -+ y = pDev->valuator->lasty; - if (first_valuator == 0 && num_valuators >= 1) -- x = pDev->valuator->lastx + valuators[0]; -- else -- x = pDev->valuator->lastx; -- -+ x += valuators[0]; - if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) -- y = pDev->valuator->lasty + valuators[1 - first_valuator]; -- else -- y = pDev->valuator->lasty; -+ y += valuators[1 - first_valuator]; -+ -+ if(!coreOnly) { -+ /* Since we're not sending core-events we must clip both x and y -+ * to the defined limits so we don't run outside the box. */ -+ clipAxis(pDev, 0, &x); -+ clipAxis(pDev, 1, &y); -+ } - } - } - -- /* Clip both x and y to the defined limits (usually co-ord space limit). */ -- clipAxis(pDev, 0, &x); -- clipAxis(pDev, 1, &y); -- - /* Drop x and y back into the valuators list, if they were originally - * present. */ - if (first_valuator == 0 && num_valuators >= 1) -@@ -693,6 +697,24 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - miPointerSetPosition(pDev, &x, &y, ms); - - if (pDev->coreEvents) { -+ /* miPointerSetPosition may have changed screen */ -+ scr = miPointerGetScreen(pDev); -+ if(x != cp->valuator->lastx) { -+ int min = pDev->valuator->axes[0].min_value; -+ int max = pDev->valuator->axes[0].max_value; -+ cp->valuator->lastx = pDev->valuator->lastx = x; -+ if(min < max) -+ pDev->valuator->lastx = (int)((float)(x)*(max-min+1)/scr->width)+min; -+ } -+ if(y != cp->valuator->lasty) { -+ int min = pDev->valuator->axes[1].min_value; -+ int max = pDev->valuator->axes[1].max_value; -+ cp->valuator->lasty = pDev->valuator->lasty = y; -+ if(min < max) -+ pDev->valuator->lasty = (int)((float)(y)*(max-min+1)/scr->height)+min; -+ } -+ } -+ else if (coreOnly) { - cp->valuator->lastx = x; - cp->valuator->lasty = y; - } --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.patch b/x11-base/xorg-server/files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.patch deleted file mode 100644 index 766c9f2fe42d..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0042-dix-Move-motion-history-update-until-after-screen-c.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b1145a6b428db2037c79ffb36116e7183f30829f Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se> -Date: Sat, 2 Feb 2008 23:04:46 +0100 -Subject: [PATCH] dix: Move motion history update until after screen crossing and clipping - -Cross screen and clip the coordinates before updating the motion history -so that it will have the same contents as the events that are reported. -(cherry picked from commit a56ef7aaa4b6ac13c8181f68fc7dad3ca89e6973) ---- - dix/getevents.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index c33371b..d0fe2db 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -665,15 +665,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - } - } - -- /* Drop x and y back into the valuators list, if they were originally -- * present. */ -- if (first_valuator == 0 && num_valuators >= 1) -- valuators[0] = x; -- if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) -- valuators[1 - first_valuator] = y; -- -- updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); -- - pDev->valuator->lastx = x; - pDev->valuator->lasty = y; - /* Convert the dev coord back to screen coord if we're -@@ -719,6 +710,15 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, - cp->valuator->lasty = y; - } - -+ /* Drop x and y back into the valuators list, if they were originally -+ * present. */ -+ if (first_valuator == 0 && num_valuators >= 1) -+ valuators[0] = pDev->valuator->lastx; -+ if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) -+ valuators[1 - first_valuator] = pDev->valuator->lasty; -+ -+ updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators); -+ - /* for some reason inputInfo.pointer does not have coreEvents set */ - if (coreOnly || pDev->coreEvents) { - events->u.u.type = type; --- -1.5.5.1 - diff --git a/x11-base/xorg-server/files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch b/x11-base/xorg-server/files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch deleted file mode 100644 index 14ac3f9d448b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0043-XKB-Actually-explain-keymap-failures.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 104048501f37b139d4113562ef1711978cc76018 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Wed, 7 May 2008 23:11:31 +0300 -Subject: [PATCH] XKB: Actually explain keymap failures - -When something went wrong building a keymap, try to explain to the user -what it actually was, instead of the dreaded 'Failed to load XKB keymap' -catch-all. -(cherry picked from commit cf20df39cc78203d17b99223908af388ecbf7d0e) - -Conflicts: - xkb/ddxLoad.c ---- - xkb/ddxLoad.c | 69 ++++++++++++++++++++++++++++----------------------------- - 1 files changed, 34 insertions(+), 35 deletions(-) - -diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c -index d79ae7a..ea9c3ff 100644 ---- a/xkb/ddxLoad.c -+++ b/xkb/ddxLoad.c -@@ -385,24 +385,20 @@ char tmpname[PATH_MAX]; - xfree (buf); - return True; - } --#ifdef DEBUG - else -- ErrorF("Error compiling keymap (%s)\n",keymap); --#endif -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); - #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); - #endif - } --#ifdef DEBUG - else { - #ifndef WIN32 -- ErrorF("Could not invoke keymap compiler\n"); -+ LogMessage(X_ERROR, "XKB: Could not invoke xkbcomp\n"); - #else -- ErrorF("Could not open file %s\n", tmpname); -+ LogMessage(X_ERROR, "Could not open file %s\n", tmpname); - #endif - } --#endif - if (nameRtrn) - nameRtrn[0]= '\0'; - if (buf != NULL) -@@ -477,17 +473,14 @@ unsigned missing; - return 0; - } - else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) { --#ifdef NOISY -- ErrorF("Couldn't compile keymap file\n"); --#endif -+ LogMessage(X_ERROR, "Couldn't compile keymap file %s\n", -+ names->keymap); - return 0; - } - } - else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need, -- nameRtrn,nameRtrnLen)){ --#ifdef NOISY -- ErrorF("Couldn't compile keymap file\n"); --#endif -+ nameRtrn,nameRtrnLen)){ -+ LogMessage(X_ERROR, "XKB: Couldn't compile keymap\n"); - return 0; - } - file= XkbDDXOpenConfigFile(nameRtrn,fileName,PATH_MAX); -@@ -502,11 +495,9 @@ unsigned missing; - (void) unlink (fileName); - return 0; - } --#ifdef DEBUG -- else if (xkbDebugFlags) { -- ErrorF("Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined); -+ else { -+ DebugF("XKB: Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined); - } --#endif - fclose(file); - (void) unlink (fileName); - return (need|want)&(~missing); -@@ -525,32 +516,40 @@ XkbRF_RulesPtr rules; - - if (!rules_name) - return False; -- if (XkbBaseDirectory==NULL) { -- if (strlen(rules_name)+7 > PATH_MAX) -- return False; -- sprintf(buf,"rules/%s",rules_name); -- } -- else { -- if (strlen(XkbBaseDirectory)+strlen(rules_name)+8 > PATH_MAX) -- return False; -- sprintf(buf,"%s/rules/%s",XkbBaseDirectory,rules_name); -+ -+ if (strlen(XkbBaseDirectory) + strlen(rules_name) + 8 > PATH_MAX) { -+ LogMessage(X_ERROR, "XKB: Rules name is too long\n"); -+ return False; - } -- if ((file= fopen(buf,"r"))==NULL) -+ sprintf(buf,"%s/rules/%s", XkbBaseDirectory, rules_name); -+ -+ file = fopen(buf, "r"); -+ if (!file) { -+ LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file); - return False; -- if ((rules= XkbRF_Create(0,0))==NULL) { -+ } -+ -+ rules = XkbRF_Create(0, 0); -+ if (!rules) { -+ LogMessage(X_ERROR, "XKB: Couldn't create rules struct\n"); - fclose(file); - return False; - } -- if (!XkbRF_LoadRules(file,rules)) { -+ -+ if (!XkbRF_LoadRules(file, rules)) { -+ LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name); - fclose(file); - XkbRF_Free(rules,True); - return False; - } -- bzero((char *)names,sizeof(XkbComponentNamesRec)); -- complete= XkbRF_GetComponents(rules,defs,names); -+ -+ memset(names, 0, sizeof(*names)); -+ complete = XkbRF_GetComponents(rules,defs,names); - fclose(file); -- XkbRF_Free(rules,True); -- return complete; --} -+ XkbRF_Free(rules, True); - -+ if (!complete) -+ LogMessage(X_ERROR, "XKB: Rules returned no components\n"); - -+ return complete; -+} --- -1.5.5.1 - 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 deleted file mode 100644 index b81bf80d0149..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0044-kdrive-allow-disabling-Composite.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 37e99ebcd33a..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0045-When-XKB-fails-to-open-rules-file-log-the-file-name.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/0046-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 deleted file mode 100644 index 2f9e037513c9..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0046-dmx-fix-build-by-adding-New-Delete-InputDeviceRequ.patch +++ /dev/null @@ -1,31 +0,0 @@ -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. - ---- - 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/0047-dmx-link-in-XSERVER_LIBS.patch b/x11-base/xorg-server/files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch deleted file mode 100644 index 052fc2a88519..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0047-dmx-link-in-XSERVER_LIBS.patch +++ /dev/null @@ -1,24 +0,0 @@ -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. - ---- - 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/0048-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 deleted file mode 100644 index 23c3dafa1767..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0048-xephyr-fix-linking-by-adding-pixman-and-using-XSERV.patch +++ /dev/null @@ -1,38 +0,0 @@ -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. - ---- - 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/0049-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 deleted file mode 100644 index a70727c1e2bc..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0049-xprint-fix-build-by-adding-New-Delete-InputDeviceR.patch +++ /dev/null @@ -1,34 +0,0 @@ -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. - ---- - 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/0050-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 deleted file mode 100644 index d31bedb23c6b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0050-xprint-fix-linking-by-including-XSERVER_LIBS.patch +++ /dev/null @@ -1,25 +0,0 @@ -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. - ---- - 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/0051-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 deleted file mode 100644 index 6c9b60bdc99a..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0051-Fix-RandR-1.2-driver-interface-conversion-of-two-col.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -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/0052-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 deleted file mode 100644 index 0a7561f295f4..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0052-Fix-overly-restrictive-integer-overflow-check-in-EXA.patch +++ /dev/null @@ -1,28 +0,0 @@ -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. - -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/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 deleted file mode 100644 index 4d24c51c3a04..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0053-Fix-hal-shutdown-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 deleted file mode 100644 index 776521146874..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0054-Bump-DEFAULT_DPI-to-96.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 5c468a8733a5..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0055-Bug-13962-Re-arm-the-DPMS-timer-when-re-enabling-D.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 8b47563d461b..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0056-Prevent-the-wm-command-line-option-from-causing-a-S.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 92a2eb610b70..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0057-EXA-Skip-empty-glyphs.-cherry-picked-from-commit-c.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 94ee0fa271ff..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0058-xf86-Add-AutoConfig-driver-for-PCI-ID-1022-2081-to.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 2c04964973c3..000000000000 --- a/x11-base/xorg-server/files/1.4.0.90/0059-xkb-when-copying-the-keymap-make-sure-the-structs.patch +++ /dev/null @@ -1,121 +0,0 @@ -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 - 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 deleted file mode 100644 index 02db9feb8822..000000000000 --- a/x11-base/xorg-server/xorg-server-1.4.0.90-r4.ebuild +++ /dev/null @@ -1,576 +0,0 @@ -# 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.5 2008/05/21 17:22:00 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular multilib - -OPENGL_DIR="xorg-x11" - -MESA_PN="Mesa" -MESA_PV="7.0.2" -MESA_P="${MESA_PN}-${MESA_PV}" -MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" - -SRC_URI="${SRC_URI} - mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2 - http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2" -DESCRIPTION="X.Org X servers" -KEYWORDS="" -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_calcomp - input_devices_citron - input_devices_digitaledge - input_devices_dmc - input_devices_dynapro - input_devices_elo2300 - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_jamstudio - input_devices_joystick - input_devices_keyboard - input_devices_magellan - input_devices_microtouch - input_devices_mouse - input_devices_mutouch - input_devices_palmax - input_devices_penmount - input_devices_spaceorb - input_devices_summa - input_devices_tek4957 - input_devices_ur98 - input_devices_vmmouse - input_devices_void - - input_devices_synaptics - input_devices_wacom" -IUSE_VIDEO_CARDS=" - video_cards_apm - video_cards_ark - video_cards_chips - video_cards_cirrus - video_cards_cyrix - video_cards_dummy - video_cards_epson - video_cards_fbdev - video_cards_geode - video_cards_glint - video_cards_i128 - video_cards_i740 - video_cards_i810 - video_cards_impact - video_cards_imstt - video_cards_mach64 - video_cards_mga - video_cards_neomagic - video_cards_newport - video_cards_nsc - video_cards_nv - video_cards_r128 - video_cards_radeon - video_cards_rendition - video_cards_s3 - video_cards_s3virge - video_cards_savage - video_cards_siliconmotion - video_cards_sis - video_cards_sisusb - video_cards_sunbw2 - video_cards_suncg14 - video_cards_suncg3 - video_cards_suncg6 - video_cards_sunffb - video_cards_sunleo - video_cards_suntcx - video_cards_tdfx - video_cards_tga - video_cards_trident - video_cards_tseng - video_cards_v4l - video_cards_vermilion - video_cards_vesa - video_cards_vga - video_cards_via - video_cards_vmware - video_cards_voodoo - video_cards_xgi - video_cards_fglrx - video_cards_nvidia" -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_VIDEO_CARDS} - ${IUSE_INPUT_DEVICES} - ${IUSE_SERVERS} - 3dfx - dri hal ipv6 minimal nptl sdl xprint" -RDEPEND="hal? ( sys-apps/hal ) - >=x11-libs/libXfont-1.3.1 - >=x11-libs/xtrans-1.0.4 - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXext-1.0.2 - >=x11-libs/libX11-1.1.3 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXi-1.1.3 - >=x11-libs/pixman-0.9.5 - media-libs/freetype - >=media-libs/mesa-7.0.1 - media-fonts/font-adobe-75dpi - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-0.9 - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.1 - >=x11-apps/xauth-1.0.2 - >=x11-apps/xinit-1.0.5 - app-admin/eselect-opengl - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXpm-3.5.7 - >=x11-libs/libXxf86misc-1.0.1 - >=x11-libs/libXxf86vm-1.0.1 - dmx? ( >=x11-libs/libdmx-1.0.2 - >=x11-libs/libXfixes-4.0.3 ) - !minimal? ( >=x11-libs/libXtst-1.0.3 - >=x11-libs/libXres-1.0.3 ) - >=x11-libs/libxkbui-1.0.2 - >=x11-libs/liblbxutil-1.0.1 - kdrive? ( sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent, xkbui is xorgcfg-dependent - # Xaw is dmx- and xorgcfg-dependent - # Xpm is dmx- and xorgcfg-dependent, pulls in Xt - # Xxf86misc and Xxf86vm are xorgcfg-dependent - # liblbxutil is lbx- dependent -DEPEND="${RDEPEND} - !net-dialup/dtrace - >=x11-proto/randrproto-1.2.1 - >=x11-proto/renderproto-0.9.3 - >=x11-proto/fixesproto-4 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.2 - >=x11-proto/xproto-7.0.10 - >=x11-proto/xf86dgaproto-2.0.3 - >=x11-proto/xf86miscproto-0.9.2 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.2 - >=x11-proto/xf86bigfontproto-1.1.2 - >=x11-proto/compositeproto-0.4 - >=x11-proto/recordproto-1.13.2 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/scrnsaverproto-1.1.0 - >=x11-proto/evieext-1.0.2 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/xineramaproto-1.1-r1 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/inputproto-1.4.2.1 - >=x11-proto/bigreqsproto-1.0.2 - >=x11-proto/xcmiscproto-1.1.2 - >=x11-proto/glproto-1.4.8 - dmx? ( >=x11-proto/dmxproto-2.2.2 ) - dri? ( >=x11-proto/xf86driproto-2.0.3 - >=x11-libs/libdrm-2.3 ) - xprint? ( =x11-proto/printproto-1.0.3 - >=x11-apps/mkfontdir-1.0.3 - >=x11-apps/mkfontscale-1.0.3 - >=x11-apps/xplsprinters-1.0.1 )" - -# Drivers -PDEPEND=" - xorg? ( - input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 ) - input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 ) - input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.1 ) - input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 ) - input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 ) - input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 ) - input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.1 ) - input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 ) - input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 ) - input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 ) - input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 ) - input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 ) - input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 ) - input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 ) - input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 ) - input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 ) - input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 ) - input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 ) - input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 ) - input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 ) - input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.2.1 ) - input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) - input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 ) - input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 ) - input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) - input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 ) - input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 ) - - input_devices_synaptics? ( x11-drivers/synaptics ) - input_devices_wacom? ( >=x11-drivers/linuxwacom-0.7.9 ) - - video_cards_apm? ( >=x11-drivers/xf86-video-apm-1.1.1 ) - video_cards_ark? ( >=x11-drivers/xf86-video-ark-0.6.0 ) - video_cards_chips? ( >=x11-drivers/xf86-video-chips-1.1.1 ) - video_cards_cirrus? ( >=x11-drivers/xf86-video-cirrus-1.1.0 ) - video_cards_cyrix? ( >=x11-drivers/xf86-video-cyrix-1.1.0 ) - video_cards_dummy? ( >=x11-drivers/xf86-video-dummy-0.2.0 ) - video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.2.0 ) - video_cards_geode? ( >=x11-drivers/xf86-video-geode-2.7.7.0 ) - video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.1.1 ) - video_cards_i128? ( >=x11-drivers/xf86-video-i128-1.2.0 ) - video_cards_i740? ( >=x11-drivers/xf86-video-i740-1.1.0 ) - video_cards_i810? ( >=x11-drivers/xf86-video-i810-1.6.0 ) - video_cards_impact? ( >=x11-drivers/xf86-video-impact-0.2.0 ) - video_cards_imstt? ( >=x11-drivers/xf86-video-imstt-1.1.0 ) - video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.6.0 ) - video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.1 ) - video_cards_neomagic? ( >=x11-drivers/xf86-video-neomagic-1.1.1 ) - video_cards_newport? ( >=x11-drivers/xf86-video-newport-0.2.0 ) - video_cards_nsc? ( >=x11-drivers/xf86-video-nsc-2.8.1 ) - video_cards_nv? ( >=x11-drivers/xf86-video-nv-1.1.1 ) - video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.6.0 ) - video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.6.0 ) - video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.1.0 ) - video_cards_s3? ( >=x11-drivers/xf86-video-s3-0.4.1 ) - video_cards_s3virge? ( >=x11-drivers/xf86-video-s3virge-1.9.1 ) - video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.1.1 ) - video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.4.1 ) - video_cards_sis? ( >=x11-drivers/xf86-video-sis-0.9.1 ) - video_cards_sisusb? ( >=x11-drivers/xf86-video-sisusb-0.8.1 ) - video_cards_sunbw2? ( >=x11-drivers/xf86-video-sunbw2-1.1.0 ) - video_cards_suncg14? ( >=x11-drivers/xf86-video-suncg14-1.1.0 ) - video_cards_suncg3? ( >=x11-drivers/xf86-video-suncg3-1.1.0 ) - video_cards_suncg6? ( >=x11-drivers/xf86-video-suncg6-1.1.0 ) - video_cards_sunffb? ( >=x11-drivers/xf86-video-sunffb-1.1.0 ) - video_cards_sunleo? ( >=x11-drivers/xf86-video-sunleo-1.1.0 ) - video_cards_suntcx? ( >=x11-drivers/xf86-video-suntcx-1.1.0 ) - video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.2.1 ) - video_cards_tga? ( >=x11-drivers/xf86-video-tga-1.1.0 ) - video_cards_trident? ( >=x11-drivers/xf86-video-trident-1.2.1 ) - video_cards_tseng? ( >=x11-drivers/xf86-video-tseng-1.1.0 ) - video_cards_v4l? ( >=x11-drivers/xf86-video-v4l-0.1.1 ) - video_cards_vermilion? ( >=x11-drivers/xf86-video-vermilion-1.0.0 ) - video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.1.0 ) - video_cards_vga? ( >=x11-drivers/xf86-video-vga-4.1.0 ) - video_cards_via? ( >=x11-drivers/xf86-video-openchrome-0.2.901 ) - video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.13.0 ) - video_cards_voodoo? ( >=x11-drivers/xf86-video-voodoo-1.1.0 ) - video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 ) - video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - video_cards_fglrx? ( >=x11-drivers/ati-drivers-8.433 ) - video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-71.86.01 ) - )" -LICENSE="${LICENSE} MIT" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# Local customizations, unsuitable for upstream -GENTOO_PATCHES=( - "${FILESDIR}/1.3.0.0-use-proc-instead-of-sys.patch" - "${FILESDIR}/1.4-fpic-libxf86config.patch" - "${FILESDIR}/1.4-fix-kdrive-automake.patch" - ) - -# These have been sent upstream -UPSTREAMED_PATCHES=( - "${FILESDIR}/${PV}/" - ) - -PATCHES=( - "${GENTOO_PATCHES[@]}" - "${UPSTREAMED_PATCHES[@]}" - ) - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else - conf_opts="${conf_opts} --disable-xsdl" - fi - - # Only Xorg and Xgl support this, and we won't build Xgl - # until it merges to trunk - if use xorg; then - conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}" - fi - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal install-libxf86config) - $(use_enable dri) - $(use_enable xorg) - $(use_enable xprint) - $(use_enable nptl glx-tls) - $(use_enable !minimal xorgcfg) - $(use_enable hal config-dbus) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - ${conf_opts}" - - local diemsg="You must build xorg-server and mesa with the same nptl USE setting." - if built_with_use media-libs/mesa nptl; then - use nptl || die "${diemsg}" - else - use nptl && die "${diemsg}" - fi - - # (#121394) Causes window corruption - filter-flags -fweb - - # Nothing else provides new enough glxtokens.h - ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." - OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set --impl-headers ${OPENGL_DIR} -} - -src_unpack() { - x-modular_specs_check - x-modular_dri_check - x-modular_unpack_source - x-modular_patch_source - - # Clean up for ${PV}-clean-generated-files.patch - pushd hw/xprint >/dev/null - rm -f *-wrapper.c || die - popd >/dev/null - - # Set up kdrive servers to build - if use kdrive; then - kdrive_setup - fi - - # Make sure eautoreconf gets run if we need the autoconf/make - # changes. - if [[ ${SNAPSHOT} != "yes" ]]; then - if use kdrive || use dmx || use xprint; then - SNAPSHOT="yes" - fi - fi - - if use hal; then - sed -i \ - -e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \ - "${S}"/config/Makefile.am \ - || die "failed to fix DBUS config directory" - SNAPSHOT="yes" - fi - - x-modular_reconf_source - #do not install xprint's Xsession.d files, we'll do it later - if use xprint; then - sed -e "s:install-data-am\: install-dist_xpcDATA:install-data-am\::g" \ - -i "${S}"/hw/xprint/etc/Xsession.d/Makefile.in \ - || die "sed of Xsession.d makefile failed" - fi -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - # Install video mode files for system-config-display - insinto /usr/share/xorg - doins hw/xfree86/common/{extra,vesa}modes \ - || die "couldn't install extra modes" - - # Bug #151421 - this file is not built with USE="minimal" - # Bug #151670 - this file is also not build if USE="-xorg" - if ! use minimal && use xorg; then - # Install xorg.conf.example - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - # Bug #135544 - ewarn "Users of reduced blanking now need:" - ewarn " Option \"ReducedBlanking\"" - ewarn "In the relevant Monitor section(s)." - ewarn "Make sure your reduced blanking modelines are safe!" - - echo - ewarn "You must rebuild all drivers if upgrading from xorg-server 1.3" - ewarn "or earlier, because the ABI changed. If you cannot start X because" - ewarn "of module version mismatch errors, this is your problem." - - echo - ewarn "You can generate a list of all installed packages in the x11-drivers" - ewarn "category using this command:" - ewarn "emerge portage-utils; qlist -I -C x11-drivers/" - - ebeep 5 - epause 10 -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi - fi -} - -kdrive_setup() { - local card real_card disable_card kdrive_fbdev kdrive_vesa - - einfo "Removing unused kdrive drivers ..." - - # Some kdrive servers require fbdev and vesa - kdrive_fbdev="radeon neomagic sis siliconmotion" - # Some kdrive servers require just vesa - kdrive_vesa="chips mach64 mga nv glint r128 via" - - for card in ${IUSE_VIDEO_CARDS}; do - real_card=${card#video_cards_} - - # Differences between VIDEO_CARDS name and kdrive server name - real_card=${real_card/glint/pm2} - real_card=${real_card/radeon/ati} - real_card=${real_card/%nv/nvidia} - real_card=${real_card/siliconmotion/smi} - real_card=${real_card/%sis/sis300} - - disable_card=0 - - # Check whether it's a valid kdrive server before we waste time - # on the rest of this - if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then - continue - fi - - if ! use ${card}; then - if use x86; then - # Some kdrive servers require fbdev and vesa - for i in ${kdrive_fbdev}; do - if use video_cards_${i}; then - if [[ ${real_card} = fbdev ]] \ - || [[ ${real_card} = vesa ]]; then - continue 2 # Don't disable - fi - fi - done - - # Some kdrive servers require just vesa - for i in ${kdrive_vesa}; do - if use video_cards_${i}; then - if [[ ${real_card} = vesa ]]; then - continue 2 # Don't disable - fi - fi - done - fi - disable_card=1 - # Bug #150052 - # fbdev is the only VIDEO_CARDS setting that works on non-x86 - elif ! use x86 \ - && [[ ${real_card} != fbdev ]]; then - ewarn " $real_card does not work on your architecture; disabling." - disable_card=1 - fi - - if [[ $disable_card = 1 ]]; then - ebegin " ${real_card}" - sed -i \ - -e "s:\b${real_card}\b::g" \ - "${S}"/hw/kdrive/Makefile.am \ - || die "sed of ${real_card} failed" - eend - fi - - done -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - local x="" - for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - use xprint && xprint_src_install - - if ! use xorg; then - rm "${D}"/usr/share/man/man1/Xserver.1x \ - "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${D}"/usr/share/man/man1/Xserver.1x - fi -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo -# eselect opengl set --use-old ${OPENGL_DIR} - eselect opengl set ${OLD_IMPLEM} -} - -xprint_src_install() { - # RH-style init script, we provide a wrapper - exeinto /usr/$(get_libdir)/misc - doexe "${S}"/hw/xprint/etc/init.d/xprint - # Install the wrapper - newinitd "${FILESDIR}"/xprint.init xprint - # Install profile scripts - insinto /etc/profile.d - doins "${S}"/hw/xprint/etc/profile.d/xprint* - exeinto /etc/X11/xinit/xinitrc.d - doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist - # Patch profile scripts - sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ - get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ - "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist - # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc "${D}"/etc/profile.d/xprint* - rm -f "${D}"/etc/profile.d/xprint* -} - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -} |