Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xlsatoms for openSUSE:Factory checked in at 2026-10-09 21:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xlsatoms (Old) and /work/SRC/openSUSE:Factory/.xlsatoms.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xlsatoms" Fri Oct 9 21:43:18 2026 rev:10 rq:1383335 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/xlsatoms/xlsatoms.changes 2022-11-21 15:30:03.296788219 +0100 +++ /work/SRC/openSUSE:Factory/.xlsatoms.new.3698736/xlsatoms.changes 2026-10-09 21:43:19.766139976 +0200 @@ -1,0 +2,9 @@ +Tue Oct 6 20:43:08 UTC 2026 - Dirk Müller <[email protected]> + +- update to 1.1.5: + * meson: Add option to build with meson + * COPYING: Add missing Open Text copyright notice to file + * Strip trailing whitespace from source files + * man page: fix warnings from `mandoc -T lint` + +------------------------------------------------------------------- Old: ---- xlsatoms-1.1.4.tar.xz New: ---- xlsatoms-1.1.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xlsatoms.spec ++++++ --- /var/tmp/diff_new_pack.eimZsN/_old 2026-10-09 21:43:20.643176733 +0200 +++ /var/tmp/diff_new_pack.eimZsN/_new 2026-10-09 21:43:20.644176774 +0200 @@ -1,7 +1,7 @@ # # spec file for package xlsatoms # -# 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,19 +17,18 @@ Name: xlsatoms -Version: 1.1.4 +Version: 1.1.5 Release: 0 Summary: Utility to list interned atoms defined on an X11 server License: X11 Group: System/X11/Utilities -URL: http://xorg.freedesktop.org/ +URL: https://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xorg-macros) >= 1.3 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description xlsatoms lists the interned atoms defined on an X11 server. @@ -39,14 +38,14 @@ %build %configure -make %{?_smp_mflags} +%make_build %install %make_install %files -%defattr(-,root,root) -%doc ChangeLog COPYING README.md +%license COPYING +%doc ChangeLog README.md %{_bindir}/xlsatoms %{_mandir}/man1/xlsatoms.1%{?ext_man} ++++++ xlsatoms-1.1.4.tar.xz -> xlsatoms-1.1.5.tar.xz ++++++ ++++ 14618 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/xlsatoms-1.1.4/COPYING new/xlsatoms-1.1.5/COPYING --- old/xlsatoms-1.1.4/COPYING 2022-11-13 18:34:26.000000000 +0100 +++ new/xlsatoms-1.1.5/COPYING 2026-07-08 00:06:33.000000000 +0200 @@ -1,4 +1,5 @@ Copyright 1989, 1994, 1998 The Open Group +Copyright 2009 Open Text Corporation Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that 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/xlsatoms-1.1.4/ChangeLog new/xlsatoms-1.1.5/ChangeLog --- old/xlsatoms-1.1.4/ChangeLog 2022-11-13 18:34:37.000000000 +0100 +++ new/xlsatoms-1.1.5/ChangeLog 2026-07-08 00:06:43.000000000 +0200 @@ -1,3 +1,93 @@ +commit 95f8cc5656d8920ab00414e3b454ff0f0b4ee735 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jul 7 15:01:23 2026 -0700 + + xlsatoms 1.1.5 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e46176640968942ca109cb27f7b53716261ebb01 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 3 18:52:54 2026 -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/xlsatoms/-/merge_requests/7> + +commit 6ca4c0825fc03606e6ced6db526abf818f5a3380 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 3 18:32:48 2026 -0700 + + COPYING: Add missing Open Text copyright notice to file + + Fixes: 3e7bbf0 ("Convert xlsatoms to XCB") + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xlsatoms/-/merge_requests/7> + +commit 248cfb83073b57b4b1db0a74e0836148f7a23227 +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]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xlsatoms/-/merge_requests/7> + +commit ffc5e435177838ec3d522b1abad431f8f519ff03 +Author: Alan Coopersmith <[email protected]> +Date: Tue Aug 5 17:31:59 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/xlsatoms/-/merge_requests/6> + +commit 575ed85fc7f716266609674e3995c5237a4c6aaa +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 09:17:19 2025 -0700 + + man page: fix warnings from `mandoc -T lint` + + mandoc: xlsatoms.1:25:16: WARNING: cannot parse date, using it verbatim: TH xlsatoms 1.1.4 + mandoc: xlsatoms.1:39:2: WARNING: skipping paragraph macro: PP empty + mandoc: xlsatoms.1:66:2: WARNING: skipping paragraph macro: PP empty + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xlsatoms/-/merge_requests/5> + +commit fb89089f92b5611a88ff9f129d2a8264b15806d5 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 14:02:01 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/xlsatoms/-/merge_requests/4> + +commit 9659a5bf1183fc25e1af59c3e66fbaa1631f4b5d +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 13:51:03 2025 -0700 + + add -help option + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xlsatoms/-/merge_requests/4> + commit 28439223c8bafa32dc64504134e0a5fd8d2d16a3 Author: Alan Coopersmith <[email protected]> Date: Sun Nov 13 09:29:10 2022 -0800 @@ -644,7 +734,7 @@ configure cache, you cache it, and the cached value is probably wrong. commit 0dd5d7bf6f87df04b4d83ba5cc9356c6eed71088 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Tue Jul 5 22:51:10 2005 +0000 Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage, 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/xlsatoms-1.1.4/Makefile.am new/xlsatoms-1.1.5/Makefile.am --- old/xlsatoms-1.1.4/Makefile.am 2022-11-13 18:34:26.000000000 +0100 +++ new/xlsatoms-1.1.5/Makefile.am 2026-07-08 00:06:33.000000000 +0200 @@ -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/xlsatoms-1.1.4/compile new/xlsatoms-1.1.5/compile --- old/xlsatoms-1.1.4/compile 2022-11-13 18:34:32.000000000 +0100 +++ new/xlsatoms-1.1.5/compile 2026-07-08 00:06:37.000000000 +0200 @@ -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/xlsatoms-1.1.4/config.h.in new/xlsatoms-1.1.5/config.h.in --- old/xlsatoms-1.1.4/config.h.in 2022-11-13 18:34:31.000000000 +0100 +++ new/xlsatoms-1.1.5/config.h.in 2026-07-08 00:06:37.000000000 +0200 @@ -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/xlsatoms-1.1.4/configure.ac new/xlsatoms-1.1.5/configure.ac --- old/xlsatoms-1.1.4/configure.ac 2022-11-13 18:34:26.000000000 +0100 +++ new/xlsatoms-1.1.5/configure.ac 2026-07-08 00:06:33.000000000 +0200 @@ -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(xlsatoms, [1.1.4], +AC_INIT(xlsatoms, [1.1.5], [https://gitlab.freedesktop.org/xorg/app/xlsatoms/-/issues], xlsatoms) AC_CONFIG_SRCDIR([Makefile.am]) 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/xlsatoms-1.1.4/man/xlsatoms.man new/xlsatoms-1.1.5/man/xlsatoms.man --- old/xlsatoms-1.1.4/man/xlsatoms.man 2022-11-13 18:34:26.000000000 +0100 +++ new/xlsatoms-1.1.5/man/xlsatoms.man 2026-07-08 00:06:33.000000000 +0200 @@ -22,20 +22,20 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH XLSATOMS 1 __xorgversion__ +.TH XLSATOMS 1 2025-04-05 __xorgversion__ .SH NAME xlsatoms - list interned atoms defined on server .SH SYNOPSIS .B xlsatoms -[-options ...] +[\fIoptions\fP ...] .SH DESCRIPTION -.I Xlsatoms -lists the interned atoms. By default, all atoms starting from 1 (the lowest -atom value defined by the protocol) are listed until unknown atom is found. -If an explicit range is given, \fIxlsatoms\fP will try all atoms in the range, +.B Xlsatoms +lists the interned atoms. +By default, all atoms starting from 1 (the lowest +atom value defined by the protocol) are listed until an unknown atom is found. +If an explicit range is given, \fBxlsatoms\fP will try all atoms in the range, regardless of whether or not any are undefined. .SH "OPTIONS" -.PP .TP 8 .B \-display \fIdpy\fP This option specifies the X server to which to connect. @@ -43,23 +43,29 @@ .B \-format \fIstring\fP This option specifies a \fIprintf\fP-style string used to list each atom \fI<value,name>\fP pair, printed in that order (\fIvalue\fP is an \fIunsigned -long\fP and \fIname\fP is a \fIchar *\fP). \fIXlsatoms\fP will supply a -newline at the end of each line. The default is \fI%lu\\t%s\fP. +long\fP and \fIname\fP is a \fIchar *\fP). +\fBXlsatoms\fP will supply a newline at the end of each line. +The default is \fI%lu\\t%s\fP. .TP 8 .B \-range \fI[low]-[high]\fP -This option specifies the range of atom values to check. If \fIlow\fP is not -given, a value of 1 assumed. If \fIhigh\fP is not given, \fIxlsatoms\fP will -stop at the first undefined atom at or above \fIlow\fP. +This option specifies the range of atom values to check. +If \fIlow\fP is not given, a value of 1 assumed. +If \fIhigh\fP is not given, +\fBxlsatoms\fP will stop at the first undefined atom at or above \fIlow\fP. .TP 8 .B \-name \fIstring\fP -This option specifies the name of an atom to list. If the atom does not -exist, a message will be printed on the standard error. +This option specifies the name of an atom to list. +If the atom does not exist, a message will be printed on the standard error. .TP 8 -.B "-version" +.B \-help +Print out the program usage and exit. +.TP 8 +.B \-version Print out the program version and exit. -.PP .SH "SEE ALSO" -X(__miscmansuffix__), Xserver(__appmansuffix__), xprop(__appmansuffix__) +.BR X (__miscmansuffix__), +.BR Xserver (__appmansuffix__), +.BR xprop (__appmansuffix__) .SH ENVIRONMENT .TP 8 .B DISPLAY 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/xlsatoms-1.1.4/meson.build new/xlsatoms-1.1.5/meson.build --- old/xlsatoms-1.1.4/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xlsatoms-1.1.5/meson.build 2026-07-08 00:06:33.000000000 +0200 @@ -0,0 +1,76 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2026, 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( + 'xlsatoms', + 'c', + version: '1.1.5', + license: 'MIT-open-group', + license_files: 'COPYING', + meson_version: '>= 1.1.0', +) + +conf = configuration_data() +package_string = ' '.join(meson.project_name(), meson.project_version()) +conf.set_quoted('PACKAGE_STRING', package_string) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for pkg-config packages +dep_libxcb = dependency('xcb', required: true) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +executable( + 'xlsatoms', + [config_h, 'xlsatoms.c'], + dependencies: dep_libxcb, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xlsatoms.man', + input: 'man/xlsatoms.man', + output: 'xlsatoms.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-e', 's/__appmansuffix__/1/g', + '-e', 's/__miscmansuffix__/7/g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man1', + install_tag: 'man', +) 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/xlsatoms-1.1.4/missing new/xlsatoms-1.1.5/missing --- old/xlsatoms-1.1.4/missing 2022-11-13 18:34:32.000000000 +0100 +++ new/xlsatoms-1.1.5/missing 2026-07-08 00:06:37.000000000 +0200 @@ -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/xlsatoms-1.1.4/xlsatoms.c new/xlsatoms-1.1.5/xlsatoms.c --- old/xlsatoms-1.1.4/xlsatoms.c 2022-11-13 18:34:26.000000000 +0100 +++ new/xlsatoms-1.1.5/xlsatoms.c 2026-07-08 00:06:33.000000000 +0200 @@ -38,7 +38,7 @@ #include <xcb/xcb.h> #include <xcb/xproto.h> -#define ATOMS_PER_BATCH 100 /* This number can be tuned +#define ATOMS_PER_BATCH 100 /* This number can be tuned higher for fewer round-trips lower for less bandwidth wasted */ @@ -62,7 +62,7 @@ #if __has_attribute(noreturn) __attribute__((noreturn)) #endif -usage(const char *errmsg) +usage(const char *errmsg, int exitstatus) { if (errmsg != NULL) fprintf (stderr, "%s: %s\n\n", ProgramName, errmsg); @@ -73,9 +73,10 @@ " -format string printf-style format to use\n" " -range [num]-[num] atom values to list\n" " -name string name of single atom to print\n" + " -help print program usage\n" " -version print program version\n" ); - exit (1); + exit (exitstatus); } int @@ -95,38 +96,57 @@ if (arg[0] == '-') { switch (arg[1]) { case 'd': /* -display dpy */ - if (++i >= argc) usage ("-display requires an argument"); + if (++i >= argc) + usage ("-display requires an argument", EXIT_FAILURE); if (!doit) displayname = argv[i]; continue; case 'f': /* -format string */ - if (++i >= argc) usage ("-format requires an argument"); + if (++i >= argc) + usage ("-format requires an argument", EXIT_FAILURE); if (doit) format = argv[i]; continue; case 'r': /* -range num-[num] */ - if (++i >= argc) usage ("-range requires an argument"); + if (++i >= argc) + usage ("-range requires an argument", EXIT_FAILURE); if (doit) { do_range (c, format, argv[i]); didit = 1; } continue; case 'n': /* -name string */ - if (++i >= argc) usage ("-name requires an argument"); + if (++i >= argc) + usage ("-name requires an argument", EXIT_FAILURE); if (doit) { do_name (c, format, argv[i]); didit = 1; } continue; + case 'h': + if (strcmp(arg, "-help") == 0) { + usage (NULL, EXIT_SUCCESS); + } + goto unknown; case 'v': if (strcmp(arg, "-version") == 0) { puts(PACKAGE_STRING); - exit(0); + exit(EXIT_SUCCESS); + } + goto unknown; + case '-': + if (strcmp(arg, "--help") == 0) { + usage (NULL, EXIT_SUCCESS); } - /* else FALLTHROUGH to unrecognized arg case below */ + else if (strcmp(arg, "--version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + goto unknown; } } + unknown: fprintf (stderr, "%s: unrecognized argument %s\n\n", ProgramName, arg); - usage (NULL); + usage (NULL, EXIT_FAILURE); } if (!doit) { DisplayString = displayname; @@ -138,7 +158,7 @@ if (!c || xcb_connection_has_error(c)) { fprintf (stderr, "%s: unable to open display \"%s\"\n", ProgramName, DisplayString); - exit (1); + exit (EXIT_FAILURE); } } else if (!didit) /* no options, default is list all */ @@ -146,13 +166,13 @@ } xcb_disconnect(c); - exit (0); + exit (EXIT_SUCCESS); } static void do_name(xcb_connection_t *c, const char *format, char *name) { - xcb_intern_atom_reply_t *a = xcb_intern_atom_reply(c, + xcb_intern_atom_reply_t *a = xcb_intern_atom_reply(c, xcb_intern_atom_unchecked(c, 1, strlen(name), name), NULL); if (a && a->atom != XCB_NONE) { @@ -186,7 +206,7 @@ return 0; } -static int +static int parse_range(char *range, xcb_atom_t *lowp, xcb_atom_t *highp) { char *dash; @@ -229,7 +249,7 @@ return mask; invalid: fprintf(stderr, "%s: invalid range: %s\n", ProgramName, range); - exit(1); + exit(EXIT_FAILURE); } static void
