Update to libXft 2.3.1

4 files changed, 42 insertions, 21 deletions

diff --git a/lib/libXft/ChangeLog b/lib/libXft/ChangeLog
index 78bae402a..150f3a80c 100644
--- a/lib/libXft/ChangeLog
+++ b/lib/libXft/ChangeLog
@@ -1,3 +1,34 @@
+commit 0847b64af14acefaa7aa86b3cec8632497babe73
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Jun 2 09:36:29 2012 -0700
+
+    libXft 2.3.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1066d2b34db6124fbb0105f5d30f560217fd2a5a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Sat Mar 10 23:09:21 2012 -0800
+
+    Dead code removal
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 84b8b5b46773f9b686d57f28092824b86bffed9d
+Author: Mikael Magnusson <mikachu@gmail.com>
+Date:   Sun Mar 11 02:41:55 2012 +0100
+
+    Fixup for 550b2f76401c2 which broke bold fonts
+    
+    The commit removed the line
+    AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
+    but failed to remove the #if lines that this commit removes, resulting
+    in that code never being executed.
+    
+    Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
+    
+    Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
 commit b543efafefb71fb1f87ee9c1c261e86c8ca29e76
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Mar 7 20:12:27 2012 -0800
diff --git a/lib/libXft/configure b/lib/libXft/configure
index 90fc92d3f..2d7e1f937 100644
--- a/lib/libXft/configure
+++ b/lib/libXft/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libXft 2.3.0.
+# Generated by GNU Autoconf 2.62 for libXft 2.3.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -616,8 +616,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXft'
 PACKAGE_TARNAME='libXft'
-PACKAGE_VERSION='2.3.0'
-PACKAGE_STRING='libXft 2.3.0'
+PACKAGE_VERSION='2.3.1'
+PACKAGE_STRING='libXft 2.3.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -1377,7 +1377,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 libXft 2.3.0 to adapt to many kinds of systems.
+\`configure' configures libXft 2.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1447,7 +1447,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXft 2.3.0:";;
+     short | recursive ) echo "Configuration of libXft 2.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1569,7 +1569,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXft configure 2.3.0
+libXft configure 2.3.1
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1583,7 +1583,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 libXft $as_me 2.3.0, which was
+It was created by libXft $as_me 2.3.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2237,7 +2237,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXft'
- VERSION='2.3.0'
+ VERSION='2.3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22962,7 +22962,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 libXft $as_me 2.3.0, which was
+This file was extended by libXft $as_me 2.3.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23015,7 +23015,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libXft config.status 2.3.0
+libXft config.status 2.3.1
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libXft/configure.ac b/lib/libXft/configure.ac
index b54311ec7..dd415ef5e 100644
--- a/lib/libXft/configure.ac
+++ b/lib/libXft/configure.ac
@@ -27,7 +27,7 @@ AC_PREREQ([2.60])
 # version.  This version number will be substituted into Xft.h
 # Please bump the minor library number at each release as well.
 #
-AC_INIT([libXft], [2.3.0],
+AC_INIT([libXft], [2.3.1],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXft])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/lib/libXft/src/xftint.h b/lib/libXft/src/xftint.h
index 5cb57aeab..165897767 100644
--- a/lib/libXft/src/xftint.h
+++ b/lib/libXft/src/xftint.h
@@ -68,16 +68,6 @@
 # define _X_EXPORT /**/
 #endif
 
-#ifndef HAVE_CONFIG_H
-# if (FREETYPE_MAJOR > 2 ||						    \
-      (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 ||			    \
-			       (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 5))))
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-# else
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 0
-# endif
-#endif
-
 typedef struct _XftMatcher {
     char    *object;
     double  (*compare) (char *object, FcValue value1, FcValue value2);