Update xfd to version 1.1.4

2025-12-08 18:28:43 +00:00 · 2022-12-04 18:13:53 +00:00
parent 6bb3d301a4
commit 1194b79a7e
10 changed files with 232 additions and 90 deletions
--- a/app/xfd/ChangeLog
+++ b/app/xfd/ChangeLog
@@ -1,3 +1,118 @@
+commit a70254dac5e63fbe4f8aa89433189a613a509e1f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Dec 3 13:46:02 2022 -0800
+
+    xfd 1.1.4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 09834f092c6fb5ac4945bfd1b7b5bb228e42e04d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Nov 12 15:23:52 2022 -0800
+
+    Tag unused arguments to callback functions as _X_UNUSED
+    
+    Gets rid of 33 -Wunused-parameter warnings from clang
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d9ba30a6f56b2bb7e6f1b125a3d2eaa871c96eba
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Nov 12 13:05:24 2022 -0800
+
+    Handle -Wextra-semi-stmt warnings from clang
+    
+    Use do {...} while (0) idiom for pre-processor macros that define
+    code blocks so that trailing semi-colons don't appear to be extraneous
+    
+    grid.c:305:38: warning: empty expression statement has no effect;
+      remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
+                CI_GET_CHAR_INFO_1D (fs, ch, cs);
+                                                ^
+    grid.c:311:40: warning: empty expression statement has no effect;
+      remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
+                CI_GET_CHAR_INFO_2D (fs, r, c, cs);
+                                                  ^
+    grid.c:488:46: warning: empty expression statement has no effect;
+      remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
+        donestr (XftColor, xftColor, XtRXftColor);
+                                                 ^
+    grid.c:546:42: warning: empty expression statement has no effect;
+      remove unnecessary ';' to silence this warning [-Wextra-semi-stmt]
+        donestr (XftFont *, font, XtRXftFont);
+                                             ^
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0be214afe5eeddc6d5e6cdcae9b7242d4e11b3cd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Thu Jul 28 17:30:21 2022 -0700
+
+    gitlab CI: stop requiring Signed-off-by in commits
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2ffeff68a6774675b1741655fa7a22c7af93c2ac
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 16 11:00:38 2022 -0700
+
+    Mark usage() as _X_NORETURN _X_COLD
+    
+    Raises minimum xproto requirement to 7.0.25 from Nov. 2013
+    to get the _X_COLD definition in <X11/Xfuncproto.h>
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 122fa8689837bc5a5166432609f351c200a17ef6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 16 10:58:05 2022 -0700
+
+    Variable scope reductions as recommended by cppcheck
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit da378df9565f7a8e1e086d1676c6742a5ca9d5f4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 16 10:51:18 2022 -0700
+
+    Fix warning: missing initializer for field ‘extension’ of ‘SimpleClassPart'
+    
+    grid.c:153:3: warning: missing initializer for field ‘extension’ of ‘SimpleClassPart {aka struct <anonymous>}’ [-Wmissing-field-initializers]
+       }
+       ^
+    In file included from grid.c:34:0:
+    /net/also.us.oracle.com/export/alanc/X.Org/amd64-gcc/install/usr/X11R7/include/X11/Xaw/SimpleP.h:62:15: note: ‘extension’ declared here
+         XtPointer extension;
+                   ^~~~~~~~~
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d946324dae78f15ffe63f1e129eb4cb35a7116b8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Oct 16 10:42:15 2022 -0700
+
+    Use _CONST_X_STRING to make libXt declare String as const char *
+    
+    Clears 46 out of 68 -Wdiscarded-qualifiers warnings from gcc
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9fdbf13e82163a69acf218ae5850b33fd5a0ff91
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Dec 6 12:00:17 2021 -0800
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 66bfd8cf6e349edb42de3474b53e9f50db3a4694
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Dec 6 12:00:14 2021 -0800
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 9cf6578a0c35b14af13dc104ab3f4ccf64e673ae
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Mar 9 18:56:26 2019 -0800
@@ -605,7 +720,7 @@ Date:   Fri Oct 14 00:25:45 2005 +0000
    Use sed to fill in variables in man page

 commit bd8980b53fe42bd02524fffd77aea85895fd8b22
-Author: Kristian Høgsberg <krh@redhat.com>
+Author: Kristian Høgsberg  <krh@redhat.com>
 Date:   Tue Sep 27 20:23:15 2005 +0000

    Update configure.ac to not require xaw8.
