Annotation of /trunk/xorg-old/patches-6.9.0-r1/0131_all_6.9.0-Imake-make-icondir-configable-v4.patch
Parent Directory | Revision Log
Revision 167 -
(hide annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 4256 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 4256 byte(s)
-import
1 | niro | 167 | diff -Naur xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl |
2 | --- xc.orig/config/cf/Imake.tmpl 2005-11-08 06:33:24.000000000 +0000 | ||
3 | +++ xc/config/cf/Imake.tmpl 2005-12-28 22:38:33.000000000 +0000 | ||
4 | @@ -963,6 +963,21 @@ | ||
5 | #endif | ||
6 | #endif | ||
7 | |||
8 | +#ifndef IconDir | ||
9 | +# if NothingOutsideProjectRoot != YES | ||
10 | +# define IconDir /usr/share/cursors/xorg-x11 | ||
11 | +# ifndef XcursorPath | ||
12 | +# define XcursorPath "~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/share/cursors/xorg-x11:/usr/share/pixmaps/xorg-x11" | ||
13 | +# endif | ||
14 | +# else | ||
15 | +# define IconDir Concat(ProjectRoot,/lib/X11/icons) | ||
16 | +# endif | ||
17 | +#endif | ||
18 | + | ||
19 | +#ifndef XcursorPath | ||
20 | +# define XcursorPath Concat(~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/share/cursors/xorg-x11:/usr/share/pixmaps/xorg-x11:,IconDir) | ||
21 | +#endif | ||
22 | + | ||
23 | #ifndef LogDirectory | ||
24 | #if HasVarDirectory | ||
25 | #define LogDirectory $(VARDIR)/log | ||
26 | @@ -1767,6 +1782,8 @@ | ||
27 | FILEMANDIR = FileManDir /* man pages for config files */ | ||
28 | MISCMANDIR = MiscManDir /* man pages for miscellaneous files */ | ||
29 | DRIVERMANDIR = DriverManDir /* man pages for drivers */ | ||
30 | + ICONDIR = IconDir /* Xcursor cursors/icon directory */ | ||
31 | + XCURSORPATH = XcursorPath /* Xcursor cursors path */ | ||
32 | LOGDIRECTORY = LogDirectory /* OS location of log files */ | ||
33 | #ifdef VarRunDirectory | ||
34 | VARRUNDIR = VarRunDirectory /* OS location of PID files */ | ||
35 | diff -Naur xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile | ||
36 | --- xc.orig/lib/Xcursor/Imakefile 2005-10-09 21:52:42.000000000 +0000 | ||
37 | +++ xc/lib/Xcursor/Imakefile 2005-12-28 22:39:49.000000000 +0000 | ||
38 | @@ -48,9 +48,10 @@ | ||
39 | |||
40 | RPATH_CFLAG = HardCodeLibdirFlag | ||
41 | |||
42 | -ICONDIR=$(LIBDIR)/icons | ||
43 | +ICONDIRDEFS=-DICONDIR=\"$(ICONDIR)\" | ||
44 | +XCURSORPATHDEFS=-DXCURSORPATH=\"$(XCURSORPATH)\" | ||
45 | |||
46 | -DEFINES=-DICONDIR=\"$(ICONDIR)\" $(XFIXES_DEFINES) | ||
47 | +DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS) | ||
48 | |||
49 | SRCS = cursor.c display.c file.c library.c xlib.c | ||
50 | |||
51 | diff -Naur xc.orig/lib/Xcursor/library.c xc/lib/Xcursor/library.c | ||
52 | --- xc.orig/lib/Xcursor/library.c 2005-12-08 17:54:40.000000000 +0000 | ||
53 | +++ xc/lib/Xcursor/library.c 2005-12-28 22:45:25.000000000 +0000 | ||
54 | @@ -26,14 +26,6 @@ | ||
55 | #include <stdlib.h> | ||
56 | #include <string.h> | ||
57 | |||
58 | -#ifndef ICONDIR | ||
59 | -#define ICONDIR "/usr/X11R6/lib/X11/icons" | ||
60 | -#endif | ||
61 | - | ||
62 | -#ifndef XCURSORPATH | ||
63 | -#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR | ||
64 | -#endif | ||
65 | - | ||
66 | const char * | ||
67 | XcursorLibraryPath (void) | ||
68 | { | ||
69 | diff -Naur xc.orig/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile | ||
70 | --- xc.orig/programs/xcursorgen/Imakefile 2005-11-08 06:33:31.000000000 +0000 | ||
71 | +++ xc/programs/xcursorgen/Imakefile 2005-12-28 22:38:35.000000000 +0000 | ||
72 | @@ -4,7 +4,6 @@ | ||
73 | |||
74 | SUBDIRS = redglass whiteglass handhelds | ||
75 | DEFAULT_THEME = DefaultCursorTheme | ||
76 | - ICONDIR = $(LIBDIR)/icons | ||
77 | THEMEDIR = $(ICONDIR)/default | ||
78 | INCLUDES = $(LIBPNGINC) | ||
79 | DEPLIBS = $(DEPXLIB) | ||
80 | diff -Naur xc.orig/programs/xcursorgen/handhelds/Imakefile xc/programs/xcursorgen/handhelds/Imakefile | ||
81 | --- xc.orig/programs/xcursorgen/handhelds/Imakefile 2004-04-23 19:54:41.000000000 +0000 | ||
82 | +++ xc/programs/xcursorgen/handhelds/Imakefile 2005-12-28 22:38:36.000000000 +0000 | ||
83 | @@ -2,7 +2,6 @@ | ||
84 | |||
85 | #define CursorSources(name) $(PNGDIR)/name-16.png | ||
86 | |||
87 | -ICONDIR=$(LIBDIR)/icons | ||
88 | THEME=handhelds | ||
89 | PNGDIR=../redglass | ||
90 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors | ||
91 | diff -Naur xc.orig/programs/xcursorgen/redglass/Imakefile xc/programs/xcursorgen/redglass/Imakefile | ||
92 | --- xc.orig/programs/xcursorgen/redglass/Imakefile 2004-04-23 19:54:42.000000000 +0000 | ||
93 | +++ xc/programs/xcursorgen/redglass/Imakefile 2005-12-28 22:38:38.000000000 +0000 | ||
94 | @@ -17,8 +17,6 @@ | ||
95 | hourglass-full-24.png hourglass-full-32.png hourglass-full-48.png \ | ||
96 | hourglass-full-64.png | ||
97 | |||
98 | - | ||
99 | -ICONDIR=$(LIBDIR)/icons | ||
100 | THEME=redglass | ||
101 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors | ||
102 | |||
103 | diff -Naur xc.orig/programs/xcursorgen/whiteglass/Imakefile xc/programs/xcursorgen/whiteglass/Imakefile | ||
104 | --- xc.orig/programs/xcursorgen/whiteglass/Imakefile 2004-04-23 19:54:42.000000000 +0000 | ||
105 | +++ xc/programs/xcursorgen/whiteglass/Imakefile 2005-12-28 22:38:39.000000000 +0000 | ||
106 | @@ -2,7 +2,6 @@ | ||
107 | |||
108 | #define CursorSources(name) name-16.png name-24.png name-32.png name-48.png name-64.png | ||
109 | |||
110 | -ICONDIR=$(LIBDIR)/icons | ||
111 | THEME=whiteglass | ||
112 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors | ||
113 |