Merge libXfont 1.3.0. Tested by naddy@ and mbalmer@.

5 files changed, 17 insertions, 73 deletions

diff --git a/lib/libXfont/Makefile.bsd-wrapper b/lib/libXfont/Makefile.bsd-wrapper
index bfd16823a..0818050b7 100644
--- a/lib/libXfont/Makefile.bsd-wrapper
+++ b/lib/libXfont/Makefile.bsd-wrapper
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2007/05/08 09:00:45 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2007/09/08 16:24:20 matthieu Exp $
 
-SHARED_LIBS=	Xfont 6.0
+SHARED_LIBS=	Xfont 7.0
 
 .if ${MACHINE} == landisk || ${MACHINE} == vax
 CONFIGURE_ARGS+= --disable-loadable-font-modules
diff --git a/lib/libXfont/configure b/lib/libXfont/configure
index 285a3d7b6..b65dc89a1 100644
--- a/lib/libXfont/configure
+++ b/lib/libXfont/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXfont 1.2.8.
+# Generated by GNU Autoconf 2.59 for libXfont 1.3.0.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,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.3.0'
+PACKAGE_STRING='libXfont 1.3.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -981,7 +981,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.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1047,7 +1047,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.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1220,7 +1220,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libXfont configure 1.2.8
+libXfont configure 1.3.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1234,7 +1234,7 @@ cat >&5 <<_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.3.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1877,7 +1877,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXfont'
- VERSION='1.2.8'
+ VERSION='1.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20955,7 +20955,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXfont $as_me 1.2.8, which was
+This file was extended by libXfont $as_me 1.3.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21018,7 +21018,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXfont config.status 1.2.8
+libXfont config.status 1.3.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libXfont/src/Type1/Makefile.in b/lib/libXfont/src/Type1/Makefile.in
index 9d2b3f193..36992f99b 100644
--- a/lib/libXfont/src/Type1/Makefile.in
+++ b/lib/libXfont/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
@@ -241,7 +241,6 @@ libtype1_la_SOURCES = \
 		t1malloc.c		\
 		t1snap.c		\
 		t1stdio.h		\
-		t1stub.c		\
 		t1unicode.c		\
 		t1unicode.h		\
 		token.c			\
@@ -318,7 +317,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/lib/libXfont/src/Type1/t1stub.c b/lib/libXfont/src/Type1/t1stub.c
deleted file mode 100644
index 2fb1d797f..000000000
--- a/lib/libXfont/src/Type1/t1stub.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $Xorg: t1stub.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */
-/* Copyright International Business Machines,Corp. 1991
- * All Rights Reserved
- *
- * License to use, copy, modify, and distribute this software
- * and its documentation for any purpose and without fee is
- * hereby granted, provided that the above copyright notice
- * appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation,
- * and that the name of IBM not be used in advertising or
- * publicity pertaining to distribution of the software without
- * specific, written prior permission.
- *
- * IBM PROVIDES THIS SOFTWARE "AS IS", WITHOUT ANY WARRANTIES
- * OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT
- * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS.  THE ENTIRE RISK AS TO THE QUALITY AND
- * PERFORMANCE OF THE SOFTWARE, INCLUDING ANY DUTY TO SUPPORT
- * OR MAINTAIN, BELONGS TO THE LICENSEE.  SHOULD ANY PORTION OF
- * THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM) ASSUMES
- * THE ENTIRE COST OF ALL SERVICING, REPAIR AND CORRECTION.  IN
- * NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.8 2001/01/17 19:43:24 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#ifdef FONTMODULE
-#include "Xdefs.h"	/* Bool declaration */
-#include "Xmd.h"	/* INT32 declaration */
-#include "os.h"
-#include "xf86_ansic.h"
-#else 
-#include <stdio.h>
-#endif
-#include "objects.h"	/* get #define for Abort() */
-
-static void 
-xiStub(void)
-{
-       printf("xiStub called\n");
-       Abort("xiStub called");
-}
- 
-void 
-t1_DumpText(void)
-{
-       xiStub();
-}
diff --git a/lib/libXfont/src/fontfile/Makefile.in b/lib/libXfont/src/fontfile/Makefile.in
index af407be4c..2e7390bee 100644
--- a/lib/libXfont/src/fontfile/Makefile.in
+++ b/lib/libXfont/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
@@ -228,7 +228,8 @@ libfontfile_la_SOURCES = \
 	gunzip.c		\
 	printerfont.c		\
 	register.c		\
-	renderers.c
+	renderers.c		\
+	catalogue.c
 
 all: all-am
 
@@ -283,6 +284,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@