@@ -638,7 +753,7 @@ Date:   Fri Jul 29 21:22:32 2005 +0000
    - Update modular Xorg version

 commit 84402c21218d680e062d1effd217472d5a0d98dd
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Wed Jul 27 22:41:14 2005 +0000

    Add _BSD_SOURCE to xfd
@@ -670,7 +785,7 @@ Date:   Wed Jul 20 19:31:55 2005 +0000
        configure cache, you cache it, and the cached value is probably wrong.

 commit 3fc196e33de9fe3c8468d771763c4433328c764c
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Wed Jul 6 19:26:26 2005 +0000

    - Xaw/xaw.m4: Change help string to say "enable xprint" instead of "disable
@@ -681,7 +796,7 @@ Date:   Wed Jul 6 19:26:26 2005 +0000
    - remove font/arabic-misc/README and font/mutt-misc/README

 commit 5309f3af0daaf8292ad4fbdd8a7c1c66dc20a178
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Wed Jul 6 15:14:08 2005 +0000

    Build system for xfd
--- a/app/xfd/Makefile.am
+++ b/app/xfd/Makefile.am
@@ -22,7 +22,8 @@
 SUBDIRS = man
 bin_PROGRAMS = xfd

-AM_CPPFLAGS = -DXRENDER -D_BSD_SOURCE -DLOCALEDIR=\"$(LOCALEDIR)\"
+AM_CPPFLAGS = -DXRENDER -D_BSD_SOURCE -DLOCALEDIR=\"$(LOCALEDIR)\" \
+        -D_CONST_X_STRING
 AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS)
 xfd_LDADD = $(XFD_LIBS)

--- a/app/xfd/Makefile.in
+++ b/app/xfd/Makefile.in
@@ -209,9 +209,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$$'
@@ -333,6 +333,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -342,7 +343,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = man
-AM_CPPFLAGS = -DXRENDER -D_BSD_SOURCE -DLOCALEDIR=\"$(LOCALEDIR)\"
+AM_CPPFLAGS = -DXRENDER -D_BSD_SOURCE -DLOCALEDIR=\"$(LOCALEDIR)\" \
+        -D_CONST_X_STRING
+
 AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS)
 xfd_LDADD = $(XFD_LIBS)
 xfd_SOURCES = \
@@ -709,6 +712,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)
@@ -716,7 +720,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)
--- a/app/xfd/aclocal.m4
+++ b/app/xfd/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
--- a/app/xfd/compile
+++ b/app/xfd/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC

