libxfont: Changes to 'debian-unstable'
ChangeLog | 102 ++++++
aclocal.m4 | 18 +
config.guess | 32 +-
config.h.in | 3
config.sub | 16 -
configure | 93 ++++--
configure.ac | 2
debian/changelog | 10
debian/control | 4
debian/xsfbs/xsfbs.mk | 7
include/X11/fonts/bitmap.h | 7
include/X11/fonts/bufio.h | 2
include/X11/fonts/fntfil.h | 4
include/X11/fonts/pcf.h | 2
src/FreeType/ft.h | 1
src/FreeType/fttools.c | 47 ---
src/FreeType/xttcap.c | 400 ++++++++++-----------------
src/FreeType/xttcap.h | 5
src/Speedo/do_char.c | 207 --------------
src/Speedo/do_trns.c | 14
src/Speedo/out_scrn.c | 172 +++++------
src/Speedo/out_util.c | 196 ++++++-------
src/Speedo/reset.c | 2
src/Speedo/set_spcs.c | 10
src/Speedo/set_trns.c | 234 ++++-----------
src/Speedo/spdo_prv.h | 161 ----------
src/Speedo/speedo.h | 16 -
src/Speedo/spglyph.c | 2
src/Speedo/spint.h | 2
src/Type1/Makefile.am | 1
src/Type1/Makefile.in | 4
src/Type1/arith.c | 276 ------------------
src/Type1/arith.h | 6
src/Type1/digit.h | 2
src/Type1/fontfcn.c | 11
src/Type1/fontfcn.h | 2
src/Type1/lines.c | 69 ++--
src/Type1/lines.h | 2
src/Type1/objects.c | 267 +++---------------
src/Type1/objects.h | 39 --
src/Type1/paths.c | 662 ---------------------------------------------
src/Type1/paths.h | 34 --
src/Type1/regions.c | 423 +++-------------------------
src/Type1/regions.h | 26 -
src/Type1/scanfont.c | 2
src/Type1/spaces.c | 221 +++++----------
src/Type1/spaces.h | 21 -
src/Type1/t1funcs.c | 50 +--
src/Type1/t1info.c | 5
src/Type1/t1intf.h | 1
src/Type1/t1malloc.c | 4
src/Type1/t1stub.c | 56 ---
src/Type1/util.h | 1
src/bitmap/bitmapfunc.c | 100 +++---
src/bitmap/bitscale.c | 6
src/bitmap/snfread.c | 2
src/bitmap/snfstr.h | 1
src/builtins/builtin.h | 8
src/builtins/dir.c | 4
src/builtins/file.c | 19 -
src/builtins/fonts.c | 14
src/builtins/fpe.c | 23 -
src/builtins/render.c | 35 --
src/fc/fsconvert.c | 40 --
src/fc/fserve.c | 75 ++---
src/fc/fserve.h | 3
src/fc/fservestr.h | 9
src/fc/fsio.c | 62 ----
src/fc/fsio.h | 7
src/fontfile/Makefile.am | 3
src/fontfile/Makefile.in | 6
src/fontfile/bufio.c | 22 -
src/fontfile/catalogue.c | 457 +++++++++++++++++++++++++++++++
src/fontfile/fontfile.c | 41 +-
src/fontfile/register.c | 1
75 files changed, 1536 insertions(+), 3358 deletions(-)
New commits:
commit e955500ba4e4de2b69a49bd77801121e8ec89363
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Jun 23 09:44:06 2007 +1000
debian/control: use libxfont1 (= ${binary:Version}) instead of ${Source-Version}
Clears up lintian warning (${Source-Version} is deprecated).
diff --git a/debian/changelog b/debian/changelog
index 8bd5188..7d0bd1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libxfont (1:1.2.9-1) unstable; urgency=low
* New upstream version.
- Add a new 'catalogue' FPE (font path element), which takes font
paths from symlinks in a dir.
+ * Use libxfont1 (= ${binary:Version}) instead of ${Source-Version}
+ in debian/control.
- -- Drew Parsons <dparsons@debian.org> Sat, 23 Jun 2007 09:08:50 +1000
+ -- Drew Parsons <dparsons@debian.org> Sat, 23 Jun 2007 09:40:45 +1000
libxfont (1:1.2.8-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9ff6751..b0d5d4f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: X11 font rasterisation library
Package: libxfont1-dbg
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxfont1 (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxfont1 (= ${binary:Version})
Description: X11 font rasterisation library (debug package)
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
@@ -36,7 +36,7 @@ Description: X11 font rasterisation library (debug package)
Package: libxfont-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${Source-Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
Pre-Depends: x11-common (>= 1:7.0.0)
Replaces: xlibs-static-dev (<< 6.8.2-51)
Description: X11 font rasterisation library (development headers)
commit 2a337ac43850fc7b895b308a35fbc70b7664c32c
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Jun 23 09:15:32 2007 +1000
Upload new upstream version. Autoreconf.
diff --git a/ChangeLog b/ChangeLog
index 995ff09..66ecf11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,105 @@
+commit 8d47483711be6076e7bfefab14aa890c5f37e1aa
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jun 21 21:44:02 2007 -0400
+
+ Bump version to 1.2.9.
+
+commit c5ab59762c4ad5def68436d55937a2bd558d5c99
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Jun 19 10:38:02 2007 -0400
+
+ Add a new 'catalogue' FPE, which takes font paths from symlinks in a dir.
+
+ This patch adds a new FPE type, which will match font path elements of the
+ form
+
+ catalogue:<dir>
+
+ The dir specified after the catalogue: prefix will be scanned for symlinks
+ and each symlink destination will be added as a local fontfile FPE.
+ The symlink can be suffixed by attributes, such as 'unscaled', which
+ will be passed through to the underlying fontfile FPE. Except the new
+ attribute 'pri' which will be used for ordering the fontfile FPEs.
+
+ An example configuration:
+
+ 75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
+ ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
+ misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
+ type1:pri=40 -> /usr/share/X11/fonts/Type1
+ type1:pri=50 -> /usr/share/fonts/default/Type1
+
+ will add /usr/share/X11/fonts/misc as the first FPE with the attribute
+ 'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
+ the attribute unscaled etc. This is functionally equivalent to setting
+ the following font path:
+
+ /usr/share/X11/fonts/misc:unscaled,
+ /usr/share/X11/fonts/75dpi:unscaled,
+ /usr/share/X11/fonts/Type1,
+ /usr/share/fonts/default/Type1,
+ /usr/share/fonts/default/ghostscript
+
+ The motivation is to let font packages add a symlink to the new font
+ directory they provide instead of rewriting either the Xorg config file
+ or the xfs config file.
+
+commit 1a690feaf7c416da9b01861af381d15a661e5f52
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 16:01:03 2007 -0400
+
+ Minor fontfile cleanup.
+
+commit 3b1bcd7676fe810ce60d6a4758067b571796cceb
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 15:54:51 2007 -0400
+
+ Dead code cull from fontserver code.
+
+commit 6257af0e547095483331b8c8ed588e5467852671
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 15:41:19 2007 -0400
+
+ Static markup over bitmap and builtins.
+
+commit 8c31fadabd706af63381007d666e685a66b58fd9
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 15:28:09 2007 -0400
+
+ Dead code cull from FreeType.
+
+commit fabf5458f1acbfc967bdaea3b89d707c22b97364
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 15:17:16 2007 -0400
+
+ Death to open-coded strcasecmp.
+
+ Seriously, if you don't already have this, you've already lost.
+
+commit d50de26430c1a114a22597de40a3e5ac3c8e1ab7
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 15:13:44 2007 -0400
+
+ Dead code cull from Speedo.
+
+commit 3fd7a510b5467479d6e2559819b96b222c7328e8
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 14:39:03 2007 -0400
+
+ One more missed static in Type1
+
+commit 440166a027b78eb53d7686937148b755ad51f7f9
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 14:24:46 2007 -0400
+
+ Dead code removal and static markup for Type1.
+
+commit 9739e750a7ca4b86ddb89674b104e9b9a8b61014
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Jun 7 14:20:27 2007 -0400
+
+ Warning cleanup.
+
commit 87db45f5eb7880395735f7bf3a8ee2d89b7e0122
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 4 17:05:13 2007 -0700
diff --git a/aclocal.m4 b/aclocal.m4
index 5cf8621..1bbca16 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6660,8 +6660,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
# -------------------------
# Standard checks for which Xtrans transports to use by the Xorg packages
# that use Xtrans functions
-AC_DEFUN([XTRANS_CONNECTION_FLAGS],
-[AC_REQUIRE([AC_TYPE_SIGNAL])
+AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_TYPE_SIGNAL])
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
[UNIXCONN=$enableval], [UNIXCONN=yes])
@@ -6679,6 +6680,19 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],
AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
XTRANS_TCP_FLAGS
fi
+ [case $host_os in
+ solaris*|sco*|sysv4*) localdef="yes" ;;
+ *) localdef="no" ;;
+ esac]
+ AC_ARG_ENABLE(local-transport,
+ AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]),
+ [LOCALCONN=$enableval], [LOCALCONN=$localdef])
+ AC_MSG_CHECKING([if Xtrans should support os-specific local connections])
+ AC_MSG_RESULT($LOCALCONN)
+ if test "$LOCALCONN" = "yes"; then
+ AC_DEFINE(LOCALCONN,1,[Support os-specific local connections])
+ fi
+
]) # XTRANS_CONNECTION_FLAGS
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# 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
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.h.in b/config.h.in
index 82355b4..fe3d745 100644
--- a/config.h.in
+++ b/config.h.in
@@ -54,6 +54,9 @@
/* Support dynamically loaded font modules */
#undef LOADABLEFONTS
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index e216251..c180304 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libXfont 1.2.8.
+# Generated by GNU Autoconf 2.61 for libXfont 1.2.9.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libXfont'
PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.2.8'
-PACKAGE_STRING='libXfont 1.2.8'
+PACKAGE_VERSION='1.2.9'
+PACKAGE_STRING='libXfont 1.2.9'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1430,7 +1430,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 libXfont 1.2.8 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.2.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXfont 1.2.8:";;
+ short | recursive ) echo "Configuration of libXfont 1.2.9:";;
esac
cat <<\_ACEOF
@@ -1529,6 +1529,8 @@ Optional Features:
--enable-unix-transport Enable UNIX domain socket transport
--enable-tcp-transport Enable TCP socket transport
--enable-IPv6 Enable IPv6 support
+ --enable-local-transport
+ Enable os-specific local transport
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1634,7 +1636,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXfont configure 1.2.8
+libXfont configure 1.2.9
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1648,7 +1650,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 libXfont $as_me 1.2.8, which was
+It was created by libXfont $as_me 1.2.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2318,7 +2320,7 @@ fi
# Define the identity of the package.
PACKAGE='libXfont'
- VERSION='1.2.8'
+ VERSION='1.2.9'
cat >>confdefs.h <<_ACEOF
@@ -4359,7 +4361,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4362 "configure"' > conftest.$ac_ext
+ echo '#line 4364 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7091,11 +7093,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7094: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7098: \$? = $ac_status" >&5
+ echo "$as_me:7100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7359,11 +7361,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7362: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7364: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7366: \$? = $ac_status" >&5
+ echo "$as_me:7368: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7463,11 +7465,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7466: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7468: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7470: \$? = $ac_status" >&5
+ echo "$as_me:7472: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9760,7 +9762,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9763 "configure"
+#line 9765 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9860,7 +9862,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9863 "configure"
+#line 9865 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12196,11 +12198,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12199: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12201: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12203: \$? = $ac_status" >&5
+ echo "$as_me:12205: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12300,11 +12302,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12305: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12307: \$? = $ac_status" >&5
+ echo "$as_me:12309: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13861,11 +13863,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13864: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13866: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13868: \$? = $ac_status" >&5
+ echo "$as_me:13870: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13965,11 +13967,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13968: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13970: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13972: \$? = $ac_status" >&5
+ echo "$as_me:13974: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16152,11 +16154,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16155: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16157: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16159: \$? = $ac_status" >&5
+ echo "$as_me:16161: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16420,11 +16422,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16423: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16425: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16427: \$? = $ac_status" >&5
+ echo "$as_me:16429: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16524,11 +16526,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16529: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16531: \$? = $ac_status" >&5
+ echo "$as_me:16533: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20446,6 +20448,8 @@ _ACEOF
+
+
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
@@ -20870,6 +20874,29 @@ fi
fi
+ case $host_os in
+ solaris*|sco*|sysv4*) localdef="yes" ;;
+ *) localdef="no" ;;
+ esac
+ # Check whether --enable-local-transport was given.
+if test "${enable_local_transport+set}" = set; then
+ enableval=$enable_local_transport; LOCALCONN=$enableval
+else
+ LOCALCONN=$localdef
+fi
+
+ { echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5
+echo $ECHO_N "checking if Xtrans should support os-specific local connections... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $LOCALCONN" >&5
+echo "${ECHO_T}$LOCALCONN" >&6; }
+ if test "$LOCALCONN" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define LOCALCONN 1
+_ACEOF
+
+ fi
+
if test "x$GCC" = "xyes"; then
@@ -21430,7 +21457,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 libXfont $as_me 1.2.8, which was
+This file was extended by libXfont $as_me 1.2.9, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21483,7 +21510,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXfont config.status 1.2.8
+libXfont config.status 1.2.9
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index b5079c1..8bd5188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxfont (1:1.2.9-1) unstable; urgency=low
+
+ * New upstream version.
+ - Add a new 'catalogue' FPE (font path element), which takes font
+ paths from symlinks in a dir.
+
+ -- Drew Parsons <dparsons@debian.org> Sat, 23 Jun 2007 09:08:50 +1000
+
libxfont (1:1.2.8-1) unstable; urgency=low
* Add XS-Vcs-Browser to debian/control.
diff --git a/src/Type1/Makefile.in b/src/Type1/Makefile.in
index ad8784b..e11f672 100644
--- a/src/Type1/Makefile.in
+++ b/src/Type1/Makefile.in
@@ -50,7 +50,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libtype1_la_LIBADD =
am_libtype1_la_OBJECTS = arith.lo curves.lo fontfcn.lo hints.lo \
lines.lo objects.lo paths.lo regions.lo scanfont.lo spaces.lo \
- t1funcs.lo t1info.lo t1io.lo t1malloc.lo t1snap.lo t1stub.lo \
+ t1funcs.lo t1info.lo t1io.lo t1malloc.lo t1snap.lo \
t1unicode.lo token.lo type1.lo util.lo
libtype1_la_OBJECTS = $(am_libtype1_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/include/X11/fonts
@@ -245,7 +245,6 @@ libtype1_la_SOURCES = \
t1malloc.c \
t1snap.c \
t1stdio.h \
- t1stub.c \
t1unicode.c \
t1unicode.h \
token.c \
@@ -322,7 +321,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1io.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1malloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1snap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1stub.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1unicode.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/token.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type1.Plo@am__quote@
diff --git a/src/fontfile/Makefile.in b/src/fontfile/Makefile.in
index ec81ab7..a23408a 100644
--- a/src/fontfile/Makefile.in
+++ b/src/fontfile/Makefile.in
@@ -52,7 +52,7 @@ libfontfile_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libfontfile_la_OBJECTS = bitsource.lo bufio.lo decompress.lo \
defaults.lo dirfile.lo ffcheck.lo fileio.lo filewr.lo \
fontdir.lo fontencc.lo fontfile.lo fontscale.lo gunzip.lo \
- printerfont.lo register.lo renderers.lo
+ printerfont.lo register.lo renderers.lo catalogue.lo
libfontfile_la_OBJECTS = $(am_libfontfile_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/include/X11/fonts
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -232,7 +232,8 @@ libfontfile_la_SOURCES = \
gunzip.c \
printerfont.c \
register.c \
- renderers.c
+ renderers.c \
+ catalogue.c
all: all-am
@@ -287,6 +288,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitsource.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bufio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogue.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompress.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defaults.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirfile.Plo@am__quote@
commit 8d47483711be6076e7bfefab14aa890c5f37e1aa
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 21 21:44:02 2007 -0400
Bump version to 1.2.9.
diff --git a/configure.ac b/configure.ac
index fb5cdec..379243a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.2.8,
+ 1.2.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit c5ab59762c4ad5def68436d55937a2bd558d5c99
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Jun 19 10:38:02 2007 -0400
Add a new 'catalogue' FPE, which takes font paths from symlinks in a dir.
This patch adds a new FPE type, which will match font path elements of the
form
catalogue:<dir>
The dir specified after the catalogue: prefix will be scanned for symlinks
and each symlink destination will be added as a local fontfile FPE.
The symlink can be suffixed by attributes, such as 'unscaled', which
will be passed through to the underlying fontfile FPE. Except the new
attribute 'pri' which will be used for ordering the fontfile FPEs.
An example configuration:
75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
type1:pri=40 -> /usr/share/X11/fonts/Type1
type1:pri=50 -> /usr/share/fonts/default/Type1
will add /usr/share/X11/fonts/misc as the first FPE with the attribute
'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
the attribute unscaled etc. This is functionally equivalent to setting
the following font path:
/usr/share/X11/fonts/misc:unscaled,
/usr/share/X11/fonts/75dpi:unscaled,
/usr/share/X11/fonts/Type1,
/usr/share/fonts/default/Type1,
/usr/share/fonts/default/ghostscript
The motivation is to let font packages add a symlink to the new font
directory they provide instead of rewriting either the Xorg config file
or the xfs config file.
diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h
index 81d2cbc..074f2d0 100644
--- a/include/X11/fonts/fntfil.h
+++ b/include/X11/fonts/fntfil.h
@@ -92,6 +92,9 @@ extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe,
char *pat, int len, int max,
FontNamesPtr names );
+extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe,
+ char *pat, int len, int max,
+ pointer *privatep, int mark_aliases );
extern int FontFileStartListFontsWithInfo ( pointer client,
FontPathElementPtr fpe,
char *pat, int len, int max,
@@ -111,6 +114,7 @@ extern int FontFileListNextFontOrAlias ( pointer client,
char **resolvedp, int *resolvedlenp,
pointer private );
extern void FontFileRegisterLocalFpeFunctions ( void );
+extern void CatalogueRegisterLocalFpeFunctions ( void );
extern FontEntryPtr FontFileAddEntry ( FontTablePtr table,
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index a80f437..8c361bd 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -26,4 +26,5 @@ libfontfile_la_SOURCES = \
gunzip.c \
printerfont.c \
register.c \
- renderers.c
+ renderers.c \
+ catalogue.c
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
new file mode 100644
index 0000000..6d364a5
--- /dev/null
+++ b/src/fontfile/catalogue.c
@@ -0,0 +1,457 @@
+/*
+ * Copyright © 2007 Red Hat, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author:
+ * Kristian Høgsberg <krh@redhat.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <X11/fonts/fntfilst.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <unistd.h>
+
+static const char CataloguePrefix[] = "catalogue:";
+
+static int CatalogueFreeFPE (FontPathElementPtr fpe);
+
+static int
+CatalogueNameCheck (char *name)
+{
+ return strncmp(name, CataloguePrefix, sizeof(CataloguePrefix) - 1) == 0;
+}
+
+typedef struct _CatalogueRec {
+ time_t mtime;
+ int fpeCount, fpeAlloc;
+ FontPathElementPtr *fpeList;
+} CatalogueRec, *CataloguePtr;
+
+static int
+CatalogueAddFPE (CataloguePtr cat, FontPathElementPtr fpe)
+{
+ FontPathElementPtr *new;
+
+ if (cat->fpeCount >= cat->fpeAlloc)
+ {
+ if (cat->fpeAlloc == 0)
+ cat->fpeAlloc = 16;
+ else
+ cat->fpeAlloc *= 2;
+
+ new = xrealloc(cat->fpeList,
+ cat->fpeAlloc * sizeof(FontPathElementPtr));
+ if (new == NULL)
+ return AllocError;
+
+ cat->fpeList = new;
+ }
+
+ cat->fpeList[cat->fpeCount++] = fpe;
+
+ return Successful;
+}
+
+static const char PriorityAttribute[] = "pri=";
+
+static int
+ComparePriority(const void *p1, const void *p2)
+{
+ FontDirectoryPtr dir1 = (*(FontPathElementPtr*) p1)->private;
+ FontDirectoryPtr dir2 = (*(FontPathElementPtr*) p2)->private;
+ const char *pri1 = strstr(dir1->attributes, PriorityAttribute);
+ const char *pri2 = strstr(dir2->attributes, PriorityAttribute);
+
+ if (pri1 == NULL && pri2 == NULL)
+ return 0;
Reply to: