debian/changelog | 2 -
debian/copyright | 5 +-
mkfontscale/COPYING | 2 -
mkfontscale/ChangeLog | 59 ++++++++++++++++++++++++++++++++
mkfontscale/aclocal.m4 | 22 ++++++------
mkfontscale/config.guess | 6 +--
mkfontscale/configure | 84 +++++++++++++++++++++++++---------------------
mkfontscale/configure.ac | 2 -
mkfontscale/hash.c | 2 -
mkfontscale/ident.c | 1
mkfontscale/mkfontscale.c | 27 +++++++++-----
11 files changed, 146 insertions(+), 66 deletions(-)
New commits:
commit 7b1233bd2226c36fcdb8510e91baae41a7cb6aba
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun May 11 01:12:45 2008 +0200
mkfontscale 1.0.5
diff --git a/debian/changelog b/debian/changelog
index 760eba1..9626aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
xfonts-utils (1:7.4+1) UNRELEASED; urgency=low
* Change versioning to more or less match X.Org katamaris
- * mkfontscale 1.0.4
+ * mkfontscale 1.0.5
* mkfontdir 1.0.4
+ drop 001_mkfontdir_location_fix.diff, fixed upstream
* Bump Standards-Version to 3.7.3
diff --git a/debian/copyright b/debian/copyright
index dec3ee2..54c4517 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
This package contains the bdftopcf, font-util, mkfontdir and mkfontscale
utilities downloaded
-from http://xorg.freedesktop.org/releases/individual/font/
+from http://xorg.freedesktop.org/releases/individual/font/ and
+http://xorg.freedesktop.org/releases/individual/app/
Copyright 1987, 1990, 1991, 1993, 1998 The Open Group
-Copyright (c) 2001-2003 by Juliusz Chroboczek
+Copyright (c) 2001-2008 by Juliusz Chroboczek
Copyright (c) 2002 by Tomohiro KUBOTA
Copyright (c) 1993 Quarterdeck Office Systems
Copyright 2002-2004 by Roland Mainz <[EMAIL PROTECTED]>
diff --git a/mkfontscale/COPYING b/mkfontscale/COPYING
index 31965e8..b706b38 100644
--- a/mkfontscale/COPYING
+++ b/mkfontscale/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2003 by Juliusz Chroboczek
+Copyright (c) 2002-2008 by Juliusz Chroboczek
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/mkfontscale/ChangeLog b/mkfontscale/ChangeLog
index c6f8dfb..a0001ad 100644
--- a/mkfontscale/ChangeLog
+++ b/mkfontscale/ChangeLog
@@ -1,3 +1,62 @@
+commit 8126d2b694f48cc8137be05705a125f7d02e7e12
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Sun May 11 00:03:44 2008 +0200
+
+ Bump to 1.0.5
+
+commit f131ff40d2b46692c393346110df2567cfa67c29
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Sat May 10 23:58:55 2008 +0200
+
+ Update copyright date.
+
+commit c322c79c2b9b8d6075b6782d572033cc50799a49
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Sat May 10 23:56:33 2008 +0200
+
+ Fix handling of OpenType/CFF fonts with embedded bitmaps.
+ The old workaround would trigger with CFF fonts with embedded bitmaps.
+ We now explicitly check for the font format being TrueType.
+ Reported by Andrey V. Panov.
+
+commit 5db9e13aafbed8c0562838005147ebefb12d08ac
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Sat May 10 23:37:14 2008 +0200
+
+ Remove doubly included header.
+
+commit b0860282c3229d088840fa0758d8473ea6d8813b
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Mon Apr 28 19:53:11 2008 +0200
+
+ Add bdf and pcf to font priority table.
+ This mirrors the behaviour of the old mkfontdir, which prefers pcf to
+ bdf fonts.
+
+commit 9c5594ad13e9143e86a7fd94f90858795ae2970b
+Author: Juliusz Chroboczek <[EMAIL PROTECTED]>
+Date: Mon Apr 28 19:15:05 2008 +0200
+
+ Fix typo in mkfontscale.c.
+ This spurious break statement disabled checking for Apple and ISO Unicode
+ CMaps in SFNT fonts. Thanks to Alan Coopersmith and Stefan Dirsch.
+
+commit 5ca409f025fb35a20ab1ef4742a9034a36e3d959
+Author: Paulo Cesar Pereira de Andrade <[EMAIL PROTECTED]>
+Date: Sat Mar 15 18:44:06 2008 -0300
+
+ Compile warning fixes.
+
+ Include headers for proper prototypes and "ansify" makeHashTable.
+
+ Signed-off-by: Alan Coopersmith <[EMAIL PROTECTED]>
+
+commit 47ec1e2697eb856f823cc1b488c6b5a1d2077df9
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Thu Mar 6 16:40:41 2008 -0500
+
+ mkfontscale 1.0.4
+
commit 1cb9c0074c5075bbce63ff3601712f34bbb74ca1
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Sun Feb 24 21:34:00 2008 -0500
diff --git a/mkfontscale/aclocal.m4 b/mkfontscale/aclocal.m4
index e5b3eb6..5a8f292 100644
--- a/mkfontscale/aclocal.m4
+++ b/mkfontscale/aclocal.m4
@@ -87,14 +87,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,9 +140,9 @@ See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff --git a/mkfontscale/config.guess b/mkfontscale/config.guess
index ca2a03c..f32079a 100755
--- a/mkfontscale/config.guess
+++ b/mkfontscale/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-01-08'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1484,9 +1484,9 @@ This script, last modified $timestamp, has failed to
recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/mkfontscale/configure b/mkfontscale/configure
index ada4ffe..7d54e8f 100755
--- a/mkfontscale/configure
+++ b/mkfontscale/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mkfontscale 1.0.4.
+# Generated by GNU Autoconf 2.61 for mkfontscale 1.0.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='mkfontscale'
PACKAGE_TARNAME='mkfontscale'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='mkfontscale 1.0.4'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='mkfontscale 1.0.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1199,7 +1199,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mkfontscale 1.0.4 to adapt to many kinds of systems.
+\`configure' configures mkfontscale 1.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1269,7 +1269,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mkfontscale 1.0.4:";;
+ short | recursive ) echo "Configuration of mkfontscale 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1367,7 +1367,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mkfontscale configure 1.0.4
+mkfontscale configure 1.0.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1381,7 +1381,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mkfontscale $as_me 1.0.4, which was
+It was created by mkfontscale $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2071,7 +2071,7 @@ fi
# Define the identity of the package.
PACKAGE='mkfontscale'
- VERSION='1.0.4'
+ VERSION='1.0.5'
cat >>confdefs.h <<_ACEOF
@@ -3616,10 +3616,11 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for MKFONTSCALE" >&5
echo $ECHO_N "checking for MKFONTSCALE... $ECHO_C" >&6; }
-if test -n "$MKFONTSCALE_CFLAGS"; then
- pkg_cv_MKFONTSCALE_CFLAGS="$MKFONTSCALE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$MKFONTSCALE_CFLAGS"; then
+ pkg_cv_MKFONTSCALE_CFLAGS="$MKFONTSCALE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontenc
freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "fontenc freetype2") 2>&5
ac_status=$?
@@ -3629,13 +3630,15 @@ if test -n "$MKFONTSCALE_CFLAGS"; then
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$MKFONTSCALE_LIBS"; then
- pkg_cv_MKFONTSCALE_LIBS="$MKFONTSCALE_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$MKFONTSCALE_LIBS"; then
+ pkg_cv_MKFONTSCALE_LIBS="$MKFONTSCALE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontenc
freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "fontenc freetype2") 2>&5
ac_status=$?
@@ -3645,8 +3648,9 @@ if test -n "$MKFONTSCALE_LIBS"; then
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -3659,9 +3663,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MKFONTSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors "fontenc freetype2" 2>&1`
+ MKFONTSCALE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "fontenc freetype2"`
else
- MKFONTSCALE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontenc
freetype2" 2>&1`
+ MKFONTSCALE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "fontenc freetype2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$MKFONTSCALE_PKG_ERRORS" >&5
@@ -3726,10 +3730,11 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for X11" >&5
echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
-if test -n "$X11_CFLAGS"; then
- pkg_cv_X11_CFLAGS="$X11_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$X11_CFLAGS"; then
+ pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"")
>&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -3739,13 +3744,15 @@ if test -n "$X11_CFLAGS"; then
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$X11_LIBS"; then
- pkg_cv_X11_LIBS="$X11_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$X11_LIBS"; then
+ pkg_cv_X11_LIBS="$X11_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"")
>&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -3755,8 +3762,9 @@ if test -n "$X11_LIBS"; then
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -3769,9 +3777,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"xproto" 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout
--print-errors "xproto"`
else
- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
+ X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors
"xproto"`
fi
# Put the nasty error message in config.log where it belongs
echo "$X11_PKG_ERRORS" >&5
@@ -4443,7 +4451,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mkfontscale $as_me 1.0.4, which was
+This file was extended by mkfontscale $as_me 1.0.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4496,7 +4504,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-mkfontscale config.status 1.0.4
+mkfontscale config.status 1.0.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/mkfontscale/configure.ac b/mkfontscale/configure.ac
index a05fcbd..8775081 100644
--- a/mkfontscale/configure.ac
+++ b/mkfontscale/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(mkfontscale, [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
+AC_INIT(mkfontscale, [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
diff --git a/mkfontscale/hash.c b/mkfontscale/hash.c
index f650888..313d5b6 100644
--- a/mkfontscale/hash.c
+++ b/mkfontscale/hash.c
@@ -53,7 +53,7 @@ strcpy_lwr(char *dst, char *src)
}
HashTablePtr
-makeHashTable()
+makeHashTable(void)
{
return calloc(NUMBUCKETS, sizeof(HashBucketPtr));
}
diff --git a/mkfontscale/ident.c b/mkfontscale/ident.c
index 18402d2..80452e6 100644
--- a/mkfontscale/ident.c
+++ b/mkfontscale/ident.c
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include "zlib.h"
+#include "ident.h"
#define PCF_VERSION (('p'<<24)|('c'<<16)|('f'<<8)|1)
#define PCF_PROPERTIES (1 << 0)
diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c
index b538d79..e6aacd7 100644
--- a/mkfontscale/mkfontscale.c
+++ b/mkfontscale/mkfontscale.c
@@ -30,6 +30,7 @@
#include <dirent.h>
#include <unistd.h>
#include <errno.h>
+#include <ctype.h>
#include <X11/Xos.h>
#include <X11/fonts/fontenc.h>
@@ -40,7 +41,7 @@
#include FT_TRUETYPE_IDS_H
#include FT_TYPE1_TABLES_H
#include FT_BDF_H
-#include FT_TRUETYPE_TABLES_H
+#include FT_XFREE86_H
#include "list.h"
#include "hash.h"
@@ -726,16 +727,24 @@ filePrio(char *filename)
if(n < 4)
return 0;
if(strcmp(filename + n - 4, ".otf") == 0)
- return 4;
+ return 6;
if(strcmp(filename + n - 4, ".OTF") == 0)
- return 4;
+ return 6;
if(strcmp(filename + n - 4, ".ttf") == 0)
- return 3;
+ return 5;
if(strcmp(filename + n - 4, ".TTF") == 0)
- return 3;
+ return 5;
+ if(strcmp(filename + n - 4, ".pcf") == 0)
+ return 4;
+ if(strcmp(filename + n - 4, ".PCF") == 0)
+ return 4;
if(strcmp(filename + n - 3, ".gz") == 0)
- return 2;
+ return 3;
if(strcmp(filename + n - 2, ".Z") == 0)
+ return 2;
+ if(strcmp(filename + n - 4, ".bdf") == 0)
+ return 1;
+ if(strcmp(filename + n - 4, ".BDF") == 0)
return 1;
return 0;
}
@@ -840,8 +849,9 @@ doDirectory(char *dirname_given, int numEncodings, ListPtr
encodingsToDo)
isBitmap = ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0);
if(!isBitmap) {
- /* Workaround for bitmap-only TTF fonts */
- if(face->num_fixed_sizes > 0) {
+ /* Workaround for bitmap-only SFNT fonts */
+ if(FT_IS_SFNT(face) && face->num_fixed_sizes > 0 &&
+ strcmp(FT_Get_X11_Font_Format(face), "TrueType") == 0) {
TT_MaxProfile *maxp;
maxp = FT_Get_Sfnt_Table(face, ft_sfnt_maxp);
if(maxp != NULL && maxp->maxContours == 0)
@@ -1129,7 +1139,6 @@ find_cmap(int type, int pid, int eid, FT_Face face)
return 1;
}
}
- break;
/* Try Apple Unicode */
for(i=0; i<n; i++) {
cmap = face->charmaps[i];
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
