Attachment #16455 for bug #21127

Lines 27-36 Link Here

(-)xc/lib/Xcursor/library.c.orig (-2 / +2 lines)
27	#include <string.h>	27	#include <string.h>
28		28
29	#ifndef ICONDIR	29	#ifndef ICONDIR
30	#define ICONDIR "/usr/X11R6/lib/X11/icons"	30	#define ICONDIR "/usr/share/cursors/xfree"
31	#endif	31	#endif
32		32
33	#define CURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR	33	#define CURSORPATH "~/.icons:/usr/local/share/cursors/xfree:"ICONDIR
34		34
35	static const char *	35	static const char *
36	_XcursorLibraryPath (void)	36	_XcursorLibraryPath (void)

Lines 29-35 Link Here

(-)xc/lib/Xcursor/Imakefile.orig (-1 / +1 lines)
29	REQUIREDLIBS = $(LDPRELIB) $(XRENDERLIB)	29	REQUIREDLIBS = $(LDPRELIB) $(XRENDERLIB)
30	#endif	30	#endif
31		31
32	ICONDIR=$(LIBDIR)/icons	32	ICONDIR=/usr/share/cursors/xfree
33		33
34	DEFINES=-DICONDIR=\"$(ICONDIR)\"	34	DEFINES=-DICONDIR=\"$(ICONDIR)\"

Lines 4-10 Link Here

(-)xc/programs/xcursorgen/Imakefile.orig (-1 / +1 lines)
4		4
5	SUBDIRS = redglass whiteglass handhelds	5	SUBDIRS = redglass whiteglass handhelds
6	DEFAULT_THEME = DefaultCursorTheme	6	DEFAULT_THEME = DefaultCursorTheme
7	ICONDIR = $(LIBDIR)/icons	7	ICONDIR = /usr/share/cursors/xfree
8	THEMEDIR = $(ICONDIR)/default	8	THEMEDIR = $(ICONDIR)/default
9	INCLUDES = $(LIBPNGINC)	9	INCLUDES = $(LIBPNGINC)
10	DEPLIBS = $(DEPXLIB)	10	DEPLIBS = $(DEPXLIB)

Lines 2-8 Link Here

(-)xc/programs/xcursorgen/whiteglass/Imakefile.orig (-1 / +1 lines)
2		2
3	#define CursorSources(name) name-16.png name-24.png name-32.png name-48.png name-64.png	3	#define CursorSources(name) name-16.png name-24.png name-32.png name-48.png name-64.png
4		4
5	ICONDIR=$(LIBDIR)/icons	5	ICONDIR=/usr/share/cursors/xfree
6	THEME=whiteglass	6	THEME=whiteglass
7	THEMEDIR=$(ICONDIR)/$(THEME)/cursors	7	THEMEDIR=$(ICONDIR)/$(THEME)/cursors
8		8

Lines 2-8 Link Here

(-)xc/programs/xcursorgen/handhelds/Imakefile.orig (-1 / +1 lines)
2		2
3	#define CursorSources(name) $(PNGDIR)/name-16.png	3	#define CursorSources(name) $(PNGDIR)/name-16.png
4		4
5	ICONDIR=$(LIBDIR)/icons	5	ICONDIR=/usr/share/cursors/xfree
6	THEME=handhelds	6	THEME=handhelds
7	PNGDIR=../redglass	7	PNGDIR=../redglass
8	THEMEDIR=$(ICONDIR)/$(THEME)/cursors	8	THEMEDIR=$(ICONDIR)/$(THEME)/cursors

Lines 18-24 Link Here

(-)xc/programs/xcursorgen/redglass/Imakefile.orig (-1 / +1 lines)
18	hourglass-full-64.png	18	hourglass-full-64.png
19		19
20		20
21	ICONDIR=$(LIBDIR)/icons	21	ICONDIR=/usr/share/cursors/xfree
22	THEME=redglass	22	THEME=redglass
23	THEMEDIR=$(ICONDIR)/$(THEME)/cursors	23	THEMEDIR=$(ICONDIR)/$(THEME)/cursors

Return to bug 21127