diff options
author | 2007-10-01 10:31:57 +0000 | |
---|---|---|
committer | 2007-10-01 10:31:57 +0000 | |
commit | fc82e7177dc088da0be2fe3ce16fc915e7ec1f6e (patch) | |
tree | 132e6c03ace94e5ebb9d1041b48f17f1fc2c7d99 /x11-base/xorg-server/files | |
parent | New series for Gnome 2.20 (diff) | |
download | gentoo-2-fc82e7177dc088da0be2fe3ce16fc915e7ec1f6e.tar.gz gentoo-2-fc82e7177dc088da0be2fe3ce16fc915e7ec1f6e.tar.bz2 gentoo-2-fc82e7177dc088da0be2fe3ce16fc915e7ec1f6e.zip |
(#194026) Fix many keyboard-related issues, particularly special keys, by setting the XKB output directory to one that actually exists -- /var/lib/xkb -- instead of /usr/share/X11/xkb/compiled (illusion). (#193978) Fix build on ia64 (Raúl Porcel). (#193735) Another xprint fix, to the init script this time (Andy Crook).
(Portage version: 2.1.3.9)
Diffstat (limited to 'x11-base/xorg-server/files')
-rw-r--r-- | x11-base/xorg-server/files/1.4-ia64.patch | 49 | ||||
-rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-1.4-r2 | 6 |
2 files changed, 55 insertions, 0 deletions
diff --git a/x11-base/xorg-server/files/1.4-ia64.patch b/x11-base/xorg-server/files/1.4-ia64.patch new file mode 100644 index 000000000000..13ffb5f656d3 --- /dev/null +++ b/x11-base/xorg-server/files/1.4-ia64.patch @@ -0,0 +1,49 @@ +--- /dev/null 1969-12-31 16:00:00.000000000 -0800 ++++ hw/xfree86/os-support/shared/ia64Pci.h 2007-08-03 12:56:38.000000000 -0700 +@@ -0,0 +1,46 @@ ++/* ++ * Copyright 2004, Egbert Eich ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER ++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- ++ * NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ * ++ * Except as contained in this notice, the name of Egbert Eich shall not ++ * be used in advertising or otherwise to promote the sale, use or other deal- ++ *ings in this Software without prior written authorization from Egbert Eich. ++ * ++ */ ++#ifdef HAVE_XORG_CONFIG_H ++#include <xorg-config.h> ++#endif ++ ++#ifndef _IA64_PCI_H ++# define _IA64_PCI_H ++ ++#include "Pci.h" ++ ++typedef enum { ++ NONE_CHIPSET, ++ I460GX_CHIPSET, ++ E8870_CHIPSET, ++ ZX1_CHIPSET, ++ ALTIX_CHIPSET ++} IA64Chipset; ++ ++# ifdef OS_PROBE_PCI_CHIPSET ++extern IA64Chipset OS_PROBE_PCI_CHIPSET(scanpciWrapperOpt flags); ++# endif ++#endif diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.4-r2 b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2 new file mode 100644 index 000000000000..c06a742153f7 --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-1.4-r2 @@ -0,0 +1,6 @@ +MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538 +RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538 +SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538 +MD5 a06d9fe4f9f1d459ae02657f9ce64220 xorg-server-1.4.tar.bz2 6179392 +RMD160 74a274c880a9508be26b76acdb504a8e88b63a46 xorg-server-1.4.tar.bz2 6179392 +SHA256 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 xorg-server-1.4.tar.bz2 6179392 |