Attachment 580 Details for Bug 975 – Xfixes support for Xcursor when using imake

[patch] Xfixes support for Xcursor when using imake

xcursor-xfixes.patch (text/plain), 1.39 KB, created by Chris Lee on 2004-08-05 18:14:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lee

Created: 2004-08-05 18:14:28 UTC

Size: 1.39 KB

patch

obsolete

>? Makefile
>? Xcursor.3x.html
>? Xcursor._man
>? exports
>? libXcursor.so.1.0.2
>? xcursor-config.script
>? xcursor.pc
>Index: Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/Xcursor/Imakefile,v
>retrieving revision 1.2
>diff -u -3 -p -r1.2 Imakefile
>--- Imakefile	23 Apr 2004 18:43:40 -0000	1.2
>+++ Imakefile	6 Aug 2004 01:10:57 -0000
>@@ -24,7 +24,7 @@ SOXCURSORREV=1.0.2
> #ifdef SharedXcursorReqs
> REQUIREDLIBS = SharedXcursorReqs
> #else
>-REQUIREDLIBS = $(LDPRELIB) $(XRENDERLIB)
>+REQUIREDLIBS = $(LDPRELIB) $(XRENDERLIB) $(XFIXESLIB)
> #endif
> 
> XCURSOR_VERSION=1.1.2
>@@ -40,11 +40,20 @@ XRENDER_LIBS=-L$(USRLIBDIR) $(XRENDERLIB
> XRENDER_CFLAGS=-I$(INCROOT)
> #endif
> 
>+#if BuildXfixesLibrary
>+XFIXES_LIBS=$(XFIXESLIB)
>+XFIXES_CFLAGS=$(XFIXESINCLUDES)
>+REQUIREDLIBS+=$(XFIXESLIB)
>+#else
>+XFIXES_LIBS=$(XFIXESLIB)
>+XFIXES_CFLAGS=$(XFIXESINCLUDES)
>+#endif
>+
> RPATH_CFLAG = HardCodeLibdirFlag
> 
> ICONDIR=$(LIBDIR)/icons
> 
>-DEFINES=-DICONDIR=\"$(ICONDIR)\"
>+DEFINES=-DICONDIR=\"$(ICONDIR)\" -DHAVE_XFIXES
> 
> SRCS =	cursor.c display.c file.c library.c xlib.c
> 
>@@ -59,6 +68,8 @@ SUBSTVARS=prefix="$(PROJECTROOT)" \
> 	  includedir="$(INCROOT)" \
> 	  XRENDER_LIBS="$(XRENDER_LIBS)"\
> 	  XRENDER_CFLAGS="$(XRENDER_CFLAGS)"\
>+	  XFIXES_LIBS="$(XFIXES_LIBS)" \
>+	  XFIXES_CFLAGS="$(XFIXES_CFLAGS)" \
> 	  X_LIBS="$(X_LIBS)" \
> 	  X_CFLAGS="$(X_CFLAGS)" \
> 	  VERSION="$(XCURSOR_VERSION)"

Actions: View | Splinter Review

Attachments on bug 975: 580

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.