X Strike Force Xft SVN commit: r106 - vendor
Author: branden
Date: 2005-03-29 17:37:12 -0500 (Tue, 29 Mar 2005)
New Revision: 106
Modified:
vendor/ChangeLog
vendor/Xft.3
vendor/Xft.h
vendor/configure
vendor/configure.ac
vendor/xftfreetype.c
Log:
Update vendor branch to libXft 2.1.5.
Modified: vendor/ChangeLog
===================================================================
--- vendor/ChangeLog 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/ChangeLog 2005-03-29 22:37:12 UTC (rev 106)
@@ -1,3 +1,11 @@
+2004-03-11 Keith Packard <keithp@keithp.com>
+
+ * Xft.h:
+ * configure.ac:
+ * xftfreetype.c: (_XftSetFace):
+ Oops. Left #warnings from testing in the release.
+ Bump to version 2.1.5 and respin the release...
+
2004-03-10 Keith Packard <keithp@keithp.com>
* Xft.h:
Modified: vendor/Xft.3
===================================================================
--- vendor/Xft.3 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/Xft.3 2005-03-29 22:37:12 UTC (rev 106)
@@ -26,7 +26,7 @@
.ns
.TP \\$1
..
-.TH XFT 3 "Version 2.1.4" "Xft"
+.TH XFT 3 "Version 2.1.5" "Xft"
.SH NAME
Xft \- X FreeType interface library
Modified: vendor/Xft.h
===================================================================
--- vendor/Xft.h 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/Xft.h 2005-03-29 22:37:12 UTC (rev 106)
@@ -33,7 +33,7 @@
#define XFT_MAJOR 2
#define XFT_MINOR 1
-#define XFT_REVISION 4
+#define XFT_REVISION 5
#define XFT_VERSION ((XFT_MAJOR * 10000) + (XFT_MINOR * 100) + (XFT_REVISION))
#define XftVersion XFT_VERSION
Modified: vendor/configure
===================================================================
--- vendor/configure 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/configure 2005-03-29 22:37:12 UTC (rev 106)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXft 2.1.4.
+# Generated by GNU Autoconf 2.59 for libXft 2.1.5.
#
# Report bugs to <keithp@keithp.com>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libXft'
PACKAGE_TARNAME='libXft'
-PACKAGE_VERSION='2.1.4'
-PACKAGE_STRING='libXft 2.1.4'
+PACKAGE_VERSION='2.1.5'
+PACKAGE_STRING='libXft 2.1.5'
PACKAGE_BUGREPORT='keithp@keithp.com'
# Factoring default headers for most tests.
@@ -953,7 +953,7 @@
# 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 libXft 2.1.4 to adapt to many kinds of systems.
+\`configure' configures libXft 2.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1023,7 +1023,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXft 2.1.4:";;
+ short | recursive ) echo "Configuration of libXft 2.1.5:";;
esac
cat <<\_ACEOF
@@ -1165,7 +1165,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libXft configure 2.1.4
+libXft configure 2.1.5
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1179,7 +1179,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXft $as_me 2.1.4, which was
+It was created by libXft $as_me 2.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1791,7 +1791,7 @@
# Define the identity of the package.
PACKAGE='libXft'
- VERSION='2.1.4'
+ VERSION='2.1.5'
cat >>confdefs.h <<_ACEOF
@@ -20487,7 +20487,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libXft $as_me 2.1.4, which was
+This file was extended by libXft $as_me 2.1.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20550,7 +20550,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXft config.status 2.1.4
+libXft config.status 2.1.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: vendor/configure.ac
===================================================================
--- vendor/configure.ac 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/configure.ac 2005-03-29 22:37:12 UTC (rev 106)
@@ -31,7 +31,7 @@
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xft.h
dnl
-AC_INIT(libXft, 2.1.4, [keithp@keithp.com], libXft)
+AC_INIT(libXft, 2.1.5, [keithp@keithp.com], libXft)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
Modified: vendor/xftfreetype.c
===================================================================
--- vendor/xftfreetype.c 2005-03-29 22:32:16 UTC (rev 105)
+++ vendor/xftfreetype.c 2005-03-29 22:37:12 UTC (rev 106)
@@ -208,9 +208,6 @@
#if !HAVE_FT_BITMAP_SIZE_Y_PPEM
#define y_ppem height
#define x_ppem width
-#warning using old freetype without y_ppem
-#else
-#warning using new freetype with y_ppem
#endif
for (i = 0; i < face->num_fixed_sizes; i++)
{
Reply to: