/[gentoo-x86]/x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.0.2-fix-xorgconfig-rgbpath-and-mouse.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed Jan 24 06:34:22 2007 UTC (7 years, 7 months ago) by dberkholz
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stop supporting Xorg 7.0.
(Portage version: 2.1.2)
 (Unsigned Manifest commit)

1 Index: xorg/hw/xfree86/utils/xorgconfig/cards.c
2 ===================================================================
3 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v
4 retrieving revision 1.4
5 diff -u -b -B -r1.4 cards.c
6 --- xorg/hw/xfree86/utils/xorgconfig/cards.c 1 Jul 2005 22:43:35 -0000 1.4
7 +++ xorg/hw/xfree86/utils/xorgconfig/cards.c 23 Mar 2006 07:42:26 -0000
8 @@ -19,7 +19,7 @@
9
10 /* Some vars to make path names in texts more flexible. */
11 #ifndef PROJECTROOT
12 -# define PROJECTROOT "/usr/X11R6"
13 +# define PROJECTROOT "/usr"
14 #endif
15 #define TREEROOT PROJECTROOT
16 #define TREEROOTLX TREEROOT "/lib/X11"
17 Index: xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c
18 ===================================================================
19 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v
20 retrieving revision 1.19
21 diff -u -b -B -r1.19 xorgconfig.c
22 --- xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 8 Nov 2005 06:33:30 -0000 1.19
23 +++ xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c 23 Mar 2006 07:42:28 -0000
24 @@ -157,11 +157,12 @@
25 * may be more irritated than Unix users
26 */
27 #ifndef PROJECTROOT
28 -#define PROJECTROOT "/usr/X11R6"
29 +#define PROJECTROOT "/usr"
30 #endif
31 #define TREEROOT PROJECTROOT
32 #define TREEROOTLX TREEROOT "/lib/X11"
33 #define TREEROOTCFG TREEROOT "/etc/X11"
34 +#define TREEROOTSHARE TREEROOT "/share/X11"
35 #ifdef XDOCDIR
36 # define TREEROOTDOC XDOCDIR
37 #else
38 @@ -495,7 +496,7 @@
39 #elif defined(__FreeBSD__)
40 # define DEF_MOUSEDEV "/dev/sysmouse";
41 #else
42 -# define DEF_MOUSEDEV "/dev/mouse";
43 +# define DEF_MOUSEDEV "/dev/input/mice";
44 #endif
45
46 #ifndef __UNIXOS2__
47 @@ -1970,7 +1971,7 @@
48 "# file minus the extension (like \".txt\" or \".db\"). There is normally\n"
49 "# no need to change the default.\n"
50 "\n"
51 -" RgbPath \"" TREEROOTLX "/rgb\"\n"
52 +"# RgbPath \"" TREEROOTSHARE "/rgb\"\n"
53 "\n"
54 "# Multiple FontPath entries are allowed (which are concatenated together),\n"
55 "# as well as specifying multiple comma-separated entries in one FontPath\n"

  ViewVC Help
Powered by ViewVC 1.1.20