Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xkill for openSUSE:Factory checked in at 2026-01-26 11:06:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkill (Old) and /work/SRC/openSUSE:Factory/.xkill.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkill" Mon Jan 26 11:06:23 2026 rev:10 rq:1329107 version:1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/xkill/xkill.changes 2022-11-14 14:28:58.562966620 +0100 +++ /work/SRC/openSUSE:Factory/.xkill.new.1928/xkill.changes 2026-01-26 11:06:25.356271448 +0100 @@ -1,0 +2,11 @@ +Sun Jan 25 21:39:39 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.7 + * meson: Add option to build with meson + * add -help option + * Accept --help & --version as aliases to -help & -version + * man page: fix warnings from `mandoc -T lint` + * Strip trailing whitespace from source files + * gitlab CI: drop the ci-fairy check-mr job + +------------------------------------------------------------------- Old: ---- xkill-1.0.6.tar.xz New: ---- xkill-1.0.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkill.spec ++++++ --- /var/tmp/diff_new_pack.bIVFJn/_old 2026-01-26 11:06:26.068301220 +0100 +++ /var/tmp/diff_new_pack.bIVFJn/_new 2026-01-26 11:06:26.068301220 +0100 @@ -1,7 +1,7 @@ # # spec file for package xkill # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xkill -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Utility to kill a client by its X resource License: X11 @@ -25,6 +25,7 @@ URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz Source1: xkill.desktop +BuildRequires: meson BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) @@ -45,11 +46,11 @@ cp %{SOURCE1} . %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file -i -u xkill Utility DesktopUtility %files ++++++ xkill-1.0.6.tar.xz -> xkill-1.0.7.tar.xz ++++++ ++++ 10547 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/ChangeLog new/xkill-1.0.7/ChangeLog --- old/xkill-1.0.6/ChangeLog 2022-11-13 01:03:49.000000000 +0100 +++ new/xkill-1.0.7/ChangeLog 2026-01-25 19:11:23.000000000 +0100 @@ -1,3 +1,81 @@ +commit 6b2948f43fa97824b53b602ee97204d3c2b9658c +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 25 10:02:44 2026 -0800 + + xkill 1.0.7 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 53d46e31c1f18185f1784d47d13429c3de2dc2fc +Author: Alan Coopersmith <[email protected]> +Date: Sun Jan 11 11:20:41 2026 -0800 + + gitlab CI: drop the ci-fairy check-mr job + + The only thing this checked was the checkbox for allowing maintainers to + edit the MR. Changed permissions checks now fail this job but luckily + the setting it checked has been the default for years anyway so we can + drop it. + + https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/81 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit b803eb22bca91094a476dc630b610e34e3b517f9 +Author: Alan Coopersmith <[email protected]> +Date: Tue Aug 5 17:29:34 2025 -0700 + + Strip trailing whitespace from source files + + Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'` + + `git diff -w` & `git diff -b` show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkill/-/merge_requests/7> + +commit 053126121964bb12625a83d767a57dbc03d48028 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 09:07:03 2025 -0700 + + man page: fix warnings from `mandoc -T lint` + + mandoc: xkill.1:25:13: WARNING: cannot parse date, using it verbatim: TH xkill 1.0.6 + mandoc: xkill.1:35:2: WARNING: skipping paragraph macro: PP after SH + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkill/-/merge_requests/6> + +commit 170583b92c7461f887c1b64209cf7233f8e78521 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 12:39:39 2025 -0700 + + Accept --help & --version as aliases to -help & -version + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkill/-/merge_requests/5> + +commit bff05ac9f910eee57b05b11f68906659487a4462 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 12:25:24 2025 -0700 + + add -help option + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkill/-/merge_requests/5> + +commit 943f4d7eb66615dcd786492f46b578a8cd588825 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 9 15:17:42 2025 -0700 + + meson: Add option to build with meson + + Also updates the gitlab CI config to test both build types + and compare the generated output/installed files. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkill/-/merge_requests/4> + commit a5f704e4cd30f03859f66bafd609a75aae27cc8c Author: Alan Coopersmith <[email protected]> Date: Sat Nov 12 16:01:03 2022 -0800 @@ -585,7 +663,7 @@ configure cache, you cache it, and the cached value is probably wrong. commit 8d94211de5403640c6fc532952d0c4c923bd90b1 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Tue Jul 5 21:13:49 2005 +0000 build system for xkill diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/Makefile.am new/xkill-1.0.7/Makefile.am --- old/xkill-1.0.6/Makefile.am 2022-11-13 01:03:40.000000000 +0100 +++ new/xkill-1.0.7/Makefile.am 2026-01-25 19:11:14.000000000 +0100 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -40,4 +40,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/compile new/xkill-1.0.7/compile --- old/xkill-1.0.6/compile 2022-11-13 01:03:44.000000000 +0100 +++ new/xkill-1.0.7/compile 2026-01-25 19:11:18.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2025 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -37,11 +37,11 @@ file_conv= -# func_file_conv build_file lazy +# func_file_conv build_file unneeded_conversions # Convert a $build file to $host form and store it in $file # Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. +# type is listed in (the comma separated) UNNEEDED_CONVERSIONS, no +# conversion will take place. func_file_conv () { file=$1 @@ -51,9 +51,20 @@ # lazily determine how to convert abs files case `uname -s` in MINGW*) - file_conv=mingw + if test -n "$MSYSTEM" && (cygpath --version) >/dev/null 2>&1; then + # MSYS2 environment. + file_conv=cygwin + else + # Original MinGW environment. + file_conv=mingw + fi ;; - CYGWIN* | MSYS*) + MSYS*) + # Old MSYS environment, or MSYS2 with 32-bit MSYS2 shell. + file_conv=cygwin + ;; + CYGWIN*) + # Cygwin environment. file_conv=cygwin ;; *) @@ -63,12 +74,14 @@ fi case $file_conv/,$2, in *,$file_conv,*) + # This is the optimization mentioned above: + # If UNNEEDED_CONVERSIONS contains $file_conv, don't convert. ;; mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` + cygwin/*) + file=`cygpath -w "$file" || echo "$file"` ;; wine/*) file=`winepath -w "$file" || echo "$file"` @@ -143,7 +156,7 @@ # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in - *.o | *.[oO][bB][jJ]) + *.o | *.lo | *.[oO][bB][jJ]) func_file_conv "$2" set x "$@" -Fo"$file" shift @@ -248,14 +261,17 @@ right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>. EOF exit $? ;; -v | --v*) - echo "compile $scriptversion" + echo "compile (GNU Automake) $scriptversion" exit $? ;; cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; @@ -340,9 +356,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/config.h.in new/xkill-1.0.7/config.h.in --- old/xkill-1.0.6/config.h.in 2022-11-13 01:03:44.000000000 +0100 +++ new/xkill-1.0.7/config.h.in 2026-01-25 19:11:18.000000000 +0100 @@ -57,7 +57,7 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/configure.ac new/xkill-1.0.7/configure.ac --- old/xkill-1.0.6/configure.ac 2022-11-13 01:03:40.000000000 +0100 +++ new/xkill-1.0.7/configure.ac 2026-01-25 19:11:14.000000000 +0100 @@ -1,6 +1,6 @@ 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 @@ -10,7 +10,7 @@ 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 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkill], [1.0.6], +AC_INIT([xkill], [1.0.7], [https://gitlab.freedesktop.org/xorg/app/xkill/-/issues], [xkill]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/man/xkill.man new/xkill-1.0.7/man/xkill.man --- old/xkill-1.0.6/man/xkill.man 2022-11-13 01:03:40.000000000 +0100 +++ new/xkill-1.0.7/man/xkill.man 2026-01-25 19:11:14.000000000 +0100 @@ -22,22 +22,25 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH XKILL 1 __xorgversion__ +.TH XKILL 1 2025-04-05 __xorgversion__ .SH NAME xkill - kill a client by its X resource .SH SYNOPSIS -.B "xkill" -[\-display \fIdisplayname\fP] [\-id \fIresource\fP] [\-button number] [\-frame] [\-all] [\-version] +.nf +\fBxkill\fP [\fB\-display\fP \fIdisplayname\fP] [\fB\-id\fP \fIresource\fP] \ +[\fB\-button\fP \fInumber\fP] [\fB\-frame\fP] + [\fB\-all\fP] [\fB-help\fP|\fB\-version\fP] +.fi .SH DESCRIPTION -.PP -.I Xkill -is a utility for forcing the X server to close connections to clients. This -program is very dangerous, but is useful for aborting programs that have -displayed undesired windows on a user's screen. If no resource identifier -is given with \fI-id\fP, \fIxkill\fP will display a special cursor -as a prompt for the user to select a window to be killed. If a pointer button -is pressed over a non-root window, the server will close its connection to -the client that created the window. +.B Xkill +is a utility for forcing the X server to close connections to clients. +This program is very dangerous, but is useful for aborting programs that have +displayed undesired windows on a user's screen. +If no resource identifier is given with \fB-id\fP, +\fBxkill\fP will display a special cursor +as a prompt for the user to select a window to be killed. +If a pointer button is pressed over a non-root window, +the server will close its connection to the client that created the window. .SH OPTIONS .TP 8 .B \-display \fIdisplayname\fP @@ -45,46 +48,52 @@ .TP 8 .B \-id \fIresource\fP This option specifies the X identifier for the resource whose creator is -to be aborted. If no resource is specified, \fIxkill\fP will display a +to be aborted. +If no resource is specified, \fBxkill\fP will display a special cursor with which you should select a window to be kill. .TP 8 .B \-button \fInumber\fP This option specifies the number of pointer button that should be used in selecting a window to kill. -If the word "any" is specified, any button on the pointer may be used. By -default, the first button in the pointer map (which is usually the leftmost +If the word "any" is specified, any button on the pointer may be used. +By default, the first button in the pointer map (which is usually the leftmost button) is used. .TP 8 .B \-all This option indicates that all clients with top-level windows on the screen -should be killed. \fIXkill\fP will ask you to select the root window with +should be killed. +\fBXkill\fP will ask you to select the root window with each of the currently defined buttons to give you several chances to abort. Use of this option is highly discouraged. .TP 8 .B \-frame This option indicates that xkill should ignore the standard conventions for -finding top-level client windows (which are typically nested inside a window -manager window), and simply believe that you want to kill direct children of -the root. +finding top-level client windows +(which are typically nested inside a window manager window), +and simply believe that you want to kill direct children of the root. +.TP 8 +.B \-help +This option makes xkill print a usage message and exit without killing anything. .TP 8 .B \-version This option makes xkill print its version and exit without killing anything. .SH CAVEATS This command does not provide any warranty that the application whose -connection to the X server is closed will abort nicely, or even abort -at all. All this command does is to close the connection to the X -server. Many existing applications do indeed abort when their -connection to the X server is closed, but some can choose to -continue. +connection to the X server is closed will abort nicely, or even abort at all. +All this command does is to close the connection to the X server. +Many existing applications do indeed abort when their +connection to the X server is closed, but some can choose to continue. .SH XDEFAULTS .TP 8 .B Button Specifies a specific pointer button number or the word "any" to use when selecting windows. .SH "SEE ALSO" -X(__miscmansuffix__), xwininfo(__appmansuffix__), -XKillClient(__libmansuffix__), XGetPointerMapping(__libmansuffix__), -KillClient in the X Protocol Specification +.BR xwininfo (__appmansuffix__), +.BR XKillClient (__libmansuffix__), +.BR XGetPointerMapping (__libmansuffix__), +.BR X (__miscmansuffix__), +\fBKillClient\fP in the \fIX Protocol Specification\fP .SH AUTHOR Jim Fulton, MIT X Consortium .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/meson.build new/xkill-1.0.7/meson.build --- old/xkill-1.0.6/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xkill-1.0.7/meson.build 2026-01-25 19:11:14.000000000 +0100 @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2025, 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"), +# 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 (including the next +# paragraph) 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 +# THE AUTHORS OR COPYRIGHT HOLDERS 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. +# + +project( + 'xkill', + 'c', + version: '1.0.7', + license: 'MIT-open-group', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf = configuration_data() +conf.set_quoted('PACKAGE_STRING', package_string) +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +# Replacement for XORG_DEFAULT_OPTIONS +cc = meson.get_compiler('c') +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for pkg-config packages +dep_libxmuu = dependency('xmuu', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.22') +deps = [dep_libxmuu, dep_libx11, dep_xproto] + +executable( + 'xkill', + [config_h, 'xkill.c'], + dependencies: deps, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xkill.man', + input: 'man/xkill.man', + output: 'xkill.1', + command: [ + prog_sed, + '-e', 's/__xorgversion__/"@0@" "X Version 11"/'.format(package_string), + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__libmansuffix__/3/g', + '-e', 's/__filemansuffix__/5/g', + '-e', 's/__miscmansuffix__/7/g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/missing new/xkill-1.0.7/missing --- old/xkill-1.0.6/missing 2022-11-13 01:03:44.000000000 +0100 +++ new/xkill-1.0.7/missing 2026-01-25 19:11:18.000000000 +0100 @@ -1,9 +1,11 @@ #! /bin/sh -# Common wrapper for a few potentially missing GNU programs. +# Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells + +# Copyright (C) 1996-2025 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -54,18 +56,20 @@ -v, --version output version information and exit Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man +aclocal autoconf autogen autoheader autom4te automake autoreconf +bison flex help2man lex makeinfo perl yacc Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. -Send bug reports to <[email protected]>." +Report bugs to <[email protected]>. +GNU Automake home page: <https://www.gnu.org/software/automake/>. +General help using GNU software: <https://www.gnu.org/gethelp/>." exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" + echo "missing (GNU Automake) $scriptversion" exit $? ;; @@ -108,7 +112,7 @@ program_details () { case $1 in - aclocal|automake) + aclocal|automake|autoreconf) echo "The '$1' program is part of the GNU Automake package:" echo "<$gnu_software_URL/automake>" echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" @@ -123,6 +127,9 @@ echo "<$gnu_software_URL/m4/>" echo "<$perl_URL>" ;; + *) + : + ;; esac } @@ -137,48 +144,55 @@ printf '%s\n' "'$1' is $msg." configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + autoheader_deps="'acconfig.h'" + automake_deps="'Makefile.am'" + aclocal_deps="'acinclude.m4'" case $normalized_program in + aclocal*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$configure_deps." + ;; autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' + echo "You should only need it if you modified $configure_deps." + ;; + autogen*) + echo "You should only need it if you modified a '.def' or '.tpl' file." + echo "You may want to install the GNU AutoGen package:" + echo "<$gnu_software_URL/autogen/>" ;; autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" + echo "You should only need it if you modified $autoheader_deps or" echo "$configure_deps." - program_details 'autoheader' ;; automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" + echo "You should only need it if you modified $automake_deps or" echo "$configure_deps." - program_details 'aclocal' ;; - autom4te*) + autom4te*) echo "You might have modified some maintainer files that require" echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' + ;; + autoreconf*) + echo "You should only need it if you modified $aclocal_deps or" + echo "$automake_deps or $autoheader_deps or $automake_deps or" + echo "$configure_deps." ;; bison*|yacc*) echo "You should only need it if you modified a '.y' file." echo "You may want to install the GNU Bison package:" echo "<$gnu_software_URL/bison/>" ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; help2man*) echo "You should only need it if you modified a dependency" \ "of a man page." echo "You may want to install the GNU Help2man package:" echo "<$gnu_software_URL/help2man/>" ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; makeinfo*) echo "You should only need it if you modified a '.texi' file, or" echo "any other file indirectly affecting the aspect of the manual." @@ -189,6 +203,12 @@ echo "want to install GNU make:" echo "<$gnu_software_URL/make/>" ;; + perl*) + echo "You should only need it to run GNU Autoconf, GNU Automake, " + echo " assorted other tools, or if you modified a Perl source file." + echo "You may want to install the Perl 5 language interpreter:" + echo "<$perl_URL>" + ;; *) echo "You might have modified some files without having the proper" echo "tools for further handling them. Check the 'README' file, it" @@ -197,6 +217,7 @@ echo "case some other package contains this missing '$1' program." ;; esac + program_details "$normalized_program" } give_advice "$1" | sed -e '1s/^/WARNING: /' \ @@ -207,9 +228,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xkill-1.0.6/xkill.c new/xkill-1.0.7/xkill.c --- old/xkill-1.0.6/xkill.c 2022-11-13 01:03:40.000000000 +0100 +++ new/xkill-1.0.7/xkill.c 2026-01-25 19:11:14.000000000 +0100 @@ -73,7 +73,7 @@ } static void _X_NORETURN -usage(const char *errmsg) +usage(const char *errmsg, int exitstatus) { const char *options = "where options include:\n" @@ -90,7 +90,7 @@ fprintf (stderr, "usage: %s [-option ...]\n%s", ProgramName, options); - Exit (1, NULL); + Exit (exitstatus, NULL); } int @@ -114,20 +114,23 @@ if (arg[0] == '-') { switch (arg[1]) { case 'd': /* -display displayname */ - if (++i >= argc) usage ("-display requires an argument"); + if (++i >= argc) + usage ("-display requires an argument", EXIT_FAILURE); displayname = argv[i]; continue; case 'i': /* -id resourceid */ - if (++i >= argc) usage ("-id requires an argument"); + if (++i >= argc) + usage ("-id requires an argument", EXIT_FAILURE); id = strtoul (argv[i], NULL, 0); if (id == 0 || id >= 0xFFFFFFFFU) { fprintf (stderr, "%s: invalid id \"%s\"\n", ProgramName, argv[i]); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } continue; case 'b': /* -button number */ - if (++i >= argc) usage ("-button requires an argument"); + if (++i >= argc) + usage ("-button requires an argument", EXIT_FAILURE); button_name = argv[i]; continue; case 'f': /* -frame */ @@ -136,18 +139,31 @@ case 'a': /* -all */ kill_all = True; continue; + case 'h': + if (strcmp(argv[i], "-help") == 0) + usage (NULL, EXIT_SUCCESS); + else + goto unknown; case 'v': puts(PACKAGE_STRING); - exit(0); + exit(EXIT_SUCCESS); + case '-': + if (strcmp(argv[i], "--help") == 0) + usage (NULL, EXIT_SUCCESS); + else if (strcmp(argv[i], "--version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + else + goto unknown; default: - fprintf(stderr, "%s: unrecognized argument %s\n\n", - ProgramName, arg); - usage (NULL); + goto unknown; } } else { - fprintf(stderr, "%s: unrecognized argument %s\n\n", - ProgramName, arg); - usage (NULL); + unknown: + fprintf(stderr, "%s: unrecognized argument %s\n\n", + ProgramName, arg); + usage (NULL, EXIT_FAILURE); } } /* end for */ @@ -155,14 +171,14 @@ if (!dpy) { fprintf (stderr, "%s: unable to open display \"%s\"\n", ProgramName, XDisplayName (displayname)); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } screenno = DefaultScreen (dpy); if (kill_all) { - if (verify_okay_to_kill (dpy, screenno)) + if (verify_okay_to_kill (dpy, screenno)) kill_all_windows (dpy, screenno, top); - Exit (0, dpy); + Exit (EXIT_SUCCESS, dpy); } /* @@ -176,7 +192,7 @@ if (button_name && !parse_button (button_name, &button)) { fprintf (stderr, "%s: invalid button specification \"%s\"\n", ProgramName, button_name); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } if (button >= 0 || button == SelectButtonFirst) { @@ -187,10 +203,10 @@ count = XGetPointerMapping (dpy, pointer_map, 256); if (count <= 0) { - fprintf (stderr, + fprintf (stderr, "%s: no pointer mapping, can't select window\n", ProgramName); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } if (button >= 0) { /* check button */ @@ -203,7 +219,7 @@ fprintf (stderr, "%s: no button number %u in pointer map, can't select window\n", ProgramName, ub); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } } else { /* get first entry */ button = (int) ((unsigned int) pointer_map[0]); @@ -215,7 +231,7 @@ else if (!top) { XID indicated = id; if ((id = XmuClientWindow(dpy, indicated)) == indicated) { - + /* Try not to kill the window manager when the user * indicates an icon to xkill. */ @@ -223,7 +239,7 @@ if (! wm_state_set(dpy, id) && wm_running(dpy, screenno)) id = None; - } + } } } } @@ -235,12 +251,12 @@ XSync (dpy, 0); } - Exit (0, dpy); + Exit (EXIT_SUCCESS, dpy); /*NOTREACHED*/ return 0; } -static int +static int parse_button(const char *s, int *buttonp) { if (strcasecmp (s, "any") == 0) { @@ -257,7 +273,7 @@ return (1); } -static XID +static XID get_window_id(Display *dpy, int screen, int button, const char *msg) { Cursor cursor; /* cursor to use when selecting */ @@ -273,7 +289,7 @@ if (cursor == None) { fprintf (stderr, "%s: unable to create selection cursor\n", ProgramName); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } printf ("Select %s with ", msg); @@ -284,10 +300,10 @@ printf ("....\n"); XSync (dpy, 0); /* give xterm a chance */ - if (XGrabPointer (dpy, root, False, MASK, GrabModeSync, GrabModeAsync, + if (XGrabPointer (dpy, root, False, MASK, GrabModeSync, GrabModeAsync, None, cursor, CurrentTime) != GrabSuccess) { fprintf (stderr, "%s: unable to grab cursor\n", ProgramName); - Exit (1, dpy); + Exit (EXIT_FAILURE, dpy); } /* from dsimple.c in xwininfo */ @@ -319,13 +335,13 @@ } -static int +static int catch_window_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev) { return 0; } -static int +static int kill_all_windows(Display *dpy, int screenno, Bool top) { Window root = RootWindow (dpy, screenno); @@ -364,7 +380,7 @@ /* * ask the user to press in the root with each button in succession */ -static int +static int verify_okay_to_kill(Display *dpy, int screenno) { unsigned char pointer_map[256]; @@ -393,8 +409,8 @@ /* Return True if the property WM_STATE is set on the window, otherwise * return False. */ -static Bool -wm_state_set(Display *dpy, Window win) +static Bool +wm_state_set(Display *dpy, Window win) { Atom wm_state; Atom actual_type; @@ -405,7 +421,7 @@ wm_state = XInternAtom(dpy, "WM_STATE", True); if (wm_state == None) return False; - success = XGetWindowProperty(dpy, win, wm_state, 0L, 0L, False, + success = XGetWindowProperty(dpy, win, wm_state, 0L, 0L, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &remaining, &prop); if (prop) XFree((char *) prop); @@ -416,7 +432,7 @@ * otherwise, return False. */ -static Bool +static Bool wm_running(Display *dpy, int screenno) { XWindowAttributes xwa;
