Update to libXpm 3.5.14. This adds manual pages and fixes typos in comments.

64 files changed, 1247 insertions, 79 deletions

diff --git a/lib/libXpm/AUTHORS b/lib/libXpm/AUTHORS
index 1f3e4372e..ddc6600cf 100644
--- a/lib/libXpm/AUTHORS
+++ b/lib/libXpm/AUTHORS
@@ -1,3 +1,3 @@
-Xpm was originally written by Groupe Bull, but maintainence has since passed
+Xpm was originally written by Groupe Bull, but maintenance has since passed
 through the hands of XFree86, and to freedesktop.org; Daniel Stone is the
 current maintainer.
diff --git a/lib/libXpm/ChangeLog b/lib/libXpm/ChangeLog
index c4bd58890..9562fa7d6 100644
--- a/lib/libXpm/ChangeLog
+++ b/lib/libXpm/ChangeLog
@@ -1,3 +1,129 @@
+commit 08bc174f28af028b6ebaa9edeccd3ff56c396e92
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Nov 19 12:23:53 2022 -0800
+
+    libXpm 3.5.14
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f0857c0de206e90777a5321cce9602083b283080
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Aug 27 10:06:23 2022 -0700
+
+    man pages: Correct Copyright/License notices
+    
+    Since the text was copied from doc/xpm.PS.gz, the copyright and license
+    notices need to be copied from there as well.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit deb81a9a210527b0a00f002b1796e5e21e492879
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Aug 26 18:39:17 2022 -0700
+
+    man pages: Fix typos
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2d5fa4c2079494f502f9a576d749fa1e205f2144
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Aug 26 18:29:05 2022 -0700
+
+    man pages: Add missing word 'function' where needed
+    
+    A number of instances of 'The Xpm... function' were missing the word
+    "function", so read awkwardly.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2b7357e83e38e2a860687ee4150ef60bd6c0a47f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Aug 26 18:16:42 2022 -0700
+
+    man pages: Make function synopses more consistent with other pages
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fb8590c9c57d661ec4a29da243e05b9d87b999d3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Aug 26 18:06:51 2022 -0700
+
+    man pages: Fix shadow man pages
+    
+    Shadow man pages have a .so line that needs to list the file to be
+    shown, not the name of the shadow page.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bfaebfdcc92433a8b78c004de4bb3c5a8a545e75
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Aug 26 17:49:25 2022 -0700
+
+    man pages: Make file names consistent with their displayed names
+    
+    Lets users view the pages using the name displayed on the pages
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7a138a5278890e122731eb94b8e5a7d6ef543243
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 16:29:35 2022 -0700
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3433f4334db7c30864c112639a929c5ae8bd3c3b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 16:27:01 2022 -0700
+
+    man: strip trailing whitespace
+    
+    git diff -w shows no changes from this commit
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 961245427855ab6d30a5fa2dbb98aaffa571d728
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 16:25:38 2022 -0700
+
+    Fix spelling/wording issues
+    
+    Found by using:
+        codespell --builtin clear,rare,usage,informal,code,names
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fa16fbda9c90f932a74cd80c90eee88432d987d7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 16:23:04 2022 -0700
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 83e5427f9cd5d32602bcf647547e0030ea361f00
+Author: Walter Harms <wharms@bfs.de>
+Date:   Wed Dec 25 20:40:04 2019 +0100
+
+    update man pages
+    
+    move from k&r to ansi prototypes
+    improve nroff coding
+    
+    Signed-off-by: Walter Harms <wharms@bfs.de>
+
+commit e48e649eb04f95ffbdbd0c8bb77d7131142f5e9a
+Author: Walter Harms <wharms@bfs.de>
+Date:   Tue Dec 24 17:20:09 2019 +0100
+
+    add man pages based on doc/xpm.PS
+    
+    More or less hand crafted man pages based on xpm.PS.
+    Prototypes are still in K&R, see also is a dud
+    
+    Signed-off-by: Walter Harms <wharms@bfs.de>
+
 commit b0fc485495a694816d76a43978e2cfd5575c554d
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Fri Dec 13 14:25:06 2019 +1000
@@ -205,7 +331,7 @@ Date:   Tue Dec 6 22:31:53 2016 +0100
     Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
 
 commit 42ca8d956276bc00bec09e410d76daf053ae35f9
-Author: Jörg Sonnenberger <joerg@NetBSD.org>
+Author: Jörg Sonnenberger  <joerg@NetBSD.org>
 Date:   Wed Mar 19 09:26:37 2014 +0100
 
     Fix abs() usage.
@@ -1109,13 +1235,13 @@ Date:   Thu Jun 9 13:42:36 2005 +0000
     Use $(top_srcdir)/src instead of $(top_builddir)/src in INCLUDES
 
 commit 769751fba3e32f49272d19799929e1ad5a3d2cd0
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Thu May 19 17:09:13 2005 +0000
 
     Add $(top_builddir)/include to INCLUDES
 
 commit 2cc1896c61eef5739bb6a8ffa89e58ba5c175a05
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Thu May 19 15:02:48 2005 +0000
 
     - Add build system for lib/Xpm
@@ -1123,7 +1249,7 @@ Date:   Thu May 19 15:02:48 2005 +0000
     - Conditionally include config.h in xc/extras/Xpm
 
 commit cf0d69c7ace679f27f105c582760b9be14923aba
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Thu May 19 14:37:53 2005 +0000
 
     Thu May 19 10:36:54 2005 Søren Sandmann <sandmann@redhat.com>
@@ -1187,6 +1313,9 @@ Date:   Tue Sep 21 17:57:35 2004 +0000
     Removed inclusion of unnecessary kernel header on Linux. This may fail in
         an -ansi environment.
 
+Notes:
+    Fixes CVE-2004-0687 (integer overflows) and CVE-2004-0688 (stack overflows)
+
 commit 2773a7214e282f6f673483f5233b880505947c3f
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 18:42:32 2004 +0000
diff --git a/lib/libXpm/Makefile.in b/lib/libXpm/Makefile.in
index e13f82b13..86f03117d 100644
--- a/lib/libXpm/Makefile.in
+++ b/lib/libXpm/Makefile.in
@@ -171,9 +171,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -312,6 +312,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -618,6 +619,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -625,7 +627,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
diff --git a/lib/libXpm/NEWS.old b/lib/libXpm/NEWS.old
index ccec85f04..e94448ea0 100644
--- a/lib/libXpm/NEWS.old
+++ b/lib/libXpm/NEWS.old
@@ -443,7 +443,7 @@
 		 -cp <color> <pixel> to override a color value with a given
 		 pixel, i.e. sxpm plaid.xpm -cp red 4
 
-	  also the '-s' adn '-p' options have been renamed to '-sc' and '-sp'.
+	  also the '-s' and '-p' options have been renamed to '-sc' and '-sp'.
 
 	- xpm.h defines XpmFormat, XpmVersion, and XpmRevision numbers.
 
diff --git a/lib/libXpm/README.md b/lib/libXpm/README.md
index f661e15f7..adc83c8d6 100644
--- a/lib/libXpm/README.md
+++ b/lib/libXpm/README.md
@@ -6,7 +6,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/lib/libXpm
 
diff --git a/lib/libXpm/aclocal.m4 b/lib/libXpm/aclocal.m4
index 59f6dd6e7..40096e82e 100644
--- a/lib/libXpm/aclocal.m4
+++ b/lib/libXpm/aclocal.m4
@@ -19,9 +19,9 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -62,7 +62,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -194,7 +194,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
diff --git a/lib/libXpm/compile b/lib/libXpm/compile
index 99e50524b..df363c8fb 100644
--- a/lib/libXpm/compile
+++ b/lib/libXpm/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
diff --git a/lib/libXpm/configure b/lib/libXpm/configure
index c0963b3d0..facc84e4a 100644
--- a/lib/libXpm/configure
+++ b/lib/libXpm/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libXpm 3.5.13.
+# Generated by GNU Autoconf 2.69 for libXpm 3.5.14.
 #
-# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXpm/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://gitlab.freedesktop.org/xorg/lib/libXpm/issues
+$0: https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -591,9 +591,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXpm'
 PACKAGE_TARNAME='libXpm'