-# Copyright (C) 1999-2014 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
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -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/*)
@@ -255,7 +255,8 @@ EOF
    echo "compile $scriptversion"
    exit $?
    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/app/xfd/configure
+++ b/app/xfd/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfd 1.1.3.
+# Generated by GNU Autoconf 2.69 for xfd 1.1.4.
 #
-# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xfd/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xfd/-/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,7 +267,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/app/xfd/issues
+$0: https://gitlab.freedesktop.org/xorg/app/xfd/-/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
@@ -581,9 +581,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xfd'
 PACKAGE_TARNAME='xfd'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='xfd 1.1.3'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xfd/issues'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='xfd 1.1.4'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xfd/-/issues'
 PACKAGE_URL=''

 ac_unique_file="Makefile.am"
@@ -735,6 +735,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -820,6 +821,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}'
@@ -1072,6 +1074,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=* \
@@ -1209,7 +1220,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.
@@ -1322,7 +1333,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 xfd 1.1.3 to adapt to many kinds of systems.
+\`configure' configures xfd 1.1.4 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1362,6 +1373,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]
@@ -1392,7 +1404,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of xfd 1.1.3:";;
+     short | recursive ) echo "Configuration of xfd 1.1.4:";;
   esac
  cat <<\_ACEOF

@@ -1451,7 +1463,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/app/xfd/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xfd/-/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -1514,7 +1526,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-xfd configure 1.1.3
+xfd configure 1.1.4
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1771,7 +1783,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 xfd $as_me 1.1.3, which was
+It was created by xfd $as_me 1.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -2600,7 +2612,7 @@ fi

 # Define the identity of the package.
 PACKAGE='xfd'
- VERSION='1.1.3'
+ VERSION='1.1.4'


 cat >>confdefs.h <<_ACEOF
@@ -10534,19 +10546,19 @@ fi
 # Checks for pkg-config packages

 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFD" >&5
-$as_echo_n "checking for XFD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}" >&5
+$as_echo_n "checking for xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}... " >&6; }

 if test -n "$XFD_CFLAGS"; then
    pkg_cv_XFD_CFLAGS="$XFD_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 \${XKBMODULE}\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 \${XKBMODULE}\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_XFD_CFLAGS=`$PKG_CONFIG --cflags "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}" 2>/dev/null`
+  pkg_cv_XFD_CFLAGS=`$PKG_CONFIG --cflags "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@@ -10558,12 +10570,12 @@ if test -n "$XFD_LIBS"; then
    pkg_cv_XFD_LIBS="$XFD_LIBS"
 elif test -n "$PKG_CONFIG"; then
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 \${XKBMODULE}\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 \${XKBMODULE}\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  pkg_cv_XFD_LIBS=`$PKG_CONFIG --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}" 2>/dev/null`
+  pkg_cv_XFD_LIBS=`$PKG_CONFIG --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
  pkg_failed=yes
@@ -10575,7 +10587,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
@@ -10584,14 +10596,14 @@ else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
-	        XFD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}" 2>&1`
+	        XFD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}" 2>&1`
        else
-	        XFD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}" 2>&1`
+	        XFD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}" 2>&1`
        fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XFD_PKG_ERRORS" >&5

-	as_fn_error $? "Package requirements (xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}) were not met:
+	as_fn_error $? "Package requirements (xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}) were not met:

 $XFD_PKG_ERRORS

@@ -10602,7 +10614,7 @@ Alternatively, you may set the environment variables XFD_CFLAGS
 and XFD_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;}
@@ -10626,8 +10638,8 @@ fi


 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPDEFS" >&5
-$as_echo_n "checking for APPDEFS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xt" >&5
+$as_echo_n "checking for xt... " >&6; }

 if test -n "$APPDEFS_CFLAGS"; then
    pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS"
@@ -10667,7 +10679,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
@@ -10694,7 +10706,7 @@ Alternatively, you may set the environment variables APPDEFS_CFLAGS
 and APPDEFS_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;}
@@ -11267,7 +11279,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 xfd $as_me 1.1.3, which was
+This file was extended by xfd $as_me 1.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -11327,13 +11339,13 @@ $config_headers
 Configuration commands:
 $config_commands

-Report bugs to <https://gitlab.freedesktop.org/xorg/app/xfd/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/app/xfd/-/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="\\
-xfd config.status 1.1.3
+xfd config.status 1.1.4
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

--- a/app/xfd/configure.ac
+++ b/app/xfd/configure.ac
@@ -23,13 +23,13 @@ dnl Process this file with autoconf to create configure.

 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xfd],[1.1.3],
-	[https://gitlab.freedesktop.org/xorg/app/xfd/issues], [xfd])
+AC_INIT([xfd], [1.1.4],
+	[https://gitlab.freedesktop.org/xorg/app/xfd/-/issues], [xfd])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])

 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])

 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 m4_ifndef([XORG_MACROS_VERSION],
@@ -68,7 +68,7 @@ if test x$use_xkb != xno ; then
 fi

 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.17 ${XKBMODULE}])
+PKG_CHECK_MODULES(XFD, [xaw7 fontconfig xft xrender xmu xproto >= 7.0.25 ${XKBMODULE}])

 PKG_CHECK_MODULES(APPDEFS, xt)
 xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
--- a/app/xfd/grid.c
+++ b/app/xfd/grid.c
@@ -149,7 +149,8 @@ FontGridClassRec fontgridClassRec = {
    /* extension                */      NULL
  },
  { /* simple fields */
-    /* change_sensitive		*/	XtInheritChangeSensitive
+    /* change_sensitive		*/	XtInheritChangeSensitive,
+    /* extension                */      NULL
  }
 };

@@ -168,10 +169,9 @@ GridFirstChar (Widget w)
 	FcChar32    map[FC_CHARSET_MAP_SIZE];
 	FcChar32    next;
 	FcChar32    first;
-	int	    i;

 	first = FcCharSetFirstPage (xft->charset, map, &next);
