Makefile.am | 2 --
configure.ac | 2 +-
include/X11/fonts/fontconf.h.in | 2 --
src/FreeType/ftenc.c | 4 ++++
src/FreeType/ftfuncs.c | 1 +
src/Makefile.am | 2 --
src/fc/fstrans.c | 2 --
src/fontfile/dirfile.c | 6 ++++++
src/fontfile/fontdir.c | 4 ++++
9 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 684c000e57f30344777cf763f2f1b540ef008b38
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Jul 2 15:30:03 2008 -0400
libXfont 1.3.3
diff --git a/configure.ac b/configure.ac
index 7d7ba75..fe55e41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.3.2,
+ 1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit 11edbc3a818e15ea2b622b31e6f87159ee68ae4a
Author: Maarten ter Huurne <[EMAIL PROTECTED]>
Date: Sat Jun 28 15:34:50 2008 -0400
Do not call FT_Get_BDF_Charset_ID() if configured with --disable-bdfformat
When I configure libXfont-1.3.2 with --disable-bdfformat and link it against
FreeType that is built without BDF support, I get the following link error:
libXfont.so: undefined reference to ‘FT_Get_BDF_Charset_ID’
I fixed it by checking XFONT_BDFFORMAT and if BDF support is disabled, the
call
to FT_Get_BDF_Charset_ID() is omitted and the result code is set as if the
call
had failed.
Signed-off-by: James Cloos <[EMAIL PROTECTED]>
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c
index a9d6494..f6436fc 100644
--- a/src/FreeType/ftenc.c
+++ b/src/FreeType/ftenc.c
@@ -86,7 +86,11 @@ FTPickMapping(char *xlfd, int length, char *filename,
FT_Face face,
symbol = FTEncFontSpecific(encoding_name);
+#if XFONT_BDFFORMAT
ftrc = FT_Get_BDF_Charset_ID(face, &enc, ®);
+#else
+ ftrc = -1;
+#endif
if(ftrc == 0) {
/* Disable reencoding for non-Unicode fonts. This will
currently only work for BDFs. */
commit 1ab07ce0eec4f6c7ed66c7aba3edf8c4315dd907
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue May 13 17:26:57 2008 -0700
FontFileDirectoryChanged: check length of "fonts.alias" as well as
"fonts.dir"
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index a13798a..1489938 100755
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -176,6 +176,9 @@ FontFileDirectoryChanged(FontDirectoryPtr dir)
}
if (dir->dir_mtime != statb.st_mtime)
return TRUE;
+
+ if ((strlen(dir->directory) + sizeof(FontAliasFile)) > sizeof(dir_file))
+ return FALSE;
strcpy (dir_file, dir->directory);
strcat (dir_file, FontAliasFile);
if (stat (dir_file, &statb) == -1)
commit 0f9db4aa7de6e0644ac9c5811b949e5f936c9d61
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Fri May 9 12:36:30 2008 -0700
Don't allow a font alias to point to itself and create a loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index cf68a54..cd9fde1 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -811,6 +811,10 @@ FontFileAddFontAlias (FontDirectoryPtr dir, char
*aliasName, char *fontName)
{
FontEntryRec entry;
+ if (strcmp(aliasName,fontName) == 0) {
+ /* Don't allow an alias to point to itself and create a loop */
+ return FALSE;
+ }
entry.name.length = strlen (aliasName);
CopyISOLatin1Lowered (aliasName, aliasName, entry.name.length);
entry.name.name = aliasName;
commit 67311922a2e02d8a763831831b65bb4833db58b5
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Mon May 5 22:17:55 2008 +0100
Fix build for WIN32
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
old mode 100644
new mode 100755
index 3159a5e..a13798a
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -66,6 +66,9 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr
*pdir)
status;
struct stat statb;
static char format[24] = "";
+#if defined(__UNIXOS2__) || defined(WIN32)
+ int i;
+#endif
FontDirectoryPtr dir = NullFontDirectory;
commit 6ba408c956ca8e241d10d463c45b4e987b757333
Author: Matthieu Herrb <[EMAIL PROTECTED]>
Date: Sun Mar 9 08:21:34 2008 +0100
nuke RCS Ids
diff --git a/Makefile.am b/Makefile.am
index 8b354d7..f5e9c4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in
index b16df93..f12081d 100644
--- a/include/X11/fonts/fontconf.h.in
+++ b/include/X11/fonts/fontconf.h.in
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2005 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/Makefile.am b/src/Makefile.am
index 99500fc..8a9c796 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/fc/fstrans.c b/src/fc/fstrans.c
index 9f43d8f..c334c25 100644
--- a/src/fc/fstrans.c
+++ b/src/fc/fstrans.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 754cabe62e91b9ad50c3027c063f4269775f7add
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 7 12:19:22 2008 +0100
Add missing include in src/FreeType/ftfuncs.c
Fixes compiler warning:
../../../src/FreeType/ftfuncs.c: In function 'restrict_code_range_by_str':
../../../src/FreeType/ftfuncs.c:2081: warning: implicit declaration of
function 'isspace'
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index db3e4ec..fff6eec 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -42,6 +42,7 @@ THE SOFTWARE.
#include "Xdefs.h"
#include "xf86_ansic.h"
#endif
+#include <ctype.h>
#include <X11/fonts/fntfilst.h>
#include <X11/fonts/fontutil.h>
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