-PACKAGE_VERSION='3.5.13'
-PACKAGE_STRING='libXpm 3.5.13'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libXpm/issues'
+PACKAGE_VERSION='3.5.14'
+PACKAGE_STRING='libXpm 3.5.14'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
@@ -764,6 +764,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -855,6 +856,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1107,6 +1109,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1244,7 +1255,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1357,7 +1368,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 libXpm 3.5.13 to adapt to many kinds of systems.
+\`configure' configures libXpm 3.5.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,6 +1408,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1427,7 +1439,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXpm 3.5.13:";;
+     short | recursive ) echo "Configuration of libXpm 3.5.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1491,7 +1503,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXpm/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -1554,7 +1566,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXpm configure 3.5.13
+libXpm configure 3.5.14
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1878,7 +1890,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 libXpm $as_me 3.5.13, which was
+It was created by libXpm $as_me 3.5.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2708,7 +2720,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXpm'
- VERSION='3.5.13'
+ VERSION='3.5.14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17600,8 +17612,8 @@ fi
 # Obtain compiler/linker options for dependencies
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPM" >&5
-$as_echo_n "checking for XPM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xproto x11" >&5
+$as_echo_n "checking for xproto x11... " >&6; }
 
 if test -n "$XPM_CFLAGS"; then
     pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
@@ -17641,7 +17653,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17668,7 +17680,7 @@ Alternatively, you may set the environment variables XPM_CFLAGS
 and XPM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -17691,8 +17703,8 @@ $as_echo "yes" >&6; }
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SXPM" >&5
-$as_echo_n "checking for SXPM... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 xt xext xextproto xproto >= 7.0.17" >&5
+$as_echo_n "checking for x11 xt xext xextproto xproto >= 7.0.17... " >&6; }
 
 if test -n "$SXPM_CFLAGS"; then
     pkg_cv_SXPM_CFLAGS="$SXPM_CFLAGS"
@@ -17732,7 +17744,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17750,7 +17762,7 @@ fi
 
 	build_sxpm=false
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	build_sxpm=false
 else
@@ -18448,7 +18460,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 libXpm $as_me 3.5.13, which was
+This file was extended by libXpm $as_me 3.5.14, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18508,13 +18520,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libXpm/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXpm config.status 3.5.13
+libXpm config.status 3.5.14
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/libXpm/configure.ac b/lib/libXpm/configure.ac
index 365544be5..789a96e70 100644
--- a/lib/libXpm/configure.ac
+++ b/lib/libXpm/configure.ac
@@ -1,14 +1,14 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libXpm], [3.5.13],
-        [https://gitlab.freedesktop.org/xorg/lib/libXpm/issues], [libXpm])
+AC_INIT([libXpm], [3.5.14],
+        [https://gitlab.freedesktop.org/xorg/lib/libxpm/-/issues], [libXpm])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Initialize libtool
 AC_PROG_LIBTOOL
diff --git a/lib/libXpm/cxpm/Makefile.in b/lib/libXpm/cxpm/Makefile.in
index 5cbe835aa..7d9a0de96 100644
--- a/lib/libXpm/cxpm/Makefile.in
+++ b/lib/libXpm/cxpm/Makefile.in
@@ -254,6 +254,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/lib/libXpm/doc/Makefile.in b/lib/libXpm/doc/Makefile.in
index 0328311a8..363fdb175 100644
--- a/lib/libXpm/doc/Makefile.in
+++ b/lib/libXpm/doc/Makefile.in
@@ -216,6 +216,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/lib/libXpm/doc/README.MSW b/lib/libXpm/doc/README.MSW
index 6746bc8a3..d7cfaf644 100644
--- a/lib/libXpm/doc/README.MSW
+++ b/lib/libXpm/doc/README.MSW
@@ -81,7 +81,7 @@ Oct 24, 1996:
 	* Please try not to disturb me on this, XPM is not my
 	piece of cake.
 
-	* Hermann Dunkel has appearently moved in virtual space.
+	* Hermann Dunkel has apparently moved in virtual space.
 
 Changes:
 
diff --git a/lib/libXpm/doc/README.html b/lib/libXpm/doc/README.html
index c3175c13b..401b51a05 100644
--- a/lib/libXpm/doc/README.html
+++ b/lib/libXpm/doc/README.html
@@ -242,7 +242,7 @@ Error found line 3 near character 5
 </pre>
 <p>
 It is pretty limited but at least, unlike sxpm, it gives you some hint on where
-the error occured within the file.
+the error occurred within the file.
 
 
 <h2><a name="sec7">7. Other Tools</a></h2>
diff --git a/lib/libXpm/include/Makefile.in b/lib/libXpm/include/Makefile.in
index 8013c2d80..77c67dd54 100644
--- a/lib/libXpm/include/Makefile.in
+++ b/lib/libXpm/include/Makefile.in
@@ -249,6 +249,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/lib/libXpm/man/Makefile.am b/lib/libXpm/man/Makefile.am
index 5734e51dc..48fe0507a 100644
--- a/lib/libXpm/man/Makefile.am
+++ b/lib/libXpm/man/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2022, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -22,13 +22,82 @@
 #
 
 appmandir = $(APP_MAN_DIR)
+libmandir = $(LIB_MAN_DIR)
+libman_PRE=$(all_shadows:=.man) \
+	XpmCreateBuffer.man	\
+	XpmCreateData.man	\
+	XpmCreateImage.man	\
+	XpmCreatePixmap.man	\
+	XpmCreateXpmImage.man	\
+	XpmMisc.man		\
+	XpmRead.man		\
+	XpmWrite.man
+
+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
+
 appman_PRE = sxpm.man cxpm.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
 
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
+EXTRA_DIST = $(appman_PRE) $(libman_PRE)
+CLEANFILES = $(appman_DATA) $(libman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .$(LIB_MAN_SUFFIX) .man
+
+all_shadows = \
+         $(xpmcreatebuffer_shadows)  \
+         $(xpmcreatedata_shadows)  \
+         $(xpmcreateimage_shadows)  \
+         $(xpmcreatepixmap_shadows)  \
+         $(xpmcreatexpmimage_shadows)  \
+         $(xpmmisc_shadows)  \
+         $(xpmread_shadows)  \
+         $(xpmwrite_shadows)
+
+xpmcreatebuffer_shadows = \
+	XpmCreateBufferFromImage  \
+	XpmCreateBufferFromPixmap  \
+	XpmCreateBufferFromXpmImage
+xpmcreatedata_shadows = \
+	XpmCreateDataFromImage  \
+	XpmCreateDataFromPixmap  \
+	XpmCreateDataFromXpmImage
+xpmcreateimage_shadows = \
+	XpmCreateImageFromBuffer  \
+	XpmCreateImageFromData  \
+	XpmCreateImageFromXpmImage
+xpmcreatepixmap_shadows = \
+	XpmCreatePixmapFromBuffer  \
+	XpmCreatePixmapFromData  \
+	XpmCreatePixmapFromXpmImage
+xpmcreatexpmimage_shadows = \
+	XpmCreateXpmImageFromBuffer  \
+	XpmCreateXpmImageFromData  \
+	XpmCreateXpmImageFromImage  \
+	XpmCreateXpmImageFromPixmap
+xpmmisc_shadows = \
+	XpmLibraryVersion  \
+	XpmGetErrorString  \
+	XpmFree  \
+	XpmFreeExtensions  \
+	XpmAttributesSize  \
+	XpmFreeAttributes  \
+	XpmFreeXpmImage  \
+	XpmFreeXpmInfo
+xpmread_shadows = \
+	XpmReadFileToImage  \
+	XpmReadFileToPixmap  \
+	XpmReadFileToBuffer  \
+	XpmReadFileToData  \
+	XpmReadFileToXpmImage
+
+xpmwrite_shadows = \
+	XpmWriteFileFromPixmap  \
+	XpmWriteFileFromImage  \
+	XpmWriteFileFromXpmImage  \
+	XpmWriteFileFromBuffer
 
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.man.$(LIB_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/lib/libXpm/man/Makefile.in b/lib/libXpm/man/Makefile.in
index 238ec1c1d..b04c4d90f 100644
--- a/lib/libXpm/man/Makefile.in
+++ b/lib/libXpm/man/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2022, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -132,8 +132,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(appmandir)"
-DATA = $(appman_DATA)
+am__installdirs = "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(libmandir)"
+DATA = $(appman_DATA) $(libman_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
@@ -269,6 +269,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -278,15 +279,86 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 appmandir = $(APP_MAN_DIR)
+libmandir = $(LIB_MAN_DIR)
+libman_PRE = $(all_shadows:=.man) \
+	XpmCreateBuffer.man	\
+	XpmCreateData.man	\
+	XpmCreateImage.man	\
+	XpmCreatePixmap.man	\
+	XpmCreateXpmImage.man	\
+	XpmMisc.man		\
+	XpmRead.man		\
+	XpmWrite.man
+
+libman_DATA = $(libman_PRE:man=$(LIB_MAN_SUFFIX))
 appman_PRE = sxpm.man cxpm.man
 appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
+EXTRA_DIST = $(appman_PRE) $(libman_PRE)
+CLEANFILES = $(appman_DATA) $(libman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .$(LIB_MAN_SUFFIX) .man
+all_shadows = \
+         $(xpmcreatebuffer_shadows)  \
+         $(xpmcreatedata_shadows)  \
+         $(xpmcreateimage_shadows)  \
+         $(xpmcreatepixmap_shadows)  \
+         $(xpmcreatexpmimage_shadows)  \
+         $(xpmmisc_shadows)  \
+         $(xpmread_shadows)  \
+         $(xpmwrite_shadows)
+
+xpmcreatebuffer_shadows = \
+	XpmCreateBufferFromImage  \
+	XpmCreateBufferFromPixmap  \
+	XpmCreateBufferFromXpmImage
+
+xpmcreatedata_shadows = \
+	XpmCreateDataFromImage  \
+	XpmCreateDataFromPixmap  \
+	XpmCreateDataFromXpmImage
+
+xpmcreateimage_shadows = \
+	XpmCreateImageFromBuffer  \
+	XpmCreateImageFromData  \
+	XpmCreateImageFromXpmImage
+
+xpmcreatepixmap_shadows = \
+	XpmCreatePixmapFromBuffer  \
+	XpmCreatePixmapFromData  \
+	XpmCreatePixmapFromXpmImage
+
+xpmcreatexpmimage_shadows = \
+	XpmCreateXpmImageFromBuffer  \
+	XpmCreateXpmImageFromData  \
+	XpmCreateXpmImageFromImage  \
+	XpmCreateXpmImageFromPixmap
+
+xpmmisc_shadows = \
+	XpmLibraryVersion  \
+	XpmGetErrorString  \
+	XpmFree  \
+	XpmFreeExtensions  \
+	XpmAttributesSize  \
+	XpmFreeAttributes  \
+	XpmFreeXpmImage  \
+	XpmFreeXpmInfo
+
+xpmread_shadows = \
+	XpmReadFileToImage  \
+	XpmReadFileToPixmap  \
+	XpmReadFileToBuffer  \
+	XpmReadFileToData  \
+	XpmReadFileToXpmImage
+
+xpmwrite_shadows = \
+	XpmWriteFileFromPixmap  \
+	XpmWriteFileFromImage  \
+	XpmWriteFileFromXpmImage  \
+	XpmWriteFileFromBuffer
+
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man
+.SUFFIXES: .$(APP_MAN_SUFFIX) .$(LIB_MAN_SUFFIX) .man
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -344,6 +416,27 @@ uninstall-appmanDATA:
 	@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(appmandir)'; $(am__uninstall_files_from_dir)
+install-libmanDATA: $(libman_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(libman_DATA)'; test -n "$(libmandir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libmandir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libmandir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libmandir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(libmandir)" || exit $$?; \
+	done
+
+uninstall-libmanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libman_DATA)'; test -n "$(libmandir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libmandir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -387,7 +480,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(appmandir)"; do \
+	for dir in "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(libmandir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -441,7 +534,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-appmanDATA
+install-data-am: install-appmanDATA install-libmanDATA
 
 install-dvi: install-dvi-am
 
@@ -485,7 +578,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-appmanDATA
+uninstall-am: uninstall-appmanDATA uninstall-libmanDATA
 
 .MAKE: install-am install-strip
 
@@ -494,18 +587,22 @@ uninstall-am: uninstall-appmanDATA
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-appmanDATA
+	install-html-am install-info install-info-am \
+	install-libmanDATA install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-appmanDATA uninstall-libmanDATA
 
 
 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
+.man.$(LIB_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/libXpm/man/XpmAttributesSize.man b/lib/libXpm/man/XpmAttributesSize.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmAttributesSize.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateBuffer.man b/lib/libXpm/man/XpmCreateBuffer.man
new file mode 100644
index 000000000..b1b02f60a
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateBuffer.man
@@ -0,0 +1,81 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH XpmCreateBuffer __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmCreateBuffer  \- create an Xpm-Buffer
+
+.SH SYNOPSIS
+.HP
+int XpmCreateBufferFromImage(Display *display, char **buffer_return, XImage *image, XImage *shapeimage, XpmAttributes *attributes);
+.HP
+int XpmCreateBufferFromPixmap(Display *display, char **buffer_return, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes);
+.HP
+int XpmCreateBufferFromXpmImage(char **buffer_return, XpmImage *image, XpmInfo *info);
+
+.SH ARGUMENTS
+
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fIbuffer_return\fP li
+Returns the buffer which is created.
+.IP \fIimage\fP li
+Specifies the image.
+.IP \fIshapeimage\fP li
+Specifies the shape mask image.
+.IP \fIattributes\fP li
+Specifies the location of a structure containing information (or NULL).
+.IP \fIinfo\fP li
+Specifies the location of a structure to get possible information (or NULL).
+
+.SH DESCRIPTION
+
+.SS XpmCreateBufferFromPixmap
+XpmCreateBufferFromPixmap creates an XPM buffer from a Pixmap.
+The XpmCreateBufferFromPixmap function works as XpmWriteFileFromPixmap(), it just calls
+XpmCreateBufferFromImage instead of XpmWriteFileFromImage. Once again, the caller should free the buffer using
+XpmFree when finished.
+
+As a convenience, the XpmReadFileToBuffer and XpmWriteFileFromBuffer functions
+are provided to copy a file to a buffer
+and to write a file from a buffer. Thus for instance one may decide to use XpmReadFileToBuffer,
+XpmCreatePixmapFromBuffer, and XpmFree instead of XpmReadFileToPixmap. On some systems this may lead to a
+performance improvement, since the parsing will be performed in memory, but it uses more memory.
+
+.SS XpmCreateBufferFromImage
+The XpmCreateBufferFromImage function works as XpmWriteFileFromImage(), it just writes to a malloc’ed buffer instead of to a file.
+The caller should free the buffer using XpmFree when finished.
+
+.SS XpmCreateBufferFromXpmImage.
+To create an XPM buffer from an XpmImage, use XpmCreateBufferFromXpmImage.
+The XpmCreateBufferFromXpmImage function writes out the givenimage to a single block malloc’ed buffer inXPM format.
+If insufficient working storage is allocated, it returns XpmNoMemory, and returns XpmSuccess on success.
+If the passed XpmInfo structure pointer is not NULL, XpmCreateBufferFromXpmImage looks for the following
+attributes: XpmComments, XpmExtensions, and XpmHotspot, and writes the related information out as well.
+The caller should free the buffer using XpmFree when finished.
+
+.SH "SEE ALSO"
+.BR XpmCreateBufferFromImage(__libmansuffix__) ,
+.BR XpmCreateBufferFromPixmap(__libmansuffix__) ,
+.BR XpmCreateBufferFromXpmImage(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmCreateBufferFromImage.man b/lib/libXpm/man/XpmCreateBufferFromImage.man
new file mode 100644
index 000000000..c2a9b0e23
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateBufferFromImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateBuffer.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateBufferFromPixmap.man b/lib/libXpm/man/XpmCreateBufferFromPixmap.man
new file mode 100644
index 000000000..c2a9b0e23
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateBufferFromPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateBuffer.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateBufferFromXpmImage.man b/lib/libXpm/man/XpmCreateBufferFromXpmImage.man
new file mode 100644
index 000000000..c2a9b0e23
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateBufferFromXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateBuffer.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateData.man b/lib/libXpm/man/XpmCreateData.man
new file mode 100644
index 000000000..a4f332bad
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateData.man
@@ -0,0 +1,79 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH XpmCreateData __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmCreateData \- create an Data structure
+
+.SH SYNOPSIS
+.HP
+int XpmCreateDataFromImage(Display *display, char ***data_return, XImage *image, XImage *shapeimage, XpmAttributes *attributes);
+.HP
+int XpmCreateDataFromPixmap(Display *display, char ***data_return, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes);
+.HP
+int XpmCreateDataFromXpmImage(char ***data_return, XpmImage *image, XpmInfo *info);
+
+.SH ARGUMENTS
+
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fIdata_return\fP li
+Returns the data which is created.
+.IP \fIpixmap\fP li
+Specifies the pixmap.
+.IP \fIshapemask\fP li
+Specifies the shape mask pixmap.
+.IP \fIattributes\fP li
+Specifies the location of a structure containing information (or NULL).
+.IP \fIinfo\fP li
+Specifies the location of a structure to get information.
+.IP \fIimage\fP li
+Specifies the image
+
+.SH DESCRIPTION
+.SS XpmCreateDataFromImage
+In some cases, one may want to create an XPM data from an XImage, to do so use XpmCreateDataFromImage.
+The XpmCreateDataFromImage function exactly works as XpmWriteFileFromImage() does and returns the same way.
+It just writes to a single block malloc’ed data instead of to a file.
+It is the caller’s responsibility to free the data, using XpmFree when finished.
+
+.SS XpmCreateDataFromPixmap
+XpmCreateDataFromPixmap creates an XPM data from a Pixmap.
+The XpmCreateDataFromPixmap function uses XGetImage to get from the given pixmaps
+the related X images which are passed to XpmCreateDataFromImage.
+Then it destroys the created images using XDestroyImage.
+XpmCreateDataFromPixmap returns the same errors as XpmCreateDataFromImage.
+
+.SS XpmCreateDataFromXpmImage
+XpmCreateDataFromXpmImage creates an XPM data from an XmImage.
+The XpmCreateDataFromXpmImage function writes out the given image to a single block malloc’ed data in XPM format.
+If insufficient working storage is allocated, it returns XpmNoMemory, and returns XpmSuccess on success.
+If the passed XpmInfo structure pointer is not NULL, XpmCreateDataFromXpmImage looks for the following attributes:
+XpmExtensions, and XpmHotspot, and writes the related information out as well.
+It is the caller’s responsibility to free the data, using XpmFree when finished.
+
+.SH "SEE ALSO"
+.BR XpmCreateDataFromImage(__libmansuffix__) ,
+.BR XpmCreateDataFromPixmap(__libmansuffix__) ,
+.BR XpmCreateDataFromXpmImage(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmCreateDataFromImage.man b/lib/libXpm/man/XpmCreateDataFromImage.man
new file mode 100644
index 000000000..d43587504
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateDataFromImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateData.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateDataFromPixmap.man b/lib/libXpm/man/XpmCreateDataFromPixmap.man
new file mode 100644
index 000000000..d43587504
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateDataFromPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateData.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateDataFromXpmImage.man b/lib/libXpm/man/XpmCreateDataFromXpmImage.man
new file mode 100644
index 000000000..d43587504
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateDataFromXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateData.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateImage.man b/lib/libXpm/man/XpmCreateImage.man
new file mode 100644
index 000000000..fc68dbbf9
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateImage.man
@@ -0,0 +1,81 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH  XpmCreateImage __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmCreateImage \- create an Xpm-image
+.SH SYNOPSIS
+.HP
+int XpmCreateImageFromData(Display *display, char **data, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes);
+.HP
+int XpmCreateImageFromBuffer(Display *display, char *buffer, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes);
+.HP
+int XpmCreateImageFromXpmImage(Display *display,  XpmImage *image, XImage *image_return, XImage *shapeimage_return, XpmAttributes *attributes);
+
+.SH ARGUMENTS
+
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fIdata\fP li
+Specifies the location of the data.
+.IP \fIimage_return\fP li
+Returns the image which is created.
+.IP \fIshapeimage_return\fP li
+Returns the shape mask image which is created if the color None is used.
+.IP \fIattributes\fP li
+Specifies the location of a structure to get and store information (or NULL).
+.IP \fIshapeimage\fP li
+Specifies the shape mask image which is created if any.
+
+.SH DESCRIPTION
+
+.SS XpmCreateImageFromData
+To create an XImage from an XPM data, use XpmCreateImageFromData.
+
+The XpmCreateImageFromData function allows you to include in your C program an XPM file which was
+written out by functions such as XpmWriteFileFromImage or XpmWriteFileFromPixmap without reading in the file.
+XpmCreateImageFromData exactly works as XpmReadFileToImage() does and returns the same way.
+It just reads data instead of a file.
+Here again, it is the caller’s responsibility to free the returned images, the colors
+and possibly the data returned into the XpmAttributes structure.
+
+.SS XpmCreateImageFromBuffer
+To create an XImage from an XPM buffer, use XpmCreateImageFromBuffer.
+The XpmCreateImageFromBuffer function works the same way as XpmReadFileToImage(),
+it just parses the buffer instead of the file.
+Be aware that the feature provided on some systems by XpmReadFileToImage
+to deal with compressed files is not available here.
+
+.SS XpmCreateImageFromXpmImage
+To create an XImage from an XpmImage, use XpmCreateImageFromXpmImage.
+From the given XpmImage and XpmAttributes if not NULL, XpmCreateImageFromXpmImage allocates colors
+and creates X images following the same mechanism as XpmReadFileToImage().
+When finished the caller must free the images using XDestroyImage,
+the colors using XFreeColors, and possibly the
+data returned into the XpmAttributes using XpmFreeAttributes().
+
+.SH "SEE ALSO"
+.BR XpmCreateImageFromBuffer(__libmansuffix__) ,
+.BR XpmCreateImageFromData(__libmansuffix__) ,
+.BR XpmCreateImageFromXpmImage(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmCreateImageFromBuffer.man b/lib/libXpm/man/XpmCreateImageFromBuffer.man
new file mode 100644
index 000000000..511faee01
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateImageFromBuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateImageFromData.man b/lib/libXpm/man/XpmCreateImageFromData.man
new file mode 100644
index 000000000..511faee01
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateImageFromData.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateImageFromXpmImage.man b/lib/libXpm/man/XpmCreateImageFromXpmImage.man
new file mode 100644
index 000000000..511faee01
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateImageFromXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreatePixmap.man b/lib/libXpm/man/XpmCreatePixmap.man
new file mode 100644
index 000000000..5088f1eb7
--- /dev/null
+++ b/lib/libXpm/man/XpmCreatePixmap.man
@@ -0,0 +1,78 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH  XpmCreatePixmap __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmCreatePixmap \- create a pixmap
+.SH SYNOPSIS
+.HP
+int XpmCreatePixmapFromData(Display *display, Drawable d, char **data, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes);
+.HP
+int XpmCreatePixmapFromBuffer(Display *display, Drawable d, char *buffer, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes);
+.HP
+int XpmCreatePixmapFromXpmImage(Display *display, Drawable d, XpmImage *image, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes);
+
+.SH ARGUMENTS
+
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fId\fP li
+Specifies which screen the pixmap is created on.
+.IP \fIbuffer\fP li
+Specifies the location of the buffer.
+.IP \fIpixmap_return\fP li
+Returns the pixmap which is created if the color None.
+.IP \fIshapemask_return\fP li
+Returns the shape mask pixmap which is created if the color None is used.
+.IP \fIattributes\fP li
+Specifies the location of a structure to get and store information.
+.IP \fIimage\fP li
+Specifies the XpmImage.
+
+.SH DESCRIPTION
+.SS XpmCreatePixmapFromData
+To create a Pixmap from an XPM data, use XpmCreatePixmapFromData.
+The XpmCreatePixmapFromData function creates X images using XpmCreateImageFromData() and
+thus returns the same errors. In addition on success it then creates the related pixmaps, using XPutImage,
+which are returned to pixmap_return and shapemask_return if not NULL, and finally destroys the created images using XDestroyImage.
+Do not forget to free the returned pixmaps, the colors, and possibly the data returned into the XpmAttributes structure when done.
+
+.SS XpmCreatePixmapFromBuffer
+To create a Pixmap from an XPM buffer, use XpmCreatePixmapFromBuffer.
+The XpmCreatePixmapFromBuffer function works the same way as XpmReadFileToPixmap (),
+it just calls XpmCreateImageFromBuffer instead of XpmReadFileToImage.
+
+.SS XpmCreatePixmapFromXpmImage
+XpmCreatePixmapFromXpmImage creates X images calling XpmCreateImageFromXpmImage () with
+the given XpmImage and XpmAttributes, then it creates the related pixmaps which are returned topixmap_return
+and shapemask_return using XPutImage.
+Finally it destroys the X images with XDestroyImage.
+When finished the caller must free the pixmaps using XFreePixmap, the colors using XFreeColors or the application
+equivalent function when the standard Xlib functions are not used, and possibly the data returned into the
+XpmAttributes using XpmFreeAttributes.
+
+.SH "SEE ALSO"
+.BR XpmCreatePixmapFromBuffer(__libmansuffix__) ,
+.BR XpmCreatePixmapFromData(__libmansuffix__) ,
+.BR XpmCreatePixmapFromXpmImage(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmCreatePixmapFromBuffer.man b/lib/libXpm/man/XpmCreatePixmapFromBuffer.man
new file mode 100644
index 000000000..c9405c82e
--- /dev/null
+++ b/lib/libXpm/man/XpmCreatePixmapFromBuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreatePixmap.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreatePixmapFromData.man b/lib/libXpm/man/XpmCreatePixmapFromData.man
new file mode 100644
index 000000000..c9405c82e
--- /dev/null
+++ b/lib/libXpm/man/XpmCreatePixmapFromData.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreatePixmap.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreatePixmapFromXpmImage.man b/lib/libXpm/man/XpmCreatePixmapFromXpmImage.man
new file mode 100644
index 000000000..c9405c82e
--- /dev/null
+++ b/lib/libXpm/man/XpmCreatePixmapFromXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreatePixmap.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateXpmImage.man b/lib/libXpm/man/XpmCreateXpmImage.man
new file mode 100644
index 000000000..6be7cd0f2
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateXpmImage.man
@@ -0,0 +1,107 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH  XpmCreateXpmImage __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmCreateXpmImage \- create an Xpm image
+.SH SYNOPSIS
+
+.HP
+int XpmCreateXpmImageFromData(char **data, XpmImage *image, XpmInfo *info);
+.HP
+int XpmCreateXpmImageFromBuffer(char *buffer, XpmImage *image, XpmInfo *info);
+.HP
+int XpmCreateXpmImageFromImage(Display *display, XImage *image, XImage *shapeimage, XpmImage *xpmimage, XpmAttributes *attributes);
+.HP
+int XpmCreateXpmImageFromPixmap(Display *display, Pixmap *pixmap, Pixmap *shapemask, XpmImage *xpmimage, XpmAttributes *attributes);
+
+.SH ARGUMENTS
+
+.IP \fIdata\fP  li
+Specifies the location of the data.
+.IP \fIimage\fP li
+Specifies the image structure location.
+.IP \fIinfo\fP li
+Specifies the location of an XpmInfo structure to get and store information (or NULL).
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fIimage\fP li
+Specifies the image which is created.
+.IP \fIshapeimage\fP li
+Specifies the shape mask image which is created if any.
+.IP \fIxpmimage\fP li
+Specifies the location of an XpmImage structure.
+.IP \fIattributes\fP li
+Specifies the location of a structure containing information (or NULL).
+
+.SH DESCRIPTION
+.SS XpmCreateXpmImageFromBuffer
+To create an XpmImage from an XPM buffer, use XpmCreateXpmImageFromBuffer.
+The XpmCreateXpmImageFromBuffer function reads the given buffer to fill in the given XpmImage structure.
+If the buffer does not contain valid XPM data, it returns XpmFileInvalid.
+If insufficient working storage is allocated, it returns XpmNoMemory, and returns XpmSuccess on success.
+If the passed XpmInfo structure pointer is not NULL, XpmCreateXpmImageFromBuffer looks for the following attributes:
+XpmReturnComments and XpmReturnExtensions, and sets possibly the XpmHotspot attribute when returning.
+As specified in the table (page 28), if the data related to the attributes XpmReturnComments and
+XpmReturnExtensions cannot be returned as requested because of insufficient memory storage,
+XpmCreateXpmImageFromBuffer will change the valuemask to mention this and will try to continue.
+So the caller should check on this before accessing requested data.
+
+Note: The valuemask of the passed XpmInfo structure must be set to some valid value,
+at least zero, otherwise unpredictable errors can occur.
+
+.SS XpmCreateXpmImageFromData
+To create an XpmImage from an XPM data, use XpmCreateXpmImageFromData.
+XpmCreateXpmImageFromData fills in the given XpmImage structure from the given data. If the data does not
+contain validXPM data, it returns XpmFileInvalid. If insufficient working storage is allocated, it returns
+XpmNoMemory, on success it returns XpmSuccess.
+If the passed XpmInfo structure pointer is not NULL, XpmCreateXpmImageFromData looks for the following attributes:
+XpmReturnExtensions, and sets possibly the XpmHotspot attribute when returning.
+As specified in the table (page 28), if the data related to the attribute
+XpmReturnExtensions cannot be returned as requested because of
+insufficient memory storage, XpmCreateXpmImageFromData will change the valuemask to mention this and will
+try to continue.
+So the caller should check on this before accessing requested data.
+
+Note: The valuemask of the passed  XpmInfo structure must be set to some valid value, at least zero,
+otherwise unpredictable errors can occur.
+
+.SS XpmCreateXpmImageFromImage
+To create an XpmImage from an XImage, use XpmCreateXpmImageFromImage.
+From the given X images and XpmAttributes if not NULL, XpmCreateXpmImageFromImage creates an
+XpmImage following the same mechanism as XpmWriteFileFromImage.
+
+.SS XpmCreateXpmImageFromPixmap
+To create an XpmImage from a Pixmap, use XpmCreateXpmImageFromPixmap.
+From the given pixmaps and XpmAttributes if not NULL, XpmCreateXpmImageFromPixmap gets the related XImages
+by calling XGetImage, then it gives them to XpmCreateXpmImageFromImage() to create an
+XpmImage which is returned to xpmimage.
+Finally it destroys the created X images using XDestroyImage.
+
+
+.SH "SEE ALSO"
+.BR XpmCreateXpmImageFromBuffer(__libmansuffix__) ,
+.BR XpmCreateXpmImageFromData(__libmansuffix__) ,
+.BR XpmCreateXpmImageFromImage(__libmansuffix__) ,
+.BR XpmCreateXpmImageFromPixmap(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmCreateXpmImageFromBuffer.man b/lib/libXpm/man/XpmCreateXpmImageFromBuffer.man
new file mode 100644
index 000000000..18371bc31
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateXpmImageFromBuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateXpmImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateXpmImageFromData.man b/lib/libXpm/man/XpmCreateXpmImageFromData.man
new file mode 100644
index 000000000..18371bc31
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateXpmImageFromData.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateXpmImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateXpmImageFromImage.man b/lib/libXpm/man/XpmCreateXpmImageFromImage.man
new file mode 100644
index 000000000..18371bc31
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateXpmImageFromImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateXpmImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmCreateXpmImageFromPixmap.man b/lib/libXpm/man/XpmCreateXpmImageFromPixmap.man
new file mode 100644
index 000000000..18371bc31
--- /dev/null
+++ b/lib/libXpm/man/XpmCreateXpmImageFromPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmCreateXpmImage.__libmansuffix__
diff --git a/lib/libXpm/man/XpmFree.man b/lib/libXpm/man/XpmFree.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmFree.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmFreeAttributes.man b/lib/libXpm/man/XpmFreeAttributes.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmFreeAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmFreeExtensions.man b/lib/libXpm/man/XpmFreeExtensions.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmFreeExtensions.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmFreeXpmImage.man b/lib/libXpm/man/XpmFreeXpmImage.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmFreeXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmFreeXpmInfo.man b/lib/libXpm/man/XpmFreeXpmInfo.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmFreeXpmInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmGetErrorString.man b/lib/libXpm/man/XpmGetErrorString.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmGetErrorString.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmLibraryVersion.man b/lib/libXpm/man/XpmLibraryVersion.man
new file mode 100644
index 000000000..8e1589811
--- /dev/null
+++ b/lib/libXpm/man/XpmLibraryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmMisc.__libmansuffix__
diff --git a/lib/libXpm/man/XpmMisc.man b/lib/libXpm/man/XpmMisc.man
new file mode 100644
index 000000000..f8cfc93cb
--- /dev/null
+++ b/lib/libXpm/man/XpmMisc.man
@@ -0,0 +1,107 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH XpmMisc __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmMisc \- xpm misc functions to free used memory and handle errors
+.SH SYNOPSIS
+
+.HP
+int XpmFreeXpmImage(XpmImage *image);
+.HP
+int XpmFreeXpmInfo(XpmInfo *info);
+.HP
+int XpmFreeAttributes(XpmAttributes *attributes);
+.HP
+int XpmAttributesSize();
+.HP
+int XpmFreeExtensions(XpmExtension *extensions,  int nextensions);
+.HP
+int XpmFree(char *ptr);
+.HP
+char *XpmGetErrorString(int errorcode);
+.HP
+int XpmLibraryVersion();
+
+.SH ARGUMENTS
+
+.IP \fIimage\fP li
+Specifies the structure to free
+.IP \fIinfo\fP li
+Specifies the structure to free
+.IP \fIptr\fP li
+Specifies the data to free
+.IP \fIerrorcode\fP li
+Specifies the XPM error
+.IP \fIextensions\fP li
+Specifies the array to free
+.IP \fInextensions\fP li
+Specifies the number of extensions
+.IP \fIattributes\fP li
+Specifies the structure to free
+
+.SH DESCRIPTION
+
+To free possible data stored into an XpmImage structure use XpmFreeXpmImage.
+The XpmFreeXpmImage function frees the structure members which are not NULL, but not the structure itself.
+To free possible data stored into an XpmInfo structure use XpmFreeXpmInfo.
+
+To free data possibly stored into an array of XpmExtension use XpmFreeExtensions.
+
+To free any data allocated by an XPM function use the XpmFree function.
+The current distribution of the XPM library uses the standard memory allocation functions and thus
+XpmFree is nothing else than a define to the standard free.
+However since these functions may be redefined in specific environments it is wise to use XpmFree.
+
+To free possible data stored into an XpmAttributes structure use XpmFreeAttributes.
+The XpmFreeAttributes function frees the structure members which have been malloc’ed such as the pixels list.
+
+To dynamically allocate an XpmAttributes structure use the XpmAttributesSize function.
+The XpmAttributesSize function provides application using dynamic libraries with a safe way to allocate and then
+refer to an XpmAttributes structure, disregarding whether the XpmAttributes structure size has changed or not since
+compiled.
+To get data when building an error message, one can use XpmGetErrorString.
+XpmGetErrorString returns a string related to the given XPM error code.
+
+The XpmLibraryVersion function can be used when one needs to figure out which version of the library is in use.
+The value returned by XpmLibraryVersion can be compared to the value of XpmIncludeVersion which is defined
+in the header file "xpm.h". These numbers are computed with the following formula:
+.nf
+ (XpmFormat * 100 + XpmVersion) * 100 + XpmRevision
+.fi
+Where XpmFormat is the version number of the format, XpmVersion is the library version number (which changes
+only if the API changes), and XpmRevision is the library minor version number.
+
+The XpmFreeExtensions function frees all data stored in every extension and the array itself.
+Note that XpmFreeAttributes call this function and thus most of the time it should not need to be explicitly called.
+
+.SH "SEE ALSO"
+.BR XpmLibraryVersion(__libmansuffix__) ,
+.BR XpmGetErrorString(__libmansuffix__) ,
+.BR XpmFree(__libmansuffix__) ,
+.BR XpmFreeExtensions(__libmansuffix__) ,
+.BR XpmAttributesSize(__libmansuffix__) ,
+.BR XpmFreeAttributes(__libmansuffix__) ,
+.BR XpmFreeXpmImage(__libmansuffix__) ,
+.BR XpmFreeXpmInfo(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmRead.man b/lib/libXpm/man/XpmRead.man
new file mode 100644
index 000000000..49b08443f
--- /dev/null
+++ b/lib/libXpm/man/XpmRead.man
@@ -0,0 +1,162 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH XpmRead __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmRead \- read an XPM file
+
+.SH SYNOPSIS
+.HP
+int XpmReadFileToImage(Display *display, char *filename, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes);
+.HP
+int XpmReadFileToPixmap(Display *display, Drawable d, char *filename, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes);
+.HP
+int XpmReadFileToXpmImage(char *filename, XpmImage *image, XpmInfo *info);
+.HP
+int XpmReadFileToBuffer(char *filename, char **buffer_return);
+.HP
+int XpmReadFileToData(char *filename, char ***data_return);
+
+.SH ARGUMENTS
+.IP   \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP   \fIfilename\fP li
+Specifies the file name to use.
+.IP   \fIimage_return\fP li
+Returns the image which is created.
+.IP   \fIshapeimage_return\fP li
+Returns the shape mask image which is created if the color None is used.
+.IP   \fIattributes\fP li
+Specifies the location of a structure to get and store information (or NULL).
+.IP   \fIbuffer_return\fP li
+Returns the buffer created.
+.IP   \fIdata_return\fP li
+Returns the data array created.
+.IP   \fIimage\fP li
+Specifies the image structure location.
+.IP   \fIinfo\fP li
+Specifies the location of a structure to store possible information (or NULL).
+
+.SH DESCRIPTION
+.SS XpmReadFileToImage
+The XpmReadFileToImage function reads in a file in the XPM format.
+If the file cannot be opened it returns XpmOpenFailed.
+If the file can be opened but does not contain valid XPM data, it returns XpmFileInvalid.
+If insufficient working storage is allocated, it returns XpmNoMemory.
+If the passed XpmAttributes structure pointer is not NULL, XpmReadFileToImage looks for the following attributes:
+XpmVisual, XpmColormap, XpmDepth, XpmColorSymbols, XpmExactColors, XpmCloseness,
+XpmRGBCloseness, XpmAllocCloseColors ,XpmReturnPixels, XpmReturnAllocPixels, XpmAllocColor,
+XpmFreeColors, XpmColorClosure, XpmReturnExtensions, XpmReturnColorTable, XpmBitmapFormat,
+sets the XpmSize, the XpmCharsPerPixel, and possibly the XpmHotspot attributes when returning.
+As a backward compatibility feature, XpmReadFileToImage also looks for the XpmReturnInfos attributes.
+As specified in the table (page 12), if the data related to the attributes XpmReturnExtensions,
+XpmReturnColorTable, and XpmReturnInfos cannot be  returned as requested because of insufficient
+memory storage, XpmReadFileToImage will change the valuemask to
+mention this and will try to continue.
+So the caller should check on this before accessing this data.
+
+Note: The valuemask of the passed XpmAttributes must be set to some valid value, at least zero, otherwise
+unpredictable errors can occur.
+XpmReadFileToImage allocates colors, as read from the file or possibly overridden as specified in the
+XpmColorSymbols attributes.
+The colors are allocated using the color settings for the visual specified by the XpmColorKey
+attribute, which has the value XPM_MONO, XPM_GRAY4, XPM_GRAY,or XPM_COLOR.
+If the XpmColor-Key attribute is not set it is determined by examining the type of visual.
+If no default value exists for the specified visual, it first looks for other defaults nearer to the monochrome visual type
+and secondly nearer to the color visual type.
+If the color which is found is not valid (cannot be parsed), it looks for
+another default one according to the same algorithm.
+If allocating a color fails, and the closeness attribute is set, it tries to find a color already in the colormap that is closest
+to the desired color, and uses that.
+If the alloc_close_colors attribute is set to False, the found close color is not allocated but it is used anyway.
+This is especially useful for applications which use a private colormap containing read/write cells and have
+complete control over the colormap.
+On the other hand, since in such a case there is no guarantee that the color pixel will not change any time,
+this should be avoided when using the default colormap.
+If no color can be found that is within closeness of the Red, Green and Blue components of the desired color,
+it reverts to trying other default values as explained above.
+For finer control over the closeness requirements of a particular icon,
+the red_closeness, green_closeness, and blue_closeness attributes may be used instead of the more general
+closeness attribute.
+
+The RGB components are integers within the range 0 (black) to 65535 (white). A closeness of less than 10000,
+for example, will cause only quite close colors to be matched, while a closeness of more than 50000 will
+allow quite dissimilar colors to match.
+Specifying a closeness of more than 65535 will allow any color to match, thus forcing the icon
+to be drawn in color no matter how bad the colormap is.
+The value 40000 seems to be about right for many situations
+requiring reasonable but not perfect matches. With this setting the color must only be within the same general area of
+the RGB cube as the desired color.
+If the exactColors attribute is set it then returns XpmColorError, otherwise it creates the images and returns XpmSuccess.
+If no color is found, and no close color exists or is wanted, and all visuals have been exhausted,
+XpmColorFailed is returned.
+
+XpmReadFileToImage returns the created image to image_return if not NULL and possibly the
+created shapemask to shapeimage_return if not NULL and the color None is used.
+If required it stores into the XpmAttributes structure the list of the used pixels.
+When the image depth is one, the image format is either as specified by the bitmap_format attribute if set or ZPixmap.
+When the depth is different from one the image format is always ZPixmap.
+When finished the caller must free the images using XDestroyImage, the allocated colors using
+XFreeColors or the application equivalent function when the standard Xlib functions are not used,
+and possibly the data returned into the  XpmAttributes using XpmFreeAttributes (page 25).
+In addition, on systems which support such features XpmReadFileToImage deals with compressed files by forking
+an uncompress or gzip process and reading from the piped result. It assumes that the specified file is
+compressed if the given file name ends by ’.Z’ or ’.gz’.
+In case the file name does not end so, XpmReadFileToImage looks for the given file name assuming it is not a compressed file.
+And if instead of a file name NULL is passed to XpmReadFileToImage, it reads from the standard input.
+
+.SS XpmReadFileToPixmap
+The XpmReadFileToPixmap function creates X images using XpmReadFileToImage and thus returns the same errors.
+In addition on success it then creates the related pixmaps, using XPutImage,
+which are returned to pixmap_return and shapemask_return if not NULL, and finally destroys the created images using XDestroyImage.
+When finished the caller must free the pixmaps using XFreePixmap, the allocated colors using XFreeColors or the
+application equivalent function when the standard Xlib functions are not used, and possibly the data returned into the
+XpmAttributes using XpmFreeAttributes.
+
+.SS XpmReadFileToBuffer
+XpmReadFileToBuffer allocates and fills a buffer from a file.
+XpmReadFileToBuffer returns XpmOpenFailed if it cannot open the file, returns XpmNoMemory if insufficient
+working storage is allocated, and XpmSuccess otherwise. The allocated buffer returned by XpmReadFileToBuffer
+should be freed with XpmFree when done.
+
+.SS XpmReadFileToData
+XpmReadFileToData returns XpmOpenFailed if it cannot open the file,
+XpmNoMemory if insufficient working storage is allocated,
+XpmFileInvalid if this is not a validXPM file, and XpmSuccess otherwise.
+The allocated data returned by XpmReadFileToData should be freed with XpmFree when done.
+
+.SS XpmReadFileToXpmImage
+The XpmReadFileToXpmImage function reads in a file in the XPM format.
+If the file cannot be opened it returns XpmOpenFailed.
+If the file can be opened but does not contain valid  XPMdata,
+it returns XpmFileInvalid.
+If insufficient working storage is allocated, it returns XpmNoMemory.
+On success it fills in the given XpmImage structure and returns XpmSuccess.
+
+.SH "SEE ALSO"
+.BR XpmReadFileToImage(__libmansuffix__) ,
+.BR XpmReadFileToPixmap(__libmansuffix__) ,
+.BR XpmReadFileToBuffer(__libmansuffix__) ,
+.BR XpmReadFileToData(__libmansuffix__)
+.BR XpmReadFileToXpmImage(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmReadFileToBuffer.man b/lib/libXpm/man/XpmReadFileToBuffer.man
new file mode 100644
index 000000000..2863896e9
--- /dev/null
+++ b/lib/libXpm/man/XpmReadFileToBuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmRead.__libmansuffix__
diff --git a/lib/libXpm/man/XpmReadFileToData.man b/lib/libXpm/man/XpmReadFileToData.man
new file mode 100644
index 000000000..2863896e9
--- /dev/null
+++ b/lib/libXpm/man/XpmReadFileToData.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmRead.__libmansuffix__
diff --git a/lib/libXpm/man/XpmReadFileToImage.man b/lib/libXpm/man/XpmReadFileToImage.man
new file mode 100644
index 000000000..2863896e9
--- /dev/null
+++ b/lib/libXpm/man/XpmReadFileToImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmRead.__libmansuffix__
diff --git a/lib/libXpm/man/XpmReadFileToPixmap.man b/lib/libXpm/man/XpmReadFileToPixmap.man
new file mode 100644
index 000000000..2863896e9
--- /dev/null
+++ b/lib/libXpm/man/XpmReadFileToPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmRead.__libmansuffix__
diff --git a/lib/libXpm/man/XpmReadFileToXpmImage.man b/lib/libXpm/man/XpmReadFileToXpmImage.man
new file mode 100644
index 000000000..2863896e9
--- /dev/null
+++ b/lib/libXpm/man/XpmReadFileToXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmRead.__libmansuffix__
diff --git a/lib/libXpm/man/XpmWrite.man b/lib/libXpm/man/XpmWrite.man
new file mode 100644
index 000000000..cba91c169
--- /dev/null
+++ b/lib/libXpm/man/XpmWrite.man
@@ -0,0 +1,127 @@
+.\" Copyright (C) 1989-95 GROUPE BULL
+.\"
+.\" 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 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
+.\" GROUPE BULL 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.
+.\"
+.\" Except as contained in this notice, the name of GROUPE BULL shall not be
+.\" used in advertising or otherwise to promote the sale, use or other dealings
+.\" in this Software without prior written authorization from GROUPE BULL.
+.\"
+.hw XImage
+.TH XpmWrite __libmansuffix__ __xorgversion__ "libXpm functions"
+.SH NAME
+XpmWrite \- write an XPM file
+
+.SH SYNOPSIS
+.HP
+int XpmWriteFileFromPixmap(Display *display, char *filename, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes);
+.HP
+int XpmWriteFileFromImage(Display *display, char *filename, XImage *image, XImage *shapeimage, XpmAttributes *attributes);
+.HP
+int XpmWriteFileFromData(char *filename, char **data);
+.HP
+int XpmWriteFileFromXpmImage(char *filename, XpmImage *image, XImage *shapeimage, XpmInfo *info);
+.HP
+int XpmWriteFileFromBuffer(char *filename,  char *buffer);
+
+.SH ARGUMENTS
+
+.IP \fIdisplay\fP li
+Specifies the connection to the X server.
+.IP \fIfilename\fP li
+Specifies the file name to use.
+.IP \fIpixmap\fP li
+Specifies the pixmap.
+.IP \fIshapemask\fP li
+Specifies the shape mask pixmap.
+.IP \fIattributes\fP li
+Specifies the location of a structure containing information (or NULL).
+.IP \fIdata\fP li
+Specifies the data array to read.
+.IP \fIimage\fP li
+Specifies the image.
+.IP \fIinfo\fP li
+Specifies the location of a structure to get information from (or NULL).
+.IP \fIbuffer\fP li
+Specifies the buffer to read.
+
+.SH DESCRIPTION
+.SS XpmWriteFileFromImage
+
+The XpmWriteFileFromImage function writes an image and its possible shapeimage out to a file in the XPM format.
+If the file cannot be opened, it returns XpmOpenFailed.
+If insufficient working storage is allocated, it returns XpmNoMemory.
+If no error occurs then it returns XpmSuccess.
+If the passed XpmAttributes structure pointer is not NULL,
+XpmWriteFileFromImage looks for the following attributes:
+XpmColormap, XpmHotspot, XpmCharsPerPixel, XpmRgbFilename, and XpmExtensions.
+As a backward compatibility feature, XpmWriteFileFromImage also looks for the XpmInfos attributes.
+If the filename contains an extension such as “.xpm”, in order to get a valid C variable name, the dot character is
+replaced by an underscore ’_’ when writing out.
+As a backward compatibility feature, if the XpmInfos attributes are defined it writes out possible stored
+information such as comments, color defaults and symbol.
+Finally, if the XpmRgbFilenameattribute is defined, XpmWriteFileFromImage searches for color names in
+this file and if found writes them out instead of the rgb values.
+
+In addition on systems which support such features if the given file name ends by ’.Z’ or ’.gz’
+it is assumed to be a compressed file. Then, XpmWriteFileFromImage writes to a pipedcompress or gzip process.
+And if instead of a file name NULL is passed to XpmWriteFileFromImage, it writes to the standard output.
+
+.SS XpmWriteFileFromPixmap
+To write out a Pixmap to an XPM file, use XpmWriteFileFromPixmap.
+
+If the passed XpmAttributes structure pointer is not NULL,
+XpmWriteFileFromPixmap looks for the following attributes: XpmSize.
+If they are not defined it performs an XGetGeometry operation.
+Then it uses XGetImage to get from the given pixmaps the related X images which are passed to XpmWriteFileFromImage.
+Finally XpmWriteFileFromPixmap destroys the created images using XDestroyImage.
+The XpmWriteFileFromPixmap function returns the same errors as XpmWriteFileFromImage.
+
+.SS XpmWriteFileFromData
+XpmWriteFileFromData writes an XPM data array to an XPM file.
+
+XpmWriteFileToData returns XpmOpenFailed if it cannot open the file,
+XpmFileInvalid if this is not a valid XPM data, and XpmSuccess otherwise.
+
+.SS XpmWriteFileFromXpmImage
+To write out an XpmImage to an XPM file, use XpmWriteFileFromXpmImage.
+The XpmWriteFileFromXpmImage function writes an image out to a file in the XPM format.
+If the file cannot be opened, it returns XpmOpenFailed.
+If insufficient working storage is allocated, it returns XpmNoMemory.
+If no error occurs then it returns XpmSuccess.
+If the passed XpmInfo structure pointer is not NULL, XpmWriteFileFromXpmImage looks for the following attributes:
+XpmComments, XpmExtensions, and XpmHotspot, and writes the related information out as well.
+In addition on systems which support such features if the given file name ends by ’.Z’ or ’.gz’ it is assumed to be a
+compressed file. Then, XpmWriteFileFromXpmImage writes to a piped compress or gzip process. And if instead
+of a file name NULL is passed to XpmWriteFileFromXpmImage, it writes to the standard output.
+
+.SS XpmWriteFileFromBuffer
+XpmWriteFileFromBuffer writes a XPM-buffer to a file.
+XpmWriteFileFromBuffer returns XpmOpenFailed if it cannot open the file, and XpmSuccess otherwise.
+
+As a convenience, the XpmReadFileToBuffer and XpmWriteFileFromBuffer are provided to copy a
+file to a buffer and to write a file from a buffer.
+Thus for instance one may decide to use XpmReadFileToBuffer, XpmCreatePixmapFromBuffer, and XpmFree
+instead of XpmReadFileToPixmap. On some systems this may lead to a performance improvement,
+since the parsing will be performed in memory, but it uses more memory.
+
+.SH "SEE ALSO"
+.BR XpmWriteFileFromData(__libmansuffix__) ,
+.BR XpmWriteFileFromPixmap(__libmansuffix__) ,
+.BR XpmWriteFileFromImage(__libmansuffix__) ,
+.BR XpmWriteFileFromXpmImage(__libmansuffix__) ,
+.BR XpmWriteFileFromBuffer(__libmansuffix__)
diff --git a/lib/libXpm/man/XpmWriteFileFromBuffer.man b/lib/libXpm/man/XpmWriteFileFromBuffer.man
new file mode 100644
index 000000000..91aeecb29
--- /dev/null
+++ b/lib/libXpm/man/XpmWriteFileFromBuffer.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmWrite.__libmansuffix__
diff --git a/lib/libXpm/man/XpmWriteFileFromImage.man b/lib/libXpm/man/XpmWriteFileFromImage.man
new file mode 100644
index 000000000..91aeecb29
--- /dev/null
+++ b/lib/libXpm/man/XpmWriteFileFromImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmWrite.__libmansuffix__
diff --git a/lib/libXpm/man/XpmWriteFileFromPixmap.man b/lib/libXpm/man/XpmWriteFileFromPixmap.man
new file mode 100644
index 000000000..91aeecb29
--- /dev/null
+++ b/lib/libXpm/man/XpmWriteFileFromPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmWrite.__libmansuffix__
diff --git a/lib/libXpm/man/XpmWriteFileFromXpmImage.man b/lib/libXpm/man/XpmWriteFileFromXpmImage.man
new file mode 100644
index 000000000..91aeecb29
--- /dev/null
+++ b/lib/libXpm/man/XpmWriteFileFromXpmImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XpmWrite.__libmansuffix__
diff --git a/lib/libXpm/src/Makefile.in b/lib/libXpm/src/Makefile.in
index de241341e..9bac991df 100644
--- a/lib/libXpm/src/Makefile.in
+++ b/lib/libXpm/src/Makefile.in
@@ -289,6 +289,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/lib/libXpm/src/create.c b/lib/libXpm/src/create.c
index a750846bf..4a85c78de 100644
--- a/lib/libXpm/src/create.c
+++ b/lib/libXpm/src/create.c
@@ -2231,7 +2231,7 @@ xpmParseDataAndCreate(
 	}
     }
     /*
-     * store found informations in the XpmImage structure
+     * store found information in the XpmImage structure
      */
     image->width = width;
     image->height = height;
diff --git a/lib/libXpm/src/hashtab.c b/lib/libXpm/src/hashtab.c
index 1bd4109a4..6950e1647 100644
--- a/lib/libXpm/src/hashtab.c
+++ b/lib/libXpm/src/hashtab.c
@@ -29,7 +29,7 @@
 *  XPM library                                                                *
 *                                                                             *
 *  Developed by Arnaud Le Hors                                                *
-*  this originaly comes from Colas Nahaboo as a part of Wool                  *
+*  this originally comes from Colas Nahaboo as a part of Wool                  *
 *                                                                             *
 \*****************************************************************************/
 
diff --git a/lib/libXpm/src/parse.c b/lib/libXpm/src/parse.c
index 613529e62..037fc66c0 100644
--- a/lib/libXpm/src/parse.c
+++ b/lib/libXpm/src/parse.c
@@ -27,7 +27,7 @@
 * parse.c:                                                                    *
 *                                                                             *
 *  XPM library                                                                *
-*  Parse an XPM file or array and store the found informations                *
+*  Parse an XPM file or array and store the found information                *
 *  in the given XpmImage structure.                                           *
 *                                                                             *
 *  Developed by Arnaud Le Hors                                                *
@@ -717,7 +717,7 @@ do { \
 } while(0)
 
 /*
- * This function parses an Xpm file or data and store the found informations
+ * This function parses an Xpm file or data and store the found information
  * in an an XpmImage structure which is returned.
  */
 int
@@ -825,7 +825,7 @@ xpmParseData(
     }
 
     /*
-     * store found informations in the XpmImage structure
+     * store found information in the XpmImage structure
      */
     image->width = width;
     image->height = height;
diff --git a/lib/libXpm/src/rgbtab.h b/lib/libXpm/src/rgbtab.h
index 3b7518491..6d30f1556 100644
--- a/lib/libXpm/src/rgbtab.h
+++ b/lib/libXpm/src/rgbtab.h
@@ -29,7 +29,7 @@
 * A hard coded rgb.txt. To keep it short I removed all colornames with        *
 * trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer  *
 * Gray ;-). But Grey is recognized on lookups, only on save Gray will be      *
-* used, maybe you want to do some substitue there too.                        *
+* used, maybe you want to do some substitute there too.                        *
 *                                                                             *
 * To save memory the RGBs are coded in one long value, as done by the RGB     *
 * macro.                                                                      *
diff --git a/lib/libXpm/src/scan.c b/lib/libXpm/src/scan.c
index 54c8da502..9068d71fa 100644
--- a/lib/libXpm/src/scan.c
+++ b/lib/libXpm/src/scan.c
@@ -182,7 +182,7 @@ do { \
 } while(0)
 
 /*
- * This function scans the given image and stores the found informations in
+ * This function scans the given image and stores the found information in
  * the given XpmImage structure.
  */
 int
@@ -336,7 +336,7 @@ XpmCreateXpmImageFromImage(
 	RETURN(ErrorStatus);
 
     /*
-     * store found informations in the XpmImage structure
+     * store found information in the XpmImage structure
      */
     xpmimage->width = width;
     xpmimage->height = height;
@@ -380,7 +380,7 @@ ScanTransparentColor(
 	*s = printable[c = ((a - c) / MAXPRINTABLE) % MAXPRINTABLE];
     *s = '\0';
 
-    /* then retreive related info from the attributes if any */
+    /* then retrieve related info from the attributes if any */
     if (attributes && (attributes->valuemask & XpmColorTable
 /* 3.2 backward compatibility code */
 		       || attributes->valuemask & XpmInfos)
diff --git a/lib/libXpm/sxpm/Makefile.in b/lib/libXpm/sxpm/Makefile.in
index 1a89e66c7..3f4b7882b 100644
--- a/lib/libXpm/sxpm/Makefile.in
+++ b/lib/libXpm/sxpm/Makefile.in
@@ -258,6 +258,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@