/[gentoo-x86]/x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.patch
Gentoo

Contents of /x11-base/xorg-server/files/1.0.2-try-to-fix-xorgcfg.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, 8 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/xorgcfg/interface.c
2 ===================================================================
3 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v
4 retrieving revision 1.8
5 diff -u -b -B -r1.8 interface.c
6 --- xorg/hw/xfree86/utils/xorgcfg/interface.c 8 Nov 2005 06:33:30 -0000 1.8
7 +++ xorg/hw/xfree86/utils/xorgcfg/interface.c 23 Mar 2006 07:42:49 -0000
8 @@ -65,7 +65,7 @@
9 #ifdef PROJECT_ROOT
10 #define DefaultXFree86Dir PROJECT_ROOT
11 #else
12 -#define DefaultXFree86Dir "/usr/X11R6"
13 +#define DefaultXFree86Dir "/usr"
14 #endif
15
16 #define IS_KBDDRIV(S) ((strcasecmp((S),"kbd") == 0) || \
17 Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
18 ===================================================================
19 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c,v
20 retrieving revision 1.5
21 diff -u -b -B -r1.5 keyboard-cfg.c
22 --- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 8 Nov 2005 06:33:30 -0000 1.5
23 +++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.c 23 Mar 2006 07:42:51 -0000
24 @@ -72,7 +72,7 @@
25 */
26 static XF86XkbRulesDescInfo **xkb_desc, *xkb_rules;
27 static int num_xkb_desc;
28 -static char *XkbRulesDir = "lib/X11/xkb/rules/";
29 +static char *XkbRulesDir = "share/X11/xkb/rules/";
30 #ifdef XFREE98_XKB
31 static char *XkbRulesFile = "xfree98";
32 #else
33 Index: xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
34 ===================================================================
35 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h,v
36 retrieving revision 1.3
37 diff -u -b -B -r1.3 keyboard-cfg.h
38 --- xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 4 Dec 2004 00:43:11 -0000 1.3
39 +++ xorg/hw/xfree86/utils/xorgcfg/keyboard-cfg.h 23 Mar 2006 07:42:51 -0000
40 @@ -38,7 +38,7 @@
41 /*
42 * All file names are from XProjectRoot or XWINHOME environment variable.
43 */
44 -#define XkbConfigDir "lib/X11/xkb/"
45 +#define XkbConfigDir "share/X11/xkb/"
46 #define XkbConfigFile "X0-config.keyboard"
47
48 /*
49 Index: xorg/hw/xfree86/utils/xorgcfg/loader.c
50 ===================================================================
51 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v
52 retrieving revision 1.5
53 diff -u -b -B -r1.5 loader.c
54 --- xorg/hw/xfree86/utils/xorgcfg/loader.c 8 Dec 2005 17:54:40 -0000 1.5
55 +++ xorg/hw/xfree86/utils/xorgcfg/loader.c 23 Mar 2006 07:42:51 -0000
56 @@ -55,7 +55,7 @@
57 #include <stdarg.h>
58
59 #ifndef OPTIONSPATH
60 -#define OPTIONSPATH "/usr/X11R6/lib/X11"
61 +#define OPTIONSPATH "/usr/lib/X11"
62 #endif
63
64 #ifndef SIGNALRETURNSINT
65 Index: xorg/hw/xfree86/utils/xorgcfg/text-mode.c
66 ===================================================================
67 RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v
68 retrieving revision 1.6
69 diff -u -b -B -r1.6 text-mode.c
70 --- xorg/hw/xfree86/utils/xorgcfg/text-mode.c 8 Dec 2005 17:54:40 -0000 1.6
71 +++ xorg/hw/xfree86/utils/xorgcfg/text-mode.c 23 Mar 2006 07:42:55 -0000
72 @@ -52,12 +52,12 @@
73 (strcmp((X), "keyboard") == 0))
74
75 #ifndef PROJECT_ROOT
76 -#define PROJECT_ROOT "/usr/X11R6"
77 +#define PROJECT_ROOT "/usr"
78 #endif
79
80 #ifndef XKB_RULES_DIR
81 #ifndef __UNIXOS2__
82 -#define XKB_RULES_DIR PROJECT_ROOT "/lib/X11/xkb/rules"
83 +#define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules"
84 #else
85 #define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules"
86 #endif
87 @@ -558,7 +558,7 @@
88 #elif defined(__UNIXOS2__)
89 str = "mouse$";
90 #else
91 - str = "/dev/mouse";
92 + str = "/dev/input/mice";
93 #endif
94
95 ClearScreen();

  ViewVC Help
Powered by ViewVC 1.1.20