diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/xlogo/ChangeLog | 82 | ||||
| -rw-r--r-- | app/xlogo/Logo.c | 3 | ||||
| -rw-r--r-- | app/xlogo/Makefile.am | 1 | ||||
| -rw-r--r-- | app/xlogo/Makefile.in | 8 | ||||
| -rw-r--r-- | app/xlogo/aclocal.m4 | 16 | ||||
| -rw-r--r-- | app/xlogo/compile | 17 | ||||
| -rw-r--r-- | app/xlogo/config.h.in | 3 | ||||
| -rw-r--r-- | app/xlogo/configure | 226 | ||||
| -rw-r--r-- | app/xlogo/configure.ac | 37 | ||||
| -rw-r--r-- | app/xlogo/man/Makefile.in | 1 | ||||
| -rw-r--r-- | app/xlogo/xlogo.c | 2 |
11 files changed, 339 insertions, 57 deletions
diff --git a/app/xlogo/ChangeLog b/app/xlogo/ChangeLog index 9cb024fe0..a9f3486e5 100644 --- a/app/xlogo/ChangeLog +++ b/app/xlogo/ChangeLog @@ -1,3 +1,81 @@ +commit a03055d5b3385f41a50ba40fcc00e8cdb8758947 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Nov 12 16:08:41 2022 -0800 + + xlogo 1.0.6 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f70d09457ae6ea2248e074f57fdb16de925c43e2 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Oct 15 10:52:48 2022 -0700 + + Add configure check and --with-xkb option for use of XkbStdBell + + Optionally enable existing code to call XkbStdBell from libxkbfile + Enabled by default if libxkbfile is available, disable with --without-xkb + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 691a763dafc81db145a951d3151e7f050c2fb342 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Oct 15 10:45:15 2022 -0700 + + Fix -Wmissing-field-initializers warning + + Logo.c:115:5: warning: missing initializer for field ‘extension’ of ‘SimpleClassPart {aka struct <anonymous>}’ [-Wmissing-field-initializers] + }, + ^ + In file included from LogoP.h:33:0, + from Logo.c:35: + /usr/include/X11/Xaw/SimpleP.h:62:15: note: ‘extension’ declared here + XtPointer extension; + ^~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e379927b2d1e24d4c637fe4161dbf3f2fd98e02b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat Oct 15 10:42:54 2022 -0700 + + Use _CONST_X_STRING to make libXt declare String as const char * + + Clears 22 out of 36 -Wdiscarded-qualifiers warnings from gcc + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e364be848c65d5e286cbc96ccb283b9052fc3c4a +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 b503a04bc4de9fbbec52b29eab0ca36afb3de77f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Dec 6 16:16:46 2021 -0800 + + configure: make ---with-render help string match the accepted option name + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ad9a08c1364c4165d6bdd821312e49b53e1e113f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Dec 6 15:23:18 2021 -0800 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b105a307a1c36f935fb461b54496c7bcf2a3834c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Dec 6 15:23:15 2021 -0800 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + commit 793ce3bb509853c4fab8e04a38ba7ec752176a27 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sun Mar 3 12:20:21 2019 -0800 @@ -637,7 +715,7 @@ Date: Wed Jul 20 19:31:58 2005 +0000 configure cache, you cache it, and the cached value is probably wrong. commit 6fc943cfccd96e6ad0fec6a2e1b836fa0d0d7d3a -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Tue Jul 5 22:51:09 2005 +0000 Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage, @@ -734,7 +812,7 @@ Date: Thu Sep 2 01:10:30 2004 +0000 Bump major version number of libXaw (Bug #1273). commit 18ae14262f9859a2e1f2dd769a0c4dcf4e1bb344 -Author: Kristian Høgsberg <krh@redhat.com> +Author: Kristian Høgsberg <krh@redhat.com> Date: Mon Aug 16 16:36:16 2004 +0000 As discussed and agreed on on the release-wranglers meeting of August 16, diff --git a/app/xlogo/Logo.c b/app/xlogo/Logo.c index da5d7ae53..394903d36 100644 --- a/app/xlogo/Logo.c +++ b/app/xlogo/Logo.c @@ -111,7 +111,8 @@ LogoClassRec logoClassRec = { /* extension */ NULL }, { /* simple fields */ - /* change_sensitive */ XtInheritChangeSensitive + /* change_sensitive */ XtInheritChangeSensitive, + /* extension */ NULL }, { /* logo fields */ /* ignore */ 0 diff --git a/app/xlogo/Makefile.am b/app/xlogo/Makefile.am index 297448cac..bc0d8a9c8 100644 --- a/app/xlogo/Makefile.am +++ b/app/xlogo/Makefile.am @@ -22,6 +22,7 @@ SUBDIRS = man bin_PROGRAMS = xlogo +AM_CPPFLAGS = -D_CONST_X_STRING AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) xlogo_LDADD = $(XLOGO_LIBS) diff --git a/app/xlogo/Makefile.in b/app/xlogo/Makefile.in index 3801d39a7..02488937a 100644 --- a/app/xlogo/Makefile.in +++ b/app/xlogo/Makefile.in @@ -216,9 +216,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$$' @@ -339,6 +339,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -348,6 +349,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = man +AM_CPPFLAGS = -D_CONST_X_STRING AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) xlogo_LDADD = $(XLOGO_LIBS) xlogo_SOURCES = Logo.c Logo.h LogoP.h xlogo.c xlogo.h $(am__append_1) @@ -709,6 +711,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 +719,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/app/xlogo/aclocal.m4 b/app/xlogo/aclocal.m4 index 2a518c4b6..d0a818e1e 100644 --- a/app/xlogo/aclocal.m4 +++ b/app/xlogo/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/app/xlogo/compile b/app/xlogo/compile index 0fc915d98..ceec7cfb2 100644 --- a/app/xlogo/compile +++ b/app/xlogo/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,10 +340,10 @@ 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: #! /bin/sh diff --git a/app/xlogo/config.h.in b/app/xlogo/config.h.in index 69bc43a88..fea2d71c2 100644 --- a/app/xlogo/config.h.in +++ b/app/xlogo/config.h.in @@ -63,5 +63,8 @@ /* Version number of package */ #undef VERSION +/* Define to 1 to use XkbStdBell */ +#undef XKB + /* Define to 1 to use Xrender & Xft2 to draw logo */ #undef XRENDER diff --git a/app/xlogo/configure b/app/xlogo/configure index 279c47f73..2a590a088 100644 --- a/app/xlogo/configure +++ b/app/xlogo/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xlogo 1.0.5. +# Generated by GNU Autoconf 2.69 for xlogo 1.0.6. # -# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xlogo/issues>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xlogo/-/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/xlogo/issues +$0: https://gitlab.freedesktop.org/xorg/app/xlogo/-/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='xlogo' PACKAGE_TARNAME='xlogo' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='xlogo 1.0.5' -PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xlogo/issues' +PACKAGE_VERSION='1.0.6' +PACKAGE_STRING='xlogo 1.0.6' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xlogo/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -734,6 +734,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -762,6 +763,7 @@ enable_selective_werror enable_strict_compilation enable_silent_rules with_render +with_xkb with_appdefaultdir ' ac_precious_vars='build_alias @@ -818,6 +820,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}' @@ -1070,6 +1073,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=* \ @@ -1207,7 +1219,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. @@ -1320,7 +1332,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 xlogo 1.0.5 to adapt to many kinds of systems. +\`configure' configures xlogo 1.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,6 +1372,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] @@ -1390,7 +1403,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xlogo 1.0.5:";; + short | recursive ) echo "Configuration of xlogo 1.0.6:";; esac cat <<\_ACEOF @@ -1417,7 +1430,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-xrender Use Xrender & Xft2 to draw logo + --with-render Use Xrender & Xft2 to draw logo + --with-xkb Use XKB to sound bells --with-appdefaultdir=<pathname> specify directory for app-defaults files (default is autodetected) @@ -1447,7 +1461,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/xlogo/issues>. +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xlogo/-/issues>. _ACEOF ac_status=$? fi @@ -1510,7 +1524,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xlogo configure 1.0.5 +xlogo configure 1.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1767,7 +1781,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 xlogo $as_me 1.0.5, which was +It was created by xlogo $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2596,7 +2610,7 @@ fi # Define the identity of the package. PACKAGE='xlogo' - VERSION='1.0.5' + VERSION='1.0.6' cat >>confdefs.h <<_ACEOF @@ -10421,9 +10435,132 @@ AM_BACKSLASH='\' # Base set of required pkg-config packages XLOGO_DEPS="sm xaw7 xmu xt >= 1.0 xext x11" -# Use render & xft2 to draw logo? +# Ensure pkg-config is initialized, since first call to macros is conditional + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + +# Use render & xft2 to draw logo? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use render & xft2 to draw logo" >&5 +$as_echo_n "checking whether to use render & xft2 to draw logo... " >&6; } + # Check whether --with-render was given. if test "${with_render+set}" = set; then : withval=$with_render; USE_RENDER="$withval" @@ -10444,6 +10581,8 @@ else USE_RENDER="no" fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_RENDER" >&5 +$as_echo "$USE_RENDER" >&6; } if test "x$USE_RENDER" = "xyes" ; then XLOGO_DEPS="xft xrender $XLOGO_DEPS" @@ -10461,10 +10600,45 @@ else fi +# Use XKB to ring the bell? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use XkbStdBell" >&5 +$as_echo_n "checking whether to use XkbStdBell... " >&6; } + +# Check whether --with-xkb was given. +if test "${with_xkb+set}" = set; then : + withval=$with_xkb; USE_XKB="$withval" +else + USE_XKB="try" +fi + + +if test "x$USE_XKB" = "xtry" ; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xkbfile\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xkbfile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + USE_XKB="yes" +else + USE_XKB="no" +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_XKB" >&5 +$as_echo "$USE_XKB" >&6; } + +if test "x$USE_XKB" = "xyes" ; then + XLOGO_DEPS="xkbfile $XLOGO_DEPS" + + +$as_echo "#define XKB 1" >>confdefs.h + +fi + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLOGO" >&5 -$as_echo_n "checking for XLOGO... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XLOGO_DEPS" >&5 +$as_echo_n "checking for $XLOGO_DEPS... " >&6; } if test -n "$XLOGO_CFLAGS"; then pkg_cv_XLOGO_CFLAGS="$XLOGO_CFLAGS" @@ -10504,7 +10678,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 @@ -10531,7 +10705,7 @@ Alternatively, you may set the environment variables XLOGO_CFLAGS and XLOGO_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;} @@ -10555,8 +10729,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" @@ -10596,7 +10770,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 @@ -10623,7 +10797,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;} @@ -11195,7 +11369,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 xlogo $as_me 1.0.5, which was +This file was extended by xlogo $as_me 1.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11255,13 +11429,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to <https://gitlab.freedesktop.org/xorg/app/xlogo/issues>." +Report bugs to <https://gitlab.freedesktop.org/xorg/app/xlogo/-/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="\\ -xlogo config.status 1.0.5 +xlogo config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/app/xlogo/configure.ac b/app/xlogo/configure.ac index 3313dc00e..778ab76f6 100644 --- a/app/xlogo/configure.ac +++ b/app/xlogo/configure.ac @@ -1,5 +1,5 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -22,13 +22,13 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xlogo], [1.0.5], - [https://gitlab.freedesktop.org/xorg/app/xlogo/issues], [xlogo]) +AC_INIT([xlogo], [1.0.6], + [https://gitlab.freedesktop.org/xorg/app/xlogo/-/issues], [xlogo]) 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], @@ -39,15 +39,19 @@ XORG_DEFAULT_OPTIONS # Base set of required pkg-config packages XLOGO_DEPS="sm xaw7 xmu xt >= 1.0 xext x11" -# Use render & xft2 to draw logo? +# Ensure pkg-config is initialized, since first call to macros is conditional +PKG_PROG_PKG_CONFIG -AC_ARG_WITH(render, - AS_HELP_STRING([--with-xrender], [Use Xrender & Xft2 to draw logo]), +# Use render & xft2 to draw logo? +AC_MSG_CHECKING([whether to use render & xft2 to draw logo]) +AC_ARG_WITH(render, + AS_HELP_STRING([--with-render], [Use Xrender & Xft2 to draw logo]), USE_RENDER="$withval", USE_RENDER="try") if test "x$USE_RENDER" = "xtry" ; then PKG_CHECK_EXISTS([xrender xft], USE_RENDER="yes", USE_RENDER="no") fi +AC_MSG_RESULT([$USE_RENDER]) if test "x$USE_RENDER" = "xyes" ; then XLOGO_DEPS="xft xrender $XLOGO_DEPS" @@ -56,6 +60,23 @@ if test "x$USE_RENDER" = "xyes" ; then fi AM_CONDITIONAL([USE_RENDER], [test "x$USE_RENDER" = "xyes"]) +# Use XKB to ring the bell? +AC_MSG_CHECKING([whether to use XkbStdBell]) +AC_ARG_WITH(xkb, + AS_HELP_STRING([--with-xkb], [Use XKB to sound bells]), + USE_XKB="$withval", USE_XKB="try") + +if test "x$USE_XKB" = "xtry" ; then + PKG_CHECK_EXISTS([xkbfile], USE_XKB="yes", USE_XKB="no") +fi +AC_MSG_RESULT([$USE_XKB]) + +if test "x$USE_XKB" = "xyes" ; then + XLOGO_DEPS="xkbfile $XLOGO_DEPS" + + AC_DEFINE(XKB, 1, [Define to 1 to use XkbStdBell]) +fi + PKG_CHECK_MODULES(XLOGO, $XLOGO_DEPS) PKG_CHECK_MODULES(APPDEFS, xt) diff --git a/app/xlogo/man/Makefile.in b/app/xlogo/man/Makefile.in index 6b3655827..03cbe5486 100644 --- a/app/xlogo/man/Makefile.in +++ b/app/xlogo/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@ diff --git a/app/xlogo/xlogo.c b/app/xlogo/xlogo.c index 10b4d5c2f..1c41f8be8 100644 --- a/app/xlogo/xlogo.c +++ b/app/xlogo/xlogo.c @@ -117,7 +117,7 @@ Syntax(Widget toplevel) XtSetArg(arg, XtNconnection, &connection); XtGetValues(toplevel, &arg, (Cardinal)1); if (connection) - SmcCloseConnection(connection, n, reasons); + SmcCloseConnection(connection, n, (char **) reasons); else { for (i=0; i < n; i++) printf("%s", reasons[i]); |