[Commit] tk/unix Makefile,1.5,1.6 tkUnixRFont.c,1.3,1.4
Keith Packard
commit@keithp.com
Tue, 06 May 2003 16:07:57 -0700
- Previous message: [Commit] xcursorgen ChangeLog,NONE,1.1
- Next message: [Commit] fontconfig/src fccache.c,1.19,1.20 fccfg.c,1.34,1.35 fcdir.c,1.15,1.16 fcfreetype.c,1.31,1.32 fcint.h,1.38,1.39 fcxml.c,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: keithp
Update of /local/src/CVS/tk/unix
In directory home.keithp.com:/tmp/cvs-serv17293
Modified Files:
Makefile tkUnixRFont.c
Log Message:
Couple of fontconfig fixes
Index: Makefile
===================================================================
RCS file: /local/src/CVS/tk/unix/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 21 Aug 2002 06:13:43 -0000 1.5
+++ Makefile 6 May 2003 23:07:54 -0000 1.6
@@ -107,12 +107,12 @@
# X11 include files accessible (the configure script will try to
# set this value, and will cause it to be an empty string if the
# include files are accessible via /usr/include).
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2
+X11_INCLUDES = -I/usr/X11R6/include -I/usr/include/freetype2
# Linker switch(es) to use to link with the X11 library archive (the
# configure script will try to set this value automatically, but you
# can override it).
-X11_LIB_SWITCHES = -L/usr/X11R6/lib -lXft -lX11 -lfontconfig
+X11_LIB_SWITCHES = -L/usr/X11R6/lib -lXft -lXcursor -lX11 -lfontconfig
[...6020 lines suppressed...]
+/local/src/tk/unix/tkUnixXId.o: /usr/include/bits/select.h
+/local/src/tk/unix/tkUnixXId.o: /usr/include/bits/sigset.h
+/local/src/tk/unix/tkUnixXId.o: /usr/include/unistd.h
+/local/src/tk/unix/tkUnixXId.o: /usr/include/bits/posix_opt.h
+/local/src/tk/unix/tkUnixXId.o: /usr/include/bits/confname.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xlib.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/X.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xfuncproto.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xosdefs.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/cursorfont.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/keysym.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/keysymdef.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xatom.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xproto.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xmd.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xprotostr.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xresource.h
+/local/src/tk/unix/tkUnixXId.o: /usr/X11R6/include/X11/Xutil.h
+/local/src/tk/unix/tkUnixXId.o: /local/src/tcl/generic/tclInt.h
+/local/src/tk/unix/tkUnixXId.o: /local/src/tcl/generic/tclIntDecls.h
Index: tkUnixRFont.c
===================================================================
RCS file: /local/src/CVS/tk/unix/tkUnixRFont.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tkUnixRFont.c 6 Jul 2002 18:59:11 -0000 1.3
+++ tkUnixRFont.c 6 May 2003 23:07:55 -0000 1.4
@@ -50,8 +50,9 @@
i = 0;
if (!fontPtr->faces[i].ftFont)
{
- FcPattern *pat = FcFontRenderPrepare (0, fontPtr->faces[i].source,
- fontPtr->pattern);
+ FcPattern *pat = FcFontRenderPrepare (0, fontPtr->pattern,
+ fontPtr->faces[i].source);
+
fontPtr->faces[i].ftFont = XftFontOpenPattern (fontPtr->display,
pat);
}
@@ -117,7 +118,7 @@
fontPtr->faces[i].ftFont = 0;
fontPtr->faces[i].source = set->fonts[i];
if (FcPatternGetCharSet (set->fonts[i], FC_CHARSET, 0, &charset) == FcResultMatch)
- fontPtr->faces[i].charset = charset;
+ fontPtr->faces[i].charset = FcCharSetCopy (charset);
else
fontPtr->faces[i].charset = 0;
}
- Previous message: [Commit] xcursorgen ChangeLog,NONE,1.1
- Next message: [Commit] fontconfig/src fccache.c,1.19,1.20 fccfg.c,1.34,1.35 fcdir.c,1.15,1.16 fcfreetype.c,1.31,1.32 fcint.h,1.38,1.39 fcxml.c,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]