/[pkg-src]/trunk/xorg-old/patches-6.8.2-r10/0131_all_4.2.99.3-Imake-make-icondir-configable-v3.patch |
Contents of /trunk/xorg-old/patches-6.8.2-r10/0131_all_4.2.99.3-Imake-make-icondir-configable-v3.patch
Parent Directory | Revision Log
Revision 167 -
(show annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 4352 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 4352 byte(s)
-import
1 | diff -urN xc.orig/config/cf/Imake.tmpl xc/config/cf/Imake.tmpl |
2 | --- xc.orig/config/cf/Imake.tmpl 2004-03-13 21:52:53.000000000 -0500 |
3 | +++ xc/config/cf/Imake.tmpl 2004-03-13 21:56:45.000000000 -0500 |
4 | @@ -923,6 +923,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 | @@ -1705,6 +1720,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 -urN xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile |
36 | --- xc.orig/lib/Xcursor/Imakefile 2004-03-13 21:53:21.000000000 -0500 |
37 | +++ xc/lib/Xcursor/Imakefile 2004-03-13 21:56:45.000000000 -0500 |
38 | @@ -42,9 +42,10 @@ |
39 | |
40 | RPATH_CFLAG = HardCodeLibdirFlag |
41 | |
42 | -ICONDIR=$(LIBDIR)/icons |
43 | +ICONDIRDEFS=-DICONDIR=\"$(ICONDIR)\" |
44 | +XCURSORPATHDEFS=-DXCURSORPATH=\"$(XCURSORPATH)\" |
45 | |
46 | -DEFINES=-DICONDIR=\"$(ICONDIR)\" |
47 | +DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS) |
48 | |
49 | SRCS = cursor.c display.c file.c library.c xlib.c |
50 | |
51 | diff -urN xc.orig/lib/Xcursor/library.c xc/lib/Xcursor/library.c |
52 | --- xc.orig/lib/Xcursor/library.c 2004-03-13 21:53:21.000000000 -0500 |
53 | +++ xc/lib/Xcursor/library.c 2004-03-13 22:09:57.000000000 -0500 |
54 | @@ -26,12 +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 | -#define CURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR |
63 | - |
64 | const char * |
65 | XcursorLibraryPath (void) |
66 | { |
67 | @@ -41,7 +35,7 @@ |
68 | { |
69 | path = getenv ("XCURSOR_PATH"); |
70 | if (!path) |
71 | - path = CURSORPATH; |
72 | + path = XCURSORPATH; |
73 | } |
74 | return path; |
75 | } |
76 | diff -urN xc.orig/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile |
77 | --- xc.orig/programs/xcursorgen/Imakefile 2004-03-13 21:53:49.000000000 -0500 |
78 | +++ xc/programs/xcursorgen/Imakefile 2004-03-13 21:56:51.000000000 -0500 |
79 | @@ -4,7 +4,6 @@ |
80 | |
81 | SUBDIRS = redglass whiteglass handhelds |
82 | DEFAULT_THEME = DefaultCursorTheme |
83 | - ICONDIR = $(LIBDIR)/icons |
84 | THEMEDIR = $(ICONDIR)/default |
85 | INCLUDES = $(LIBPNGINC) |
86 | DEPLIBS = $(DEPXLIB) |
87 | diff -urN xc.orig/programs/xcursorgen/handhelds/Imakefile xc/programs/xcursorgen/handhelds/Imakefile |
88 | --- xc.orig/programs/xcursorgen/handhelds/Imakefile 2004-03-13 21:53:49.000000000 -0500 |
89 | +++ xc/programs/xcursorgen/handhelds/Imakefile 2004-03-13 21:56:51.000000000 -0500 |
90 | @@ -2,7 +2,6 @@ |
91 | |
92 | #define CursorSources(name) $(PNGDIR)/name-16.png |
93 | |
94 | -ICONDIR=$(LIBDIR)/icons |
95 | THEME=handhelds |
96 | PNGDIR=../redglass |
97 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors |
98 | diff -urN xc.orig/programs/xcursorgen/redglass/Imakefile xc/programs/xcursorgen/redglass/Imakefile |
99 | --- xc.orig/programs/xcursorgen/redglass/Imakefile 2004-03-13 21:53:49.000000000 -0500 |
100 | +++ xc/programs/xcursorgen/redglass/Imakefile 2004-03-13 21:56:51.000000000 -0500 |
101 | @@ -17,8 +17,6 @@ |
102 | hourglass-full-24.png hourglass-full-32.png hourglass-full-48.png \ |
103 | hourglass-full-64.png |
104 | |
105 | - |
106 | -ICONDIR=$(LIBDIR)/icons |
107 | THEME=redglass |
108 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors |
109 | |
110 | diff -urN xc.orig/programs/xcursorgen/whiteglass/Imakefile xc/programs/xcursorgen/whiteglass/Imakefile |
111 | --- xc.orig/programs/xcursorgen/whiteglass/Imakefile 2004-03-13 21:53:49.000000000 -0500 |
112 | +++ xc/programs/xcursorgen/whiteglass/Imakefile 2004-03-13 21:56:51.000000000 -0500 |
113 | @@ -2,7 +2,6 @@ |
114 | |
115 | #define CursorSources(name) name-16.png name-24.png name-32.png name-48.png name-64.png |
116 | |
117 | -ICONDIR=$(LIBDIR)/icons |
118 | THEME=whiteglass |
119 | THEMEDIR=$(ICONDIR)/$(THEME)/cursors |
120 |