X Strike Force XFree86 SVN commit: rev 843 - in people/wt/4.4.0: patches patches-needing-update
Author: wt
Date: 2003-12-14 08:24:06 -0500 (Sun, 14 Dec 2003)
New Revision: 843
Added:
people/wt/4.4.0/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
people/wt/4.4.0/patches/059_external_XrenderXftXcursor_programs.diff
people/wt/4.4.0/patches/060_external_XrenderXftXcursor_lib.diff
Removed:
people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff
people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff
people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff
Log:
Get external Xrender, Xft, and Xcursor working with 4.4. The
X11.tmpl layout is kinda braindead, as it it wasn't bad enough
to have imake.
Copied: people/wt/4.4.0/patches/058_external_XrenderXftXcursor_X11.tmpl.diff (from rev 840, people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff)
===================================================================
--- people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff 2003-12-11 11:04:10 UTC (rev 840)
+++ people/wt/4.4.0/patches/058_external_XrenderXftXcursor_X11.tmpl.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -0,0 +1,270 @@
+$Id$
+
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * add Has{Render,Xft,Xcursor}Library defines
+ * Some defines related {Render,Xft,Xcursor}Library are changed
+ to be able to use external Xrender,Xft,Xcursor libraries
+ (likes freetype2, expat, libz etc...)
+
+ This patch contains X11.tmpl part only (some xc/lib/*/Imakefile
+and xc/programs/*/Imakefile should adapt this change)
+
+ISHIKAWA Mutsumi <ishikawa@debian.org>
+
+ported to 4.4 by Warren Turkal <wt@midsouth.rr.com>
+
+diff -ruN xc-old/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc-old/config/cf/X11.tmpl 2003-11-20 23:55:04.000000000 -0600
++++ xc/config/cf/X11.tmpl 2003-12-14 04:09:55.000000000 -0600
+@@ -537,23 +537,31 @@
+ #ifndef BuildRender
+ #define BuildRender YES
+ #endif
++#ifndef HasRenderLibrary
++#define HasRenderLibrary NO
++#endif
+ #ifndef BuildRenderLibrary
+-#define BuildRenderLibrary !BuildServersOnly
++#define BuildRenderLibrary (!BuildServersOnly && !HasRenderLibrary)
++#endif
++#ifndef HasXftLibrary
++#define HasXftLibrary NO
+ #endif
+ #ifndef BuildXftLibrary
+-#define BuildXftLibrary BuildRenderLibrary
++#define BuildXftLibrary ((BuildRenderLibrary || HasRenderLibrary) && \
++ !HasXftLibrary)
+ #endif
+ #ifndef BuildXft1Library
+-#define BuildXft1Library BuildRenderLibrary
++#define BuildXft1Library (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig BuildXftLibrary
++#define UseFontconfig (BuildXftLibrary || HasXftLibrary)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
+ #endif
+ #ifndef UseFreetype2
+-#define UseFreetype2 (BuildXftLibrary || BuildXft1Library || \
++#define UseFreetype2 (BuildXftLibrary || HasXftLibrary || \
++ BuildXft1Library || \
+ UseFontconfig || BuildFreeType)
+ #endif
+ #ifndef HasExpat
+@@ -583,8 +591,12 @@
+ #define BuildRandRLibrary !BuildServersOnly
+ #endif
+
++#ifndef HasXcursorLibrary
++#define HasXcursorLibrary NO
++#endif
+ #ifndef BuildXcursorLibrary
+-#define BuildXcursorLibrary BuildRenderLibrary
++#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && \
++ !HasXcursorLibrary)
+ #endif
+
+ #ifndef BuildXcursorgen
+@@ -2411,6 +2423,7 @@
+ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
+ #endif
+
++#if BuildRenderLibrary
+ XRENDERLIBSRC = $(LIBSRC)/Xrender
+ #if SharedLibXrender
+ #ifndef SharedXrenderRev
+@@ -2421,6 +2434,42 @@
+ ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
+ #endif
+
++#ifdef UseInstalled
++XRENDERINCDIR=$(INCDIR)
++#else
++XRENDERINCDIR=$(BUILDINCDIR)
++#endif
++
++XRENDERINCLUDES = -I$(XRENDERINCDIR)
++
++#else /* BuildRenderLibrary */
++
++#if HasRenderLibrary
++
++#ifndef RenderLibraryDir
++#define RenderLibraryDir /usr/X11R6
++#endif
++
++#ifndef RenderLibraryLibDir
++#define RenderLibraryLibDir RenderLibraryDir/LibDirName
++#endif
++
++#ifndef RenderLibraryIncDir
++#define RenderLibraryIncDir RenderLibraryDir/include
++#endif
++
++XRENDERDIR = RenderLibraryDir
++XRENDERLIBDIR = RenderLibraryLibDir
++XRENDERINCDIR = RenderLibraryIncDir
++XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
++DEPXRENDERLIB =
++
++XRENDERINCLUDES = -I$(XRENDERINCDIR)
++
++#endif /* HasRenderLibrary */
++
++#endif /* else BuildRenderLibrary */
++
+ XRANDRRLIBSRC = $(LIBSRC)/Xrandr
+ #if SharedLibXrandr
+ #ifndef SharedXrandrRev
+@@ -2431,6 +2480,7 @@
+ ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
+ #endif
+
++#if BuildXcursorLibrary
+ XCURSORRLIBSRC = $(LIBSRC)/Xcursor
+ #if SharedLibXcursor
+ #ifndef SharedXcursorRev
+@@ -2441,6 +2491,41 @@
+ ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
+ #endif
+
++#if UseInstalled
++XCURSORINCDIR=$(INCDIR)
++#else
++XCURSORINCDIR=$(BUILDINCDIR)
++#endif
++
++XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
++
++#else /* BuildXcursorLibrary */
++
++#if HasXcursorLibrary
++
++#ifndef XcursorLibraryDir
++#define XcursorLibraryDir /usr/X11R6
++#endif
++
++#ifndef XcursorLibraryLibDir
++#define XcursorLibraryLibDir XcursorLibraryDir/LibDirName
++#endif
++
++#ifndef XcursorLibraryIncDir
++#define XcursorLibraryIncDir XcursorLibraryDir/include
++#endif
++
++XCURSORDIR = XcursorLibraryDir
++XCURSORLIBDIR = XcursorLibraryLibDir
++XCURSORINCDIR = XcursorLibraryIncDir
++XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
++
++XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
++
++#endif /* HasXcursorLibrary */
++
++#endif /* BuildXcursorLibrary */
++
+ APPLEWMLIBSRC = $(LIBSRC)/apple
+ #if SharedLibAppleWM
+ #ifndef SharedAppleWMRev
+@@ -3166,6 +3251,7 @@
+ #endif
+ #endif
+
++#if BuildXftLibrary
+ #ifndef SharedLibXft
+ #define SharedLibXft HasSharedLibraries
+ #endif
+@@ -3178,21 +3264,15 @@
+ #ifndef ProfileLibXft
+ #define ProfileLibXft NO
+ #endif
+- XFTLIBSRC = $(LIBSRC)/Xft
+-#if SharedLibXft
+-#ifndef SharedXftRev
+-#define SharedXftRev 2.1
+-#endif
+-SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
+ #else
+-ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
+-#endif
+-
+-#ifndef XftClientDepLibs
+-#define XftClientDepLibs $(DEPXFTLIB) FontconfigClientDepLibs $(DEPXRENDERLIB)
+-#endif
+-#ifndef XftClientLibs
+-#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
++#undef SharedLibXft
++#define SharedLibXft NO
++#undef NormalLibXft
++#define NormalLibXft NO
++#undef DebugLibXft
++#define DebugLibXft NO
++#undef ProfileLibXft
++#define ProfileLibXft NO
+ #endif
+
+ #if UseFontconfig
+@@ -3310,7 +3390,59 @@
+
+ #endif /* UseFontconfig */
+
+-XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
++#if BuildXftLibrary
++ XFTLIBSRC = $(LIBSRC)/Xft
++#if SharedLibXft
++#ifndef SharedXftRev
++#define SharedXftRev 2.1
++#endif
++SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
++#else
++ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir)
++#endif
++
++#ifndef XftClientDepLibs
++#define XftClientDepLibs $(DEPXFTLIB) FontconfigClientDepLibs $(DEPXRENDERLIB)
++#endif
++#ifndef XftClientLibs
++#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
++#endif
++
++XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
++
++#else /* BuildXftLibrary */
++
++#if HasXftLibrary
++
++#ifndef XftLibraryDir
++#define XftLibraryDir /usr/X11R6
++#endif
++
++#ifndef XftLibraryLibDir
++#define XftLibraryLibDir XftLibraryDir/LibDirName
++#endif
++
++#ifndef XftLibraryIncDir
++#define XftLibraryIncDir XftLibraryDir/include
++#endif
++
++XFTDIR = XftLibraryDir
++XFTLIBDIR = XftLibraryLibDir
++XFTINCDIR = XftLibraryIncDir
++XFTLIB = -L$(XFTLIBDIR) -lXft
++
++#ifndef XftClientDepLibs
++#define XftClientDepLibs FontconfigClientDepLibs $(DEPXRENDERLIB)
++#endif
++#ifndef XftClientLibs
++#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
++#endif
++
++XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
++
++#endif /* HasXftLibrary */
++
++#endif /* BuildXftLibrary */
+
+ #ifdef HasLibpng
+
Property changes on: people/wt/4.4.0/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: people/wt/4.4.0/patches/059_external_XrenderXftXcursor_programs.diff (from rev 840, people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff)
===================================================================
--- people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff 2003-12-11 11:04:10 UTC (rev 840)
+++ people/wt/4.4.0/patches/059_external_XrenderXftXcursor_programs.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -0,0 +1,128 @@
+$Id$
+
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * check HasRenderLibrary to use Render or not
+ * some INCLUDES added to be able to refer external
+ Xrender,Xft,Xcursor libraries' header
+
+ This patch contains xc/programs/*/Imakefile parts
+
+ISHIKAWA Mutsumi <ishikawa@debian.org>
+
+ported to 4.4 by Warren Turkal <wt@midsouth.rr.com>
+
+diff -ruN xc-old/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
+--- xc-old/programs/x11perf/Imakefile 2003-11-21 00:00:55.000000000 -0600
++++ xc/programs/x11perf/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -12,13 +12,13 @@
+ #if HasShm
+ SHMDEFS = -DMITSHM
+ #endif
+-#if BuildRenderLibrary
++#if (BuildRenderLibrary || HasRenderLibrary)
+ XRENDERDEFS = -DXRENDER
+ XRENDERDEPS = $(DEPXRENDERLIB)
+ XRENDERLIBS = $(XRENDERLIB)
+ XRENDERINCS = $(XRENDERINCLUDES)
+ #endif
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasRenderLibrary)
+ XFTDEFS = -DXFT -DXFREE86_FT2
+ XFTDEPS = XftClientDepLibs
+ XFTLIBS = XftClientLibs
+diff -ruN xc-old/programs/xclock/Imakefile xc/programs/xclock/Imakefile
+--- xc-old/programs/xclock/Imakefile 2003-11-21 00:00:57.000000000 -0600
++++ xc/programs/xclock/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.9 2003/11/17 15:18:06 tsi Exp $
+
+ #ifndef XClockUseRender
+-#define XClockUseRender BuildRenderLibrary
++#define XClockUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XClockUseRender
+diff -ruN xc-old/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
+--- xc-old/programs/xcursorgen/Imakefile 2002-12-23 05:05:23.000000000 -0600
++++ xc/programs/xcursorgen/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -6,7 +6,7 @@
+ DEFAULT_THEME = DefaultCursorTheme
+ ICONDIR = $(LIBDIR)/icons
+ THEMEDIR = $(ICONDIR)/default
+- INCLUDES = $(LIBPNGINC)
++ INCLUDES = $(LIBPNGINC) $(XCURSORINCLUDES)
+ DEPLIBS = $(DEPXLIB)
+ LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
+ MathLibrary GzipLibrary
+diff -ruN xc-old/programs/xditview/Imakefile xc/programs/xditview/Imakefile
+--- xc-old/programs/xditview/Imakefile 2003-11-21 00:01:04.000000000 -0600
++++ xc/programs/xditview/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -7,7 +7,7 @@
+
+
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ DEPFONTLIBS = XftClientDepLibs
+ FONTLIBS = XftClientLibs
+ FONTDEFS = -DUSE_XFT -DXFREE86_FT2
+diff -ruN xc-old/programs/xdpyinfo/Imakefile xc/programs/xdpyinfo/Imakefile
+--- xc-old/programs/xdpyinfo/Imakefile 2003-06-10 06:07:59.000000000 -0500
++++ xc/programs/xdpyinfo/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -34,7 +34,7 @@
+ XINPUTLIBS = $(XILIB)
+ #endif
+
+-#if BuildRenderLibrary
++#if (BuildRenderLibrary || HasRenderLibrary)
+ XRENDERDEFINES = -DXRENDER
+ XRENDERDEPLIBS = $(DEPXRENDERLIB)
+ XRENDERLIBS = $(XRENDERLIB)
+diff -ruN xc-old/programs/xfd/Imakefile xc/programs/xfd/Imakefile
+--- xc-old/programs/xfd/Imakefile 2003-11-21 00:01:10.000000000 -0600
++++ xc/programs/xfd/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.6 2003/11/17 15:18:07 tsi Exp $
+
+ #ifndef XFdUseRender
+-#define XFdUseRender BuildRenderLibrary
++#define XFdUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XFdUseRender
+diff -ruN xc-old/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
+--- xc-old/programs/xlogo/Imakefile 2003-11-21 00:01:21.000000000 -0600
++++ xc/programs/xlogo/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -5,7 +5,7 @@
+ XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.6 2003/11/17 15:18:07 tsi Exp $
+
+ #ifndef XLogoUseRender
+-#define XLogoUseRender BuildRenderLibrary
++#define XLogoUseRender (BuildRenderLibrary || HasRenderLibrary)
+ #endif
+
+ #if XLogoUseRender
+diff -ruN xc-old/programs/xrandr/Imakefile xc/programs/xrandr/Imakefile
+--- xc-old/programs/xrandr/Imakefile 2003-09-25 06:06:56.000000000 -0500
++++ xc/programs/xrandr/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -2,6 +2,7 @@
+
+ DEFINES=$(RANDRDEFINES)
+ DEPLIBS=$(DEPXRANDRLIB) $(DEPXLIB)
++INCLUDES=$(XRENDERINCLUDES)
+ LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
+
+ SRCS=xrandr.c
+diff -ruN xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
+--- xc-old/programs/xterm/Imakefile 2003-11-21 00:01:27.000000000 -0600
++++ xc/programs/xterm/Imakefile 2003-12-13 22:01:30.000000000 -0600
+@@ -97,7 +97,7 @@
+ UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
+ UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
+ #endif
+-#if BuildXftLibrary
++#if (BuildXftLibrary || HasXftLibrary)
+ #define XRenderSupport
+ #endif
+ #ifdef XRenderSupport
Property changes on: people/wt/4.4.0/patches/059_external_XrenderXftXcursor_programs.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: people/wt/4.4.0/patches/060_external_XrenderXftXcursor_lib.diff (from rev 840, people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff)
===================================================================
--- people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff 2003-12-11 11:04:10 UTC (rev 840)
+++ people/wt/4.4.0/patches/060_external_XrenderXftXcursor_lib.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -0,0 +1,127 @@
+$Id$
+
+patch to be able to use external Xrender/Xft/Xcursor libraries
+
+ * namespace conflicts in xc/lib/Imakefile fix
+ * namespace conflicts in xc/lib/Xft1/Imakefile fix
+ * check Has{Render,Xft,Xcursor}Library to use them
+ * some INCLUDES added to be able to refer external
+ Xrender,Xft,Xcursor libraries' header
+
+ This patch contains xc/lib/*/Imakefile parts
+
+ISHIKAWA Mutsumi <ishikawa@debian.org>
+
+ported to 4.4 by Warren Turkal <wt@midsouth.rr.com>
+
+diff -ruN xc-old/lib/Imakefile xc/lib/Imakefile
+--- xc-old/lib/Imakefile 2003-08-25 06:03:18.000000000 -0500
++++ xc/lib/Imakefile 2003-12-13 01:15:55.000000000 -0600
+@@ -94,7 +94,7 @@
+ #endif
+
+ #if BuildRenderLibrary
+-RENDERLIBDIR = Xrender
++RENDERLIBBUILDDIR = Xrender
+ #endif
+
+ #if BuildExpatLibrary
+@@ -110,7 +110,7 @@
+ #endif
+
+ #if BuildXftLibrary
+-XFTLIBDIR = Xft
++XFTBUILDDIR = Xft
+ #endif
+
+ #if BuildXft1Library
+@@ -122,7 +122,7 @@
+ #endif
+
+ #if BuildXcursorLibrary
+-XCURSORLIBDIR = Xcursor
++XCURSORBUILDDIR = Xcursor
+ #endif
+
+ #if BuildXTrapLibrary
+@@ -205,10 +205,10 @@
+ $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(XPRINTLIBDIR) \
+ $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
+ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
+- $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
++ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBBUILDDIR) $(FREETYPE2BUILDDIR) \
+ $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \
+- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
+- $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR)
++ $(XFT1LIBDIR) $(XFTBUILDDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
++ $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBBUILDDIR) $(APPLELIBDIR)
+
+ SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
+ $(FONTCACHELIBDIR)
+diff -ruN xc-old/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
+--- xc-old/lib/Xcursor/Imakefile 2003-11-01 22:43:15.000000000 -0600
++++ xc/lib/Xcursor/Imakefile 2003-12-13 00:58:05.000000000 -0600
+@@ -35,6 +35,8 @@
+
+ DEFINES=-DICONDIR=\"$(ICONDIR)\"
+
++INCLUDES=$(XRENDERINCLUDES)
++
+ SRCS = cursor.c display.c file.c library.c xlib.c
+
+ OBJS = cursor.o display.o file.o library.o xlib.o
+diff -ruN xc-old/lib/Xft/Imakefile xc/lib/Xft/Imakefile
+--- xc-old/lib/Xft/Imakefile 2003-12-02 22:58:35.000000000 -0600
++++ xc/lib/Xft/Imakefile 2003-12-13 01:12:19.000000000 -0600
+@@ -43,7 +43,7 @@
+ #if HasGcc2 || HasGcc3
+ WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+ #endif
+-INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(WARNINGS)
++INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(XRENDERINCLUDES) $(WARNINGS)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2
+
+ XFT_REVISION=0
+diff -ruN xc-old/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
+--- xc-old/lib/Xft1/Imakefile 2003-11-20 23:57:41.000000000 -0600
++++ xc/lib/Xft1/Imakefile 2003-12-13 01:23:27.000000000 -0600
+@@ -79,13 +79,14 @@
+
+ YFLAGS = -d
+
+-#ifndef XftLibDir
+-#define XftLibDir $(LIBDIR)
++#ifndef Xft1LibDir
++#define Xft1LibDir $(LIBDIR)
+ #endif
+
+-XFTLIBDIR=XftLibDir
++XFT1LIBDIR=Xft1LibDir
+
+-INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR)
++INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) \
++ $(XRENDERINCLUDES)
+ DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2
+
+ #if UseFreetype2
+@@ -142,7 +143,7 @@
+ InstallNamedTargetRelated(install,file,$(INSTDATFLAGS),dest,file,rel)
+ #endif /* InstallNonExecFileBackup */
+
+-InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFTLIBDIR),XftConfig)
++InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFT1LIBDIR),XftConfig)
+ InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
+
+ MANSUFFIX = $(LIBMANSUFFIX)
+diff -ruN xc-old/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
+--- xc-old/lib/Xrandr/Imakefile 2002-10-02 11:55:41.000000000 -0500
++++ xc/lib/Xrandr/Imakefile 2003-12-13 00:58:05.000000000 -0600
+@@ -21,7 +21,7 @@
+ #endif
+
+ DEFINES = $(ALLOC_DEFINES)
+- INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
++ INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(XRENDERINCLUDES)
+ SRCS = Xrandr.c
+ OBJS = Xrandr.o
+ LINTLIBS = $(LINTXLIB)
Property changes on: people/wt/4.4.0/patches/060_external_XrenderXftXcursor_lib.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff 2003-12-14 13:22:17 UTC (rev 842)
+++ people/wt/4.4.0/patches-needing-update/058_external_XrenderXftXcursor_X11.tmpl.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -1,235 +0,0 @@
-$Id$
-
-patch to be able to use external Xrender/Xft/Xcursor libraries
-
- * add Has{Render,Xft,Xcursor}Library defines
- * Some defines related {Render,Xft,Xcursor}Library are changed
- to be able to use external Xrender,Xft,Xcursor libraries
- (likes freetype2, expat, libz etc...)
-
- This patch contains X11.tmpl part only (some xc/lib/*/Imakefile
-and xc/programs/*/Imakefile should adapt this change)
-
-ISHIKAWA Mutsumi <ishikawa@debian.org>
-
---- xc/config/cf/X11.tmpl~ 2003-10-11 01:02:15.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-10-11 01:02:24.000000000 -0500
-@@ -567,23 +567,29 @@
- #ifndef BuildRender
- #define BuildRender YES
- #endif
-+#ifndef HasRenderLibrary
-+#define HasRenderLibrary NO
-+#endif
- #ifndef BuildRenderLibrary
--#define BuildRenderLibrary !BuildServersOnly
-+#define BuildRenderLibrary (!BuildServersOnly && !HasRenderLibrary)
-+#endif
-+#ifndef HasXftLibrary
-+#define HasXftLibrary NO
- #endif
- #ifndef BuildXftLibrary
--#define BuildXftLibrary BuildRenderLibrary
-+#define BuildXftLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXftLibrary)
- #endif
- #ifndef BuildXft1Library
--#define BuildXft1Library BuildRenderLibrary
-+#define BuildXft1Library (BuildRenderLibrary || HasRenderLibrary)
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig BuildXftLibrary
-+#define UseFontconfig (BuildXftLibrary || HasXftLibrary)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
- #endif
- #ifndef UseFreetype2
--#define UseFreetype2 (BuildXftLibrary || BuildXft1Library || UseFontconfig)
-+#define UseFreetype2 (BuildXftLibrary || HasXftLibrary || BuildXft1Library || UseFontconfig)
- #endif
- #ifndef HasExpat
- #define HasExpat NO
-@@ -605,8 +611,11 @@
- #define BuildRandRLibrary !BuildServersOnly
- #endif
-
-+#ifndef HasXcursorLibrary
-+#define HasXcursorLibrary NO
-+#endif
- #ifndef BuildXcursorLibrary
--#define BuildXcursorLibrary BuildRenderLibrary
-+#define BuildXcursorLibrary ((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary)
- #endif
-
- #ifndef BuildXcursorgen
-@@ -2404,6 +2413,7 @@
- ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
- #endif
-
-+#if BuildRenderLibrary
- XRENDERLIBSRC = $(LIBSRC)/Xrender
- #if SharedLibXrender
- #ifndef SharedXrenderRev
-@@ -2414,6 +2424,42 @@
- ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
- #endif
-
-+#ifdef UseInstalled
-+XRENDERINCDIR=$(INCDIR)
-+#else
-+XRENDERINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#else /* BuildRenderLibrary */
-+
-+#if HasRenderLibrary
-+
-+#ifndef RenderLibraryDir
-+#define RenderLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef RenderLibraryLibDir
-+#define RenderLibraryLibDir RenderLibraryDir/LibDirName
-+#endif
-+
-+#ifndef RenderLibraryIncDir
-+#define RenderLibraryIncDir RenderLibraryDir/include
-+#endif
-+
-+XRENDERDIR = RenderLibraryDir
-+XRENDERLIBDIR = RenderLibraryLibDir
-+XRENDERINCDIR = RenderLibraryIncDir
-+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
-+DEPXRENDERLIB =
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#endif /* HasRenderLibrary */
-+
-+#endif /* else BuildRenderLibrary */
-+
- XRANDRRLIBSRC = $(LIBSRC)/Xrandr
- #if SharedLibXrandr
- #ifndef SharedXrandrRev
-@@ -2424,6 +2470,7 @@
- ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
- #endif
-
-+#if BuildXcursorLibrary
- XCURSORRLIBSRC = $(LIBSRC)/Xcursor
- #if SharedLibXcursor
- #ifndef SharedXcursorRev
-@@ -2434,6 +2481,41 @@
- ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
- #endif
-
-+#ifdef UseInstalled
-+XCURSORINCDIR=$(INCDIR)
-+#else
-+XCURSORINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#else /* BuildXcursorLibrary */
-+
-+#if HasXcursorLibrary
-+
-+#ifndef XcursorLibraryDir
-+#define XcursorLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XcursorLibraryLibDir
-+#define XcursorLibraryLibDir XcursorLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XcursorLibraryIncDir
-+#define XcursorLibraryIncDir XcursorLibraryDir/include
-+#endif
-+
-+XCURSORDIR = XcursorLibraryDir
-+XCURSORLIBDIR = XcursorLibraryLibDir
-+XCURSORINCDIR = XcursorLibraryIncDir
-+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#endif /* HasXcursorLibrary */
-+
-+#endif /* else BuildXcursorLibrary */
-+
- # ifndef SharedLibXfontcache
- # define SharedLibXfontcache NO
- # endif
-@@ -3194,6 +3276,7 @@
- #endif
- #endif
-
-+#if BuildXftLibrary
- #ifndef SharedLibXft
- #define SharedLibXft HasSharedLibraries
- #endif
-@@ -3206,6 +3289,18 @@
- #ifndef ProfileLibXft
- #define ProfileLibXft NO
- #endif
-+#else
-+#undef SharedLibXft
-+#define SharedLibXft NO
-+#undef NormalLibXft
-+#define NormalLibXft NO
-+#undef DebugLibXft
-+#define DebugLibXft NO
-+#undef ProfileLibXft
-+#define ProfileLibXft NO
-+#endif
-+
-+#if BuildXftLibrary
- XFTLIBSRC = $(LIBSRC)/Xft
- #if SharedLibXft
- #ifndef SharedXftRev
-@@ -3223,7 +3318,41 @@
- #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
- #endif
-
--XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
-+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#else /* BuildXftLibrary */
-+
-+#if HasXftLibrary
-+
-+#ifndef XftLibraryDir
-+#define XftLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XftLibraryLibDir
-+#define XftLibraryLibDir XftLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XftLibraryIncDir
-+#define XftLibraryIncDir XftLibraryDir/include
-+#endif
-+
-+XFTDIR = XftLibraryDir
-+XFTLIBDIR = XftLibraryLibDir
-+XFTINCDIR = XftLibraryIncDir
-+XFTLIB = -L$(XFTLIBDIR) -lXft
-+
-+#ifndef XftClientDepLibs
-+#define XftClientDepLibs FontconfigClientDepLibs $(DEPXRENDERLIB)
-+#endif
-+#ifndef XftClientLibs
-+#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
-+#endif
-+
-+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#endif /* HasXftLibrary */
-+
-+#endif /* else BuildXftLibrary */
-
- #if UseFontconfig
-
Deleted: people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff 2003-12-14 13:22:17 UTC (rev 842)
+++ people/wt/4.4.0/patches-needing-update/059_external_XrenderXftXcursor_programs.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -1,126 +0,0 @@
-$Id$
-
-patch to be able to use external Xrender/Xft/Xcursor libraries
-
- * check HasRenderLibrary to use Render or not
- * some INCLUDES added to be able to refer external
- Xrender,Xft,Xcursor libraries' header
-
- This patch contains xc/programs/*/Imakefile parts
-
-ISHIKAWA Mutsumi <ishikawa@debian.org>
-
-diff -x '*~' -urN xc.orig/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
---- xc.orig/programs/x11perf/Imakefile 2003-06-04 05:16:04.000000000 +0900
-+++ xc/programs/x11perf/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -12,13 +12,13 @@
- #if HasShm
- SHMDEFS = -DMITSHM
- #endif
--#if BuildRenderLibrary
-+#if (BuildRenderLibrary || HasRenderLibrary)
- XRENDERDEFS = -DXRENDER
- XRENDERDEPS = $(DEPXRENDERLIB)
- XRENDERLIBS = $(XRENDERLIB)
- XRENDERINCS = $(XRENDERINCLUDES)
- #endif
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- XFTDEFS = -DXFT
- XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
- XFTLIBS = XftClientLibs $(XRENDERLIB)
-diff -x '*~' -urN xc.orig/programs/xclock/Imakefile xc/programs/xclock/Imakefile
---- xc.orig/programs/xclock/Imakefile 2003-06-04 05:16:04.000000000 +0900
-+++ xc/programs/xclock/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.4 2002/07/01 02:26:00 tsi Exp $
-
- #ifndef XClockUseRender
--#define XClockUseRender BuildRenderLibrary
-+#define XClockUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if XClockUseRender
-diff -x '*~' -urN xc.orig/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
---- xc.orig/programs/xcursorgen/Imakefile 2003-06-04 02:19:50.000000000 +0900
-+++ xc/programs/xcursorgen/Imakefile 2003-06-04 05:02:16.000000000 +0900
-@@ -5,7 +5,7 @@
- SUBDIRS = redglass whiteglass handhelds
- DEFAULT_THEME = DefaultCursorTheme
- THEMEDIR = $(ICONDIR)/default
-- INCLUDES = $(LIBPNGINC)
-+ INCLUDES = $(LIBPNGINC) $(XCURSORINCLUDES)
- DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
- MathLibrary GzipLibrary
-diff -x '*~' -urN xc.orig/programs/xditview/Imakefile xc/programs/xditview/Imakefile
---- xc.orig/programs/xditview/Imakefile 2003-06-04 05:15:58.000000000 +0900
-+++ xc/programs/xditview/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -7,7 +7,7 @@
-
-
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- DEPFONTLIBS = XftClientDepLibs
- FONTLIBS = XftClientLibs
- FONTDEFS = -DUSE_XFT
-diff -x '*~' -urN xc.orig/programs/xdpyinfo/Imakefile xc/programs/xdpyinfo/Imakefile
---- xc.orig/programs/xdpyinfo/Imakefile 2003-06-04 05:16:04.000000000 +0900
-+++ xc/programs/xdpyinfo/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -40,7 +40,7 @@
- XINPUTLIBS = $(XILIB)
- #endif
-
--#if BuildRenderLibrary
-+#if (BuildRenderLibrary || HasRenderLibrary)
- XRENDERDEFINES = -DXRENDER
- XRENDERDEPLIBS = $(DEPXRENDERLIB)
- XRENDERLIBS = $(XRENDERLIB)
-diff -x '*~' -urN xc.orig/programs/xfd/Imakefile xc/programs/xfd/Imakefile
---- xc.orig/programs/xfd/Imakefile 2003-06-04 05:16:04.000000000 +0900
-+++ xc/programs/xfd/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.3 2002/07/23 01:45:41 tsi Exp $
-
- #ifndef XFdUseRender
--#define XFdUseRender BuildRenderLibrary
-+#define XFdUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if XFdUseRender
-diff -x '*~' -urN xc.orig/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
---- xc.orig/programs/xlogo/Imakefile 2003-06-04 05:16:04.000000000 +0900
-+++ xc/programs/xlogo/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -5,7 +5,7 @@
- XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.3 2002/07/01 02:26:04 tsi Exp $
-
- #ifndef XLogoUseRender
--#define XLogoUseRender BuildRenderLibrary
-+#define XLogoUseRender (BuildRenderLibrary || HasRenderLibrary)
- #endif
-
- #if XLogoUseRender
-diff -x '*~' -urN xc.orig/programs/xrandr/Imakefile xc/programs/xrandr/Imakefile
---- xc.orig/programs/xrandr/Imakefile 2002-09-30 08:39:47.000000000 +0900
-+++ xc/programs/xrandr/Imakefile 2003-06-04 05:08:22.000000000 +0900
-@@ -2,6 +2,7 @@
-
- DEFINES=$(RANDRDEFINES)
- DEPLIBS=$(DEPXRANDRLIB) $(DEPXLIB)
-+INCLUDES=$(XRENDERINCLUDES)
- LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
-
- SRCS=xrandr.c
-diff -x '*~' -urN xc.orig/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc.orig/programs/xterm/Imakefile 2003-06-04 05:15:58.000000000 +0900
-+++ xc/programs/xterm/Imakefile 2003-06-04 02:19:52.000000000 +0900
-@@ -92,7 +92,7 @@
- UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
- UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
- #endif
--#if BuildXftLibrary
-+#if (BuildXftLibrary || HasXftLibrary)
- #define XRenderSupport
- #endif
- #ifdef XRenderSupport
Deleted: people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff
===================================================================
--- people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff 2003-12-14 13:22:17 UTC (rev 842)
+++ people/wt/4.4.0/patches-needing-update/060_external_XrenderXftXcursor_lib.diff 2003-12-14 13:24:06 UTC (rev 843)
@@ -1,124 +0,0 @@
-$Id$
-
-patch to be able to use external Xrender/Xft/Xcursor libraries
-
- * namespace conflicts in xc/lib/Imakefile fix
- * namespace conflicts in xc/lib/Xft1/Imakefile fix
- * check Has{Render,Xft,Xcursor}Library to use them
- * some INCLUDES added to be able to refer external
- Xrender,Xft,Xcursor libraries' header
-
- This patch contains xc/lib/*/Imakefile parts
-
-ISHIKAWA Mutsumi <ishikawa@debian.org>
-
-diff -x '*~' -urN xc.orig/lib/Imakefile xc/lib/Imakefile
---- xc.orig/lib/Imakefile 2003-02-21 14:31:24.000000000 +0900
-+++ xc/lib/Imakefile 2003-06-04 06:18:08.000000000 +0900
-@@ -102,7 +102,7 @@
- #endif
-
- #if BuildRenderLibrary
--RENDERLIBDIR = Xrender
-+RENDERLIBBUILDDIR = Xrender
- #endif
-
- #if BuildExpatLibrary
-@@ -118,7 +118,7 @@
- #endif
-
- #if BuildXftLibrary
--XFTLIBDIR = Xft
-+XFTBUILDDIR = Xft
- #endif
-
- #if BuildXft1Library
-@@ -130,7 +130,7 @@
- #endif
-
- #if BuildXcursorLibrary
--XCURSORLIBDIR = Xcursor
-+XCURSORBUILDDIR = Xcursor
- #endif
-
- #if BuildXTrapLibrary
-@@ -209,10 +209,10 @@
- $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(XPRINTLIBDIR) \
- $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
- $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
-- $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
-+ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBBUILDDIR) $(FREETYPE2BUILDDIR) \
- $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \
-- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
-- $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR)
-+ $(XFT1LIBDIR) $(XFTBUILDDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
-+ $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORBUILDDIR)
-
- SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
- $(FONTCACHELIBDIR)
-diff -x '*~' -urN xc.orig/lib/Xcursor/Imakefile xc/lib/Xcursor/Imakefile
---- xc.orig/lib/Xcursor/Imakefile 2003-06-04 02:19:50.000000000 +0900
-+++ xc/lib/Xcursor/Imakefile 2003-06-04 05:00:17.000000000 +0900
-@@ -34,6 +34,8 @@
-
- DEFINES=$(ICONDIRDEFS) $(XCURSORPATHDEFS)
-
-+INCLUDES=$(XRENDERINCLUDES)
-+
- SRCS = cursor.c display.c file.c library.c xlib.c
-
- OBJS = cursor.o display.o file.o library.o xlib.o
-diff -x '*~' -urN xc.orig/lib/Xft/Imakefile xc/lib/Xft/Imakefile
---- xc.orig/lib/Xft/Imakefile 2003-02-26 07:18:03.000000000 +0900
-+++ xc/lib/Xft/Imakefile 2003-06-04 05:10:49.000000000 +0900
-@@ -43,7 +43,7 @@
- #if HasGcc2 || HasGcc3
- WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
- #endif
--INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(WARNINGS)
-+INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES) $(WARNINGS)
- DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
-
- XFT_REVISION=0
-diff -x '*~' -urN xc.orig/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
---- xc.orig/lib/Xft1/Imakefile 2002-11-15 06:01:18.000000000 +0900
-+++ xc/lib/Xft1/Imakefile 2003-06-04 05:00:01.000000000 +0900
-@@ -79,13 +79,13 @@
-
- YFLAGS = -d
-
--#ifndef XftLibDir
--#define XftLibDir $(LIBDIR)
-+#ifndef Xft1LibDir
-+#define Xft1LibDir $(LIBDIR)
- #endif
-
--XFTLIBDIR=XftLibDir
-+XFT1LIBDIR=Xft1LibDir
-
--INCLUDES=$(FREETYPE2INCLUDES)
-+INCLUDES=$(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
- DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES)
-
- #if UseFreetype2
-@@ -142,7 +142,7 @@
- InstallNamedTargetRelated(install,file,$(INSTDATFLAGS),dest,file,rel)
- #endif /* InstallNonExecFileBackup */
-
--InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFTLIBDIR),XftConfig)
-+InstallNonExecFileRelated(XftConfig-OBSOLETE,$(XFT1LIBDIR),XftConfig)
- InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
-
- MANSUFFIX = $(LIBMANSUFFIX)
-diff -x '*~' -urN xc.orig/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
---- xc.orig/lib/Xrandr/Imakefile 2002-10-03 01:55:41.000000000 +0900
-+++ xc/lib/Xrandr/Imakefile 2003-06-04 05:05:41.000000000 +0900
-@@ -21,7 +21,7 @@
- #endif
-
- DEFINES = $(ALLOC_DEFINES)
-- INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC)
-+ INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(XRENDERINCLUDES)
- SRCS = Xrandr.c
- OBJS = Xrandr.o
- LINTLIBS = $(LINTXLIB)
Reply to: