Merge remote-tracking branch 'origin/released'

Conflicts:
	libXfont/src/fontfile/fontfile.c
	libXfont/src/util/utilbitmap.c

1 files changed, 46 insertions, 28 deletions

diff --git a/libXfont/configure b/libXfont/configure
index 765aaf3db..2cea137c5 100644..100755
--- a/libXfont/configure
+++ b/libXfont/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libXfont 1.4.8.
+# Generated by GNU Autoconf 2.68 for libXfont 1.5.0.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -631,8 +631,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXfont'
 PACKAGE_TARNAME='libXfont'
-PACKAGE_VERSION='1.4.8'
-PACKAGE_STRING='libXfont 1.4.8'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='libXfont 1.5.0'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -691,6 +691,8 @@ XFONT_SNFFORMAT_FALSE
 XFONT_SNFFORMAT_TRUE
 XFONT_BDFFORMAT_FALSE
 XFONT_BDFFORMAT_TRUE
+XFONT_PCF_OR_BUILTIN_FALSE
+XFONT_PCF_OR_BUILTIN_TRUE
 XFONT_PCFFORMAT_FALSE
 XFONT_PCFFORMAT_TRUE
 XFONT_BUILTINS_FALSE
@@ -1440,7 +1442,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.4.8 to adapt to many kinds of systems.
+\`configure' configures libXfont 1.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1510,7 +1512,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXfont 1.4.8:";;
+     short | recursive ) echo "Configuration of libXfont 1.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,12 +1539,13 @@ Optional Features:
                           errors (default: disabled)
   --enable-devel-docs     Enable building the developer documentation
                           (default: yes)
- --disable-freetype
- --disable-builtins
- --disable-pcfformat
- --disable-bdfformat
- --disable-snfformat
- --disable-fc
+  --disable-freetype      Build freetype backend (default: enabled)
+  --disable-builtins      Support builtin fonts (default: enabled)
+  --disable-pcfformat     Support PCF format bitmap fonts (default: enabled)
+  --disable-bdfformat     Support BDF format bitmap fonts (default: enabled)
+  --enable-snfformat      Support SNF format bitmap fonts (default: disabled)
+  --disable-fc            Support connections to xfs servers (default:
+                          enabled)
   --enable-unix-transport Enable UNIX domain socket transport
   --enable-tcp-transport  Enable TCP socket transport
   --enable-ipv6           Enable IPv6 support
@@ -1560,8 +1563,10 @@ Optional Packages:
   --with-xmlto            Use xmlto to regenerate documentation (default:
                           auto)
   --with-fop              Use fop to regenerate documentation (default: auto)
-  --with-freetype-config=PROG   Use FreeType configuration program PROG
-  --with-bzip2            Support bzip2 compressed bitmap fonts
+  --with-freetype-config=PROG
+                          Use FreeType configuration program PROG
+  --with-bzip2            Use libbz2 to support bzip2 compressed bitmap fonts
+                          (default: no)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1649,7 +1654,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXfont configure 1.4.8
+libXfont configure 1.5.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2175,7 +2180,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.4.8, which was
+It was created by libXfont $as_me 1.5.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3043,7 +3048,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXfont'
- VERSION='1.4.8'
+ VERSION='1.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18986,6 +18991,15 @@ $as_echo "#define XFONT_PCFFORMAT 1" >>confdefs.h
 	XFONT_BITMAP=yes
 fi
 
+ if test "x$XFONT_PCFFORMAT" = xyes -o "x$XFONT_BUILTINS" = xyes; then
+  XFONT_PCF_OR_BUILTIN_TRUE=
+  XFONT_PCF_OR_BUILTIN_FALSE='#'
+else
+  XFONT_PCF_OR_BUILTIN_TRUE='#'
+  XFONT_PCF_OR_BUILTIN_FALSE=
+fi
+
+
 # Check whether --enable-bdfformat was given.
 if test "${enable_bdfformat+set}" = set; then :
   enableval=$enable_bdfformat; XFONT_BDFFORMAT=$enableval
@@ -19012,7 +19026,7 @@ fi
 if test "${enable_snfformat+set}" = set; then :
   enableval=$enable_snfformat; XFONT_SNFFORMAT=$enableval
 else
-  XFONT_SNFFORMAT=yes
+  XFONT_SNFFORMAT=no
 fi
 
  if test "x$XFONT_SNFFORMAT" = xyes; then
@@ -19138,12 +19152,12 @@ if test -n "$XFONT_CFLAGS"; then
     pkg_cv_XFONT_CFLAGS="$XFONT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto < 2.1.3 fontenc\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto < 2.1.3 fontenc") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto >= 2.1.3 fontenc\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto >= 2.1.3 fontenc") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XFONT_CFLAGS=`$PKG_CONFIG --cflags "xproto xtrans fontsproto < 2.1.3 fontenc" 2>/dev/null`
+  pkg_cv_XFONT_CFLAGS=`$PKG_CONFIG --cflags "xproto xtrans fontsproto >= 2.1.3 fontenc" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -19154,12 +19168,12 @@ if test -n "$XFONT_LIBS"; then
     pkg_cv_XFONT_LIBS="$XFONT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto < 2.1.3 fontenc\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto < 2.1.3 fontenc") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto xtrans fontsproto >= 2.1.3 fontenc\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xproto xtrans fontsproto >= 2.1.3 fontenc") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XFONT_LIBS=`$PKG_CONFIG --libs "xproto xtrans fontsproto < 2.1.3 fontenc" 2>/dev/null`
+  pkg_cv_XFONT_LIBS=`$PKG_CONFIG --libs "xproto xtrans fontsproto >= 2.1.3 fontenc" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -19177,14 +19191,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto xtrans fontsproto < 2.1.3 fontenc" 2>&1`
+	        XFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto xtrans fontsproto >= 2.1.3 fontenc" 2>&1`
         else
-	        XFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto xtrans fontsproto < 2.1.3 fontenc" 2>&1`
+	        XFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto xtrans fontsproto >= 2.1.3 fontenc" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XFONT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (xproto xtrans fontsproto < 2.1.3 fontenc) were not met:
+	as_fn_error $? "Package requirements (xproto xtrans fontsproto >= 2.1.3 fontenc) were not met:
 
 $XFONT_PKG_ERRORS
 
@@ -19723,6 +19737,10 @@ if test -z "${XFONT_PCFFORMAT_TRUE}" && test -z "${XFONT_PCFFORMAT_FALSE}"; then
   as_fn_error $? "conditional \"XFONT_PCFFORMAT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${XFONT_PCF_OR_BUILTIN_TRUE}" && test -z "${XFONT_PCF_OR_BUILTIN_FALSE}"; then
+  as_fn_error $? "conditional \"XFONT_PCF_OR_BUILTIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${XFONT_BDFFORMAT_TRUE}" && test -z "${XFONT_BDFFORMAT_FALSE}"; then
   as_fn_error $? "conditional \"XFONT_BDFFORMAT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20152,7 +20170,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.8, which was
+This file was extended by libXfont $as_me 1.5.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20218,7 +20236,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXfont config.status 1.4.8
+libXfont config.status 1.5.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"