-	for (i = 0; i < FC_CHARSET_MAP_SIZE; i++)
+	for (int i = 0; i < FC_CHARSET_MAP_SIZE; i++)
 	    if (map[i])
 	    {
 		FcChar32    bits = map[i];
@@ -206,12 +206,12 @@ GridLastChar (Widget w)
    {
 	FcChar32    this, last, next;
 	FcChar32    map[FC_CHARSET_MAP_SIZE];
-	int	    i;
+
 	last = FcCharSetFirstPage (xft->charset, map, &next);
 	while ((this = FcCharSetNextPage (xft->charset, map, &next)) != FC_CHARSET_DONE)
 	    last = this;
 	last &= ~0xff;
-	for (i = FC_CHARSET_MAP_SIZE - 1; i >= 0; i--)
+	for (int i = FC_CHARSET_MAP_SIZE - 1; i >= 0; i--)
 	    if (map[i])
 	    {
 		FcChar32    bits = map[i];
@@ -247,7 +247,7 @@ GridLastChar (Widget w)
 			       (cs)->ascent|(cs)->descent) == 0))

 #define CI_GET_CHAR_INFO_1D(fs,col,cs) \
-{ \
+do { \
    cs = NULL; \
    if (col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
 	if (fs->per_char == NULL) { \
@@ -258,14 +258,14 @@ GridLastChar (Widget w)
 	if (CI_NONEXISTCHAR(cs)) \
 	    cs = NULL; \
    } \
-}
+} while (0)

 /*
 * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and
 * column.  This is used for fonts that have more than row zero.
 */
 #define CI_GET_CHAR_INFO_2D(fs,row,col,cs) \
-{ \
+do { \
    cs = NULL; \
    if (row >= fs->min_byte1 && row <= fs->max_byte1 && \
 	col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \
@@ -280,7 +280,7 @@ GridLastChar (Widget w)
 	if (CI_NONEXISTCHAR(cs)) \
 	    cs = NULL; \
    } \
-}
+} while (0)

 static Boolean
 GridHasChar (Widget w, long ch)
@@ -389,7 +389,7 @@ static XtConvertArgRec xftColorConvertArgs[] = {
 };

 #define	donestr(type, value, tstr) \
-	{							\
+	do {							\
 	    if (toVal->addr != NULL) {				\
 		if (toVal->size < sizeof(type)) {		\
 		    toVal->size = sizeof(type);			\
@@ -406,10 +406,11 @@ static XtConvertArgRec xftColorConvertArgs[] = {
 	    }							\
 	    toVal->size = sizeof(type);				\
 	    return True;					\
-	}
+	} while (0)

 static void
-XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
+XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal,
+		 XtPointer closure _X_UNUSED,
 		 XrmValuePtr args, Cardinal *num_args)
 {
    Screen	*screen;
@@ -439,7 +440,7 @@ static Boolean
 XmuCvtStringToXftColor(Display *dpy,
 		       XrmValue *args, Cardinal *num_args,
 		       XrmValue *fromVal, XrmValue *toVal,
-		       XtPointer *converter_data)
+		       XtPointer *converter_data _X_UNUSED)
 {
    char	    *spec;
    XRenderColor    renderColor;
@@ -489,7 +490,7 @@ XmuCvtStringToXftColor(Display *dpy,
 }

 static void
-XmuFreeXftFont (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
+XmuFreeXftFont (XtAppContext app, XrmValuePtr toVal, XtPointer closure _X_UNUSED,
 		XrmValuePtr args, Cardinal *num_args)
 {
    Screen  *screen;
@@ -515,7 +516,7 @@ static Boolean
 XmuCvtStringToXftFont(Display *dpy,
 		      XrmValue *args, Cardinal *num_args,
 		      XrmValue *fromVal, XrmValue *toVal,
-		      XtPointer *converter_data)
+		      XtPointer *converter_data _X_UNUSED)
 {
    char    *name;
    XftFont *font;
@@ -571,7 +572,8 @@ ClassInitialize(void)


 static void
-Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
+Initialize(Widget request, Widget new,
+           ArgList args _X_UNUSED, Cardinal *num_args _X_UNUSED)
 {
    FontGridWidget reqfg = (FontGridWidget) request;
    FontGridWidget newfg = (FontGridWidget) new;
@@ -684,7 +686,7 @@ Resize(Widget gw)

 /* ARGSUSED */
 static void
-Redisplay(Widget gw, XEvent *event, Region region)
+Redisplay(Widget gw, XEvent *event _X_UNUSED, Region region)
 {
    FontGridWidget fgw = (FontGridWidget) gw;
    XRectangle rect;			/* bounding rect for region */
@@ -880,8 +882,8 @@ PageBlank (Widget w, long first, long last)

 /*ARGSUSED*/
 static Boolean
-SetValues(Widget current, Widget request, Widget new,
-	  ArgList args, Cardinal *num_args)
+SetValues(Widget current, Widget request _X_UNUSED, Widget new,
+	  ArgList args _X_UNUSED, Cardinal *num_args _X_UNUSED)
 {
    FontGridWidget curfg = (FontGridWidget) current;
    FontGridWidget newfg = (FontGridWidget) new;
@@ -943,7 +945,8 @@ SetValues(Widget current, Widget request, Widget new,

 /* ARGSUSED */
 static void
-Notify(Widget gw, XEvent *event, String *params, Cardinal *nparams)
+Notify(Widget gw, XEvent *event,
+       String *params _X_UNUSED, Cardinal *nparams _X_UNUSED)
 {
    FontGridWidget fgw = (FontGridWidget) gw;
    int x, y;				/* where the event happened */
--- a/app/xfd/man/Makefile.in
+++ b/app/xfd/man/Makefile.in
@@ -226,6 +226,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
--- a/app/xfd/xfd.c
+++ b/app/xfd/xfd.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
 # include "config.h"
 #endif

+#include <X11/Xfuncproto.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Xos.h>
@@ -69,7 +70,7 @@ static XrmOptionDescRec xfd_options[] = {
 {"-columns",	"*grid.cellColumns", XrmoptionSepArg,	(caddr_t) NULL },
 };

-static void usage(void);
+static void usage(void) _X_NORETURN _X_COLD;
 static void SelectChar(Widget w, XtPointer closure, XtPointer data);
 static void do_quit(Widget w, XEvent *event, String *params,
 		    Cardinal *num_params) _X_NORETURN;
@@ -343,7 +344,7 @@ main(int argc, char *argv[])

 /*ARGSUSED*/
 static void
-SelectChar(Widget w, XtPointer closure, XtPointer data)
+SelectChar(Widget w, XtPointer closure _X_UNUSED, XtPointer data)
 {
    FontGridCharRec *p = (FontGridCharRec *) data;
    XFontStruct *fs = p->thefont;
@@ -421,7 +422,8 @@ SelectChar(Widget w, XtPointer closure, XtPointer data)

 /*ARGSUSED*/
 static void
-do_quit (Widget w, XEvent *event, String *params, Cardinal *num_params)
+do_quit (Widget w _X_UNUSED, XEvent *event _X_UNUSED,
+	 String *params _X_UNUSED, Cardinal *num_params _X_UNUSED)
 {
    exit (0);
 }
@@ -431,7 +433,6 @@ change_page(int page)
 {
    long oldstart, newstart;
    int ncols, nrows;
-    char buf[256];
    Arg arg;

    arg.name = XtNstartChar;
@@ -453,6 +454,7 @@ change_page(int page)
    if (!page || newstart != oldstart) {
 	unsigned int row = (unsigned int) ((newstart >> 8));
 	unsigned int col = (unsigned int) (newstart & 0xff);
+	char buf[256];

 	XtSetArg (arg, XtNlabel, buf);
 	snprintf (buf, sizeof(buf), xfd_resources.start_format,
@@ -488,14 +490,16 @@ set_button_state(void)

 /* ARGSUSED */
 static void
-do_prev16(Widget w, XEvent *event, String *params, Cardinal *num_params)
+do_prev16(Widget w _X_UNUSED, XEvent *event _X_UNUSED,
+	  String *params _X_UNUSED, Cardinal *num_params _X_UNUSED)
 {
    change_page (-16);
 }


 static void
-do_prev(Widget w, XEvent *event, String *params, Cardinal *num_params)
+do_prev(Widget w _X_UNUSED, XEvent *event _X_UNUSED,
+	String *params _X_UNUSED, Cardinal *num_params _X_UNUSED)
 {
    change_page (-1);
 }
@@ -503,14 +507,16 @@ do_prev(Widget w, XEvent *event, String *params, Cardinal *num_params)

 /* ARGSUSED */
 static void
-do_next(Widget w, XEvent *event, String *params, Cardinal *num_params)
+do_next(Widget w _X_UNUSED, XEvent *event _X_UNUSED,
+	String *params _X_UNUSED, Cardinal *num_params _X_UNUSED)
 {
    change_page (1);
 }

 /* ARGSUSED */
 static void
-do_next16(Widget w, XEvent *event, String *params, Cardinal *num_params)
+do_next16(Widget w _X_UNUSED, XEvent *event _X_UNUSED,
+	  String *params _X_UNUSED, Cardinal *num_params _X_UNUSED)
 {
    change_page (16);
 }