Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xset for openSUSE:Factory checked in at 2026-07-12 16:20:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xset (Old) and /work/SRC/openSUSE:Factory/.xset.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xset" Sun Jul 12 16:20:01 2026 rev:13 rq:1364908 version:1.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xset/xset.changes 2023-04-27 19:59:32.917436708 +0200 +++ /work/SRC/openSUSE:Factory/.xset.new.1991/xset.changes 2026-07-12 16:20:07.493884103 +0200 @@ -1,0 +2,8 @@ +Fri Jul 10 09:29:09 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.6: + * Switch to Meson build system. + * Add GPG validation for source archives. + * The new release includes bugfixes. + +------------------------------------------------------------------- Old: ---- xset-1.2.5.tar.xz New: ---- xset-1.2.6.tar.xz xset-1.2.6.tar.xz.sig xset.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xset.spec ++++++ --- /var/tmp/diff_new_pack.ptlbuq/_old 2026-07-12 16:20:09.361947998 +0200 +++ /var/tmp/diff_new_pack.ptlbuq/_new 2026-07-12 16:20:09.377948546 +0200 @@ -1,7 +1,7 @@ # # spec file for package xset # -# Copyright (c) 2023 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,18 +17,20 @@ Name: xset -Version: 1.2.5 +Version: 1.2.6 Release: 0 Summary: User preference utility for X License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +Source1: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz.sig +Source2: xset.keyring +BuildRequires: meson >= 1.1.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xmuu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 @@ -41,11 +43,11 @@ %autosetup %build -%configure -%make_build +%meson -Dxf86misc=disabled -Dfontcache=disabled +%meson_build %install -%make_install +%meson_install %files %license COPYING ++++++ xset-1.2.5.tar.xz -> xset-1.2.6.tar.xz ++++++ ++++ 15681 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/xset-1.2.5/COPYING new/xset-1.2.6/COPYING --- old/xset-1.2.5/COPYING 2022-12-04 01:09:32.000000000 +0100 +++ new/xset-1.2.6/COPYING 2026-07-10 02:27:16.000000000 +0200 @@ -1,3 +1,5 @@ +SPDX-License-Identifier: MIT-open-group + Copyright 1985, 1988, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its 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/xset-1.2.5/ChangeLog new/xset-1.2.6/ChangeLog --- old/xset-1.2.5/ChangeLog 2022-12-04 01:09:41.000000000 +0100 +++ new/xset-1.2.6/ChangeLog 2026-07-10 02:27:27.000000000 +0200 @@ -1,3 +1,83 @@ +commit 498f661ca0a725a4750e3e7c091c5752b1a52bd8 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 9 17:11:54 2026 -0700 + + xset 1.2.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3818c2ecf9d4772520a4c05acc2cc243c6280384 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 10 13:02:07 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/xset/-/merge_requests/9> + +commit 786a955faa0d8ca07077041ffd93d55e60fcd7f4 +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/xset/-/merge_requests/9> + +commit 3fadaad29df656b69a64c463dd68dc35d09274b3 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 12:35:19 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xset.1:143:81: STYLE: input text line longer than 80 bytes: The \fB\-fp\fP and \... + mandoc: xset.1:25:12: WARNING: cannot parse date, using it verbatim: TH xset 1.2.5 + an.tmac:xset.1:236: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xset/-/merge_requests/8> + +commit 0e9b4418491023548d5555a9db5b763111bcd2c0 +Author: Bjarni Ingi Gislason <[email protected]> +Date: Mon Jun 3 00:37:48 2024 +0000 + + xset.1: some editorial changes for this man page [Debian bug #1072502] + + Originally from https://bugs.debian.org/1072502 + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xset/-/merge_requests/7> + +commit de066767b031312d76c3f7e4d71d8ab887fd52d3 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 12 12:07:47 2025 -0700 + + Improve man page formatting + + More closely follow common style as described on + https://man7.org/linux/man-pages/man7/man-pages.7.html + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xset/-/merge_requests/7> + +commit 849b0d42f4cc0e54c56778626effe1e9f1ef238e +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 11 17:16:16 2023 -0800 + + Add -help option + + Signed-off-by: Alan Coopersmith <[email protected]> + commit fca58c426ef4eef0c000bfa2758e82e1d1b170e2 Author: Alan Coopersmith <[email protected]> Date: Sat Dec 3 16:06:57 2022 -0800 @@ -1017,13 +1097,13 @@ configure cache, you cache it, and the cached value is probably wrong. commit 6467b9f9b57d56d502e97260261745742a7645c7 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Thu Jul 14 22:40:16 2005 +0000 Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch commit aba3f11253842b810676ae26efb20f9658182097 -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Fri Jul 1 18:21:15 2005 +0000 Build system for xset @@ -1054,7 +1134,7 @@ libXaw. commit 735853aa5531434c951de4c2cd2b75b8ce7148ba -Author: Kristian Høgsberg <[email protected]> +Author: Kristian Høgsberg <[email protected]> Date: Mon Aug 16 16:36:27 2004 +0000 As discussed and agreed on on the release-wranglers meeting of August 16, 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/xset-1.2.5/Makefile.am new/xset-1.2.6/Makefile.am --- old/xset-1.2.5/Makefile.am 2022-12-04 01:09:32.000000000 +0100 +++ new/xset-1.2.6/Makefile.am 2026-07-10 02:27:16.000000000 +0200 @@ -48,4 +48,4 @@ XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build meson.options 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/xset-1.2.5/compile new/xset-1.2.6/compile --- old/xset-1.2.5/compile 2022-12-04 01:09:36.000000000 +0100 +++ new/xset-1.2.6/compile 2026-07-10 02:27:20.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/xset-1.2.5/config.h.in new/xset-1.2.6/config.h.in --- old/xset-1.2.5/config.h.in 2022-12-04 01:09:35.000000000 +0100 +++ new/xset-1.2.6/config.h.in 2026-07-10 02:27:20.000000000 +0200 @@ -30,7 +30,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ +/* Define to 1 if you have the 'usleep' function. */ #undef HAVE_USLEEP /* Define to 1 if you have the <wchar.h> header file. */ @@ -87,15 +87,19 @@ /* 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 -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable extensions on Cosmopolitan Libc. */ +#ifndef _COSMO_SOURCE +# undef _COSMO_SOURCE +#endif /* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE @@ -153,11 +157,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif 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/xset-1.2.5/configure.ac new/xset-1.2.6/configure.ac --- old/xset-1.2.5/configure.ac 2022-12-04 01:09:32.000000000 +0100 +++ new/xset-1.2.6/configure.ac 2026-07-10 02:27:16.000000000 +0200 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xset], [1.2.5], +AC_INIT([xset], [1.2.6], [https://gitlab.freedesktop.org/xorg/app/xset/-/issues], [xset]) 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/xset-1.2.5/man/xset.man new/xset-1.2.6/man/xset.man --- old/xset-1.2.5/man/xset.man 2022-12-04 01:09:32.000000000 +0100 +++ new/xset-1.2.6/man/xset.man 2026-07-10 02:27:16.000000000 +0200 @@ -22,131 +22,112 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH XSET 1 __xorgversion__ +.TH XSET 1 2025-04-12 __xorgversion__ .SH NAME xset - user preference utility for X .SH SYNOPSIS -.B xset -[-display \fIdisplay\fP] -.br -[-b] [b {on|off}] [b [\fIvolume\fP [\fIpitch\fP [\fIduration\fP]]]] -.br -[-bc] [bc] -.br -[-c] [c {on|off}] [c [\fIvolume\fP]] -.br -[+dpms] [-dpms] -.br - [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] -.br - [dpms force {standby|suspend|off|on}] -.br -[fp=\fIpathlist\fP] -[-fp=\fIpathlist\fP] -[+fp=\fIpathlist\fP] -[fp-\fIpathlist\fP] -[fp+\fIpathlist\fP] -.br -[fp default] [fp rehash] -.br -[-led [\fIinteger\fP|named \fIindicator\fP]] -[led [\fIinteger\fP|named \fIindicator\fP]] -.br -[led {on|off}] -.br -[mouse [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [mouse default] -.br -[p \fIpixel\fP \fIcolor\fP] -.br -[-r [keycode]] [r [keycode]] -[r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]] -.br -[s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}] -.br -[s {expose|noexpose}] [s {on|off}] [s default] [s activate] [s reset] -.br -[q] -.br -[-version] +.nf +\fBxset\fP [\fB\-display\fP \fIdisplay\fP] + [\fB\-b\fP] [\fBb\fP {\fBon\fP|\fBoff\fP}] [\fBb\fP [\fIvolume\fP [\fIpitch\fP [\fIduration\fP]]]] + [\fB\-bc\fP] [\fBbc\fP] + [\fB\-c\fP] [\fBc\fP {\fBon\fP|\fBoff\fP}] [\fBc\fP [\fIvolume\fP]] + [\fB+dpms\fP] [\fB\-dpms\fP] + [\fBdpms\fP \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] + [\fBdpms force\fP {\fBstandby\fP|\fBsuspend\fP|\fBoff\fP|\fBon\fP}] + [\fBfp=\fP\fIpathlist\fP] [\fB\-fp=\fP\fIpathlist\fP] [\fB+fp=\fP\fIpathlist\fP] + [\fBfp\-\fP\fIpathlist\fP] [\fBfp+\fP\fIpathlist\fP] [\fBfp default\fP] [\fBfp rehash\fP] + [\fB\-led\fP [\fIinteger\fP|\fBnamed\fP \fIindicator\fP]] [\fBled\fP [\fIinteger\fP|\fBnamed\fP \fIindicator\fP]] + [\fBled\fP {\fBon\fP|\fBoff\fP}] + [\fBmouse\fP [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [\fBmouse default\fP] + [\fBp\fP \fIpixel\fP \fIcolor\fP] + [\fB\-r\fP [\fIkeycode\fP]] [\fBr\fP [\fIkeycode\fP]] [\fBr\fP {\fBon\fP|\fBoff\fP}] [\fBr rate\fP \fIdelay\fP [\fIrate\fP]] + [\fBs\fP [\fIlength\fP [\fIperiod\fP]]] [\fBs\fP {\fBblank\fP|\fBnoblank\fP}] [\fBs\fP {\fBexpose\fP|\fBnoexpose\fP}] + [\fBs\fP {\fBon\fP|\fBoff\fP}] [\fBs default\fP] [\fBs activate\fP] [\fBs reset\fP] + [\fBq\fP] + [\fB\-version\fP] +.fi .SH DESCRIPTION -This program is used to set various user preference options of the display. +This program is used to set or query various user preference options +of the display. .SH OPTIONS -.PP .TP 8 .B \-display \fIdisplay\fP -This option specifies the server to use; see \fIX(__miscmansuffix__)\fP. -.PP +This option specifies the server to use; see +.BR X (__miscmansuffix__). .TP 8 .B b The \fBb\fP option controls bell volume, pitch and duration. -This option accepts up to three numerical parameters, a preceding -dash(-), or a 'on/off' flag. If no parameters are -given, or the 'on' flag is used, the system defaults will be used. -If the dash or 'off' are given, the bell will be turned -off. -If only one numerical parameter is given, the -bell volume will be set to that value, as a percentage of its maximum. -Likewise, the second numerical -parameter specifies the bell pitch, in hertz, and -the third numerical parameter -specifies the duration in milliseconds. Note that not -all hardware can vary the bell characteristics. The X server will set -the characteristics of the bell as closely as it can to the user's -specifications. -.PP +This option accepts up to three numerical parameters, +a preceding dash(\-), or a \fBon\fP/\fBoff\fP flag. +If no parameters are given, or the \fBon\fP flag is used, +the system defaults will be used. +If the dash or \fBoff\fP are given, the bell will be turned off. +If only one numerical parameter is given, +the bell volume will be set to that value, as a percentage of its maximum. +Likewise, the second numerical parameter specifies the bell pitch, in hertz, +and the third numerical parameter specifies the duration in milliseconds. +Note that not all hardware can vary the bell characteristics. +The X server will set the characteristics of the bell as closely as it can +to the user's specifications. .TP 8 .B bc The \fBbc\fP option controls \fIbug compatibility\fP mode in the server, -if possible; a preceding dash(-) disables the mode, otherwise the mode -is enabled. Various pre-R4 clients pass illegal values in some -protocol requests, and pre-R4 servers did not correctly generate -errors in these cases. Such clients, when run against an R4 server, +if possible; +a preceding dash(\-) disables the mode, otherwise the mode is enabled. +Various pre-R4 clients pass invalid values in some protocol requests, +and pre-R4 servers did not correctly generate errors in these cases. +Such clients, when run against an R4 server, will terminate abnormally or otherwise fail to operate correctly. -Bug compatibility mode explicitly reintroduces certain bugs into the -X server, so that many such clients can still be run. This mode should be -used with care; new application development should be done with this mode -disabled. The server must support the MIT-SUNDRY-NONSTANDARD +Bug compatibility mode explicitly reintroduces certain bugs into the X server, +so that many such clients can still be run. +This mode should be used with care; +new application development should be done with this mode disabled. +The server must support the MIT\-SUNDRY\-NONSTANDARD protocol extension in order for this option to work. +The X.Org X server 1.2 and later do not support enabling this mode. .TP 8 .B c The \fBc\fP option controls key click. -This option can take an optional value, a preceding dash(-), -or an 'on/off' flag. -If no parameter or the 'on' flag is given, the system defaults -will be used. If the dash or 'off' flag is used, keyclick will be -disabled. -If a value from 0 to 100 is given, it is used to -indicate volume, as a percentage of the maximum. +This option can take an optional value, a preceding dash(\-), +or an \fBon\fP/\fBoff\fP flag. +If no parameter or the \fBon\fP flag is given, the system defaults will be used. +If the dash or \fBoff\fP flag is used, keyclick will be disabled. +If a value from 0 to 100 is given, +it is used to indicate volume, as a percentage of the maximum. The X server will set the volume to the nearest value that the hardware can support. -.PP .TP 8 .B \-dpms -The \fB\-dpms\fP option disables Display Power Management Signaling (DPMS) features. +The \fB\-dpms\fP option disables +Display Power Management Signaling (DPMS) features. .TP 8 .B +dpms -The \fB+dpms\fP option enables Display Power Management Signaling (DPMS) features. +The \fB+dpms\fP option enables +Display Power Management Signaling (DPMS) features. .TP 8 .B dpms \fIflags...\fP The \fBdpms\fP option allows the Display Power Management Signaling (DPMS) parameters to be set. -The option can take up to three numerical values, or the `force' -flag followed by a DPMS state. The `force' flags forces the server -to immediately switch to the DPMS state specified. The DPMS state can -be one of `standby', `suspend', `off', or `on'. When numerical values are -given, they set the inactivity period -(in units of seconds) +The option can take up to three numerical values, +or the \fBforce\fP flag followed by a DPMS state. +The \fBforce\fP flags forces the server +to immediately switch to the DPMS state specified. +The DPMS state can be one of +\fBstandby\fP, \fBsuspend\fP, \fBoff\fP, or \fBon\fP. +When numerical values are given, +they set the inactivity period (in units of seconds) before the three modes are activated. -The first value given is for the `standby' mode, the second is for the -`suspend' mode, and the third is for the `off' mode. Setting these -values implicitly enables the DPMS features. A value of zero disables -a particular mode. +The first value given is for the \fBstandby\fP mode, +the second is for the \fBsuspend\fP mode, +and the third is for the \fBoff\fP mode. +Setting these values implicitly enables the DPMS features. +A value of zero disables a particular mode. .TP 8 .B fp= \fIpath,...\fP The \fBfp=\fP sets the font path to the entries given in the path argument. The entries are interpreted by the server, not by the client. -Typically they are directory names or font server names, but the -interpretation is server-dependent. +Typically they are directory names or font server names, +but the interpretation is server-dependent. .TP 8 .B fp \fBdefault\fP The \fBdefault\fP argument causes the font path to be reset to the server's @@ -154,142 +135,150 @@ .TP 8 .B fp \fBrehash\fP The \fBrehash\fP argument resets the font path to its current value, -causing the server to reread the font databases in -the current font path. This is generally only used when adding new fonts to -a font directory (after running \fImkfontdir\fP to recreate the font database). -.PP +causing the server to reread the font databases in the current font path. +This is generally only used when adding new fonts to a font directory +(after running \fImkfontdir\fP to recreate the font database). .TP 8 .B "\-fp \fRor\fP fp\-" -The \fB\-fp\fP and \fBfp\-\fP options remove elements from the current -font path. They must be followed by a comma-separated list of entries. -.PP -.TP 8 -.B "\+fp \fRor\fP fp\+" -This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the -current font path, respectively. They must be followed by a comma-separated -list of entries. -.PP +The \fB\-fp\fP and \fBfp\-\fP options remove elements from +the current font path. +They must be followed by a comma-separated list of entries. +.TP 8 +.B "+fp \fRor\fP fp+" +The \fB+fp\fP and \fBfp+\fP options prepend and append elements to the +current font path, respectively. +They must be followed by a comma-separated list of entries. .TP 8 .B led The \fBled\fP option controls the keyboard LEDs. This controls the turning on or off of one or all of the LEDs. -It accepts an optional integer, a preceding dash(-) or an 'on/off' flag. -If no parameter or the 'on' flag is given, all LEDs are turned on. -If a preceding dash or the flag 'off' is given, all LEDs are turned off. +It accepts an optional integer, a preceding dash(\-), +or an \fBon\fP/\fBoff\fP flag. +If no parameter or the \fBon\fP flag is given, all LEDs are turned on. +If a preceding dash or the flag \fBoff\fP is given, all LEDs are turned off. If a value between 1 and 32 is given, that LED will be turned on or off depending on the existence of a preceding dash. -``xset led 3'' would turn led #3 on. ``xset -led 3'' would turn it off. +``xset led 3'' would turn led #3 on. ``xset \-led 3'' would turn it off. The particular LED values may refer to different LEDs on different hardware. If the X server supports the XKEYBOARD (XKB) extension, leds may be -referenced by the XKB indicator name by specifying the `named' keyword -and the indicator name. For example, to turn on the Scroll Lock LED: +referenced by the XKB indicator name by specifying the \fBnamed\fP keyword +and the indicator name. +For example, to turn on the Scroll Lock LED: .IP xset led named "Scroll Lock" -.PP .TP 8 .B mouse -The \fBm\fP option controls the mouse parameters; it may be -abbreviated to 'm'. Of course, it applies to most pointing devices, not just -mice. The parameters for the pointing device are `acceleration' and -`threshold'. The acceleration can be specified as an integer, or as a simple -fraction. Threshold is just an integer. The setting is applied to all connected -pointing devices. xinput(__appmansuffix__) should be used if you need device-specific settings. +The \fBmouse\fP option controls the mouse parameters; +it may be abbreviated to \fBm\fP. +Of course, it applies to most pointing devices, not just mice. +The parameters for the pointing device are +\fIacceleration\fP and \fIthreshold\fP. +The \fIacceleration\fP can be specified as an integer, or as a simple fraction. +The \fIthreshold\fP is just an integer. +The setting is applied to all connected pointing devices. +.BR xinput (__appmansuffix__) +should be used if you need device-specific settings. .PP By default the pointer (the on-screen representation of the pointing device) -will go `acceleration' times as fast when the device travels more than -`threshold' mickeys (i.e. would-be pixels) in 10 ms, including a small -transition range. This way, the pointing device can be used for precise -alignment when it is moved slowly, yet it can be set to travel across -the screen in a flick of the wrist when desired. One or both -parameters for the -.B m -option can be omitted, but if only one is -given, it will be interpreted as the acceleration. -If no parameters or the flag 'default' is used, the system defaults will -be set. -.PP -If the `threshold' parameter is provided and 0, the `acceleration' -parameter will be used in the exponent of a more natural and continuous -formula, giving precise control for slow motion but big reach for fast -motion, and a progressive transition for motions in between. -Recommended `acceleration' value in this case is 3/2 to 3, but not -limited to that range. -.PP -In the X.org X Server 1.6 and above, the behaviour described so far is linked -to the default profile. There are other profiles (i.e. functions determining -pointer acceleration from device velocity) and additional settings, so the -above description may not apply to non-default cases. In the X.org Server 1.7, -these are available as input device properties (see xinput). - -.PP +will go \fIacceleration\fP times as fast when the device travels more than +\fIthreshold\fP mickeys (i.e. would-be pixels) in 10 ms, including a small +transition range. +This way, the pointing device can be used for precise alignment +when it is moved slowly, +yet it can be set to travel across the screen +in a flick of the wrist when desired. +One or both parameters for the +.B mouse +option can be omitted, but if only one is given, +it will be interpreted as the \fIacceleration\fP. +If no parameters or the flag \fBdefault\fP is used, +the system defaults will be used. +.PP +If the \fIthreshold\fP parameter is provided and 0, +the \fIacceleration\fP parameter will be used in the exponent of +a more natural and continuous formula, +giving precise control for slow motion but big reach for fast motion, +and a progressive transition for motions in between. +Recommended \fIacceleration\fP value in this case is 3/2 to 3, +but is not limited to that range. +.PP +In the X.Org X Server 1.6 and above, +the behaviour described so far is linked to the default profile. +There are other profiles +(i.e. functions determining pointer acceleration from device velocity) +and additional settings, +so the above description may not apply to non-default cases. +In the X.Org Server 1.7, +these are available as input device properties (see +.BR xinput (1). .TP 8 .B p The \fBp\fP option controls pixel color values. The parameters are the color map entry number in decimal, -and a color specification. The root background colors may be changed +and a color specification. +The root background colors may be changed on some servers by altering the entries for BlackPixel and WhitePixel. -Although these are often 0 and 1, they need not be. Also, a server may -choose to allocate those colors privately, in which case an error will -be generated. The map entry must not be a read-only color, -or an error will result. -.PP +Although these are often 0 and 1, they need not be. +Also, a server may choose to allocate those colors privately, +in which case an error will be generated. +The map entry must not be a read-only color, or an error will result. .TP 8 .B r The \fBr\fP option controls the autorepeat. -Invoking with "\fB-r\fP", or "\fBr\ off\fP", will disable autorepeat, whereas -"\fBr\fP", or "\fBr\ on\fP" will enable autorepeat. -Following the "\fB-r\fP" or "\fBr\fP" option with an integer keycode between 0 and -255 will disable or enable autorepeat on that key respectively, but only -if it makes sense for the particular keycode. Keycodes below 8 are -not typically valid for this command. Example: "\fBxset\ -r\ 10\fP" will -disable autorepeat for the "1" key on the top row of an IBM PC keyboard. - +Invoking with "\fB\-r\fP", or "\fBr\ off\fP", will disable autorepeat, +whereas "\fBr\fP", or "\fBr\ on\fP" will enable autorepeat. +Following the "\fB\-r\fP" or "\fBr\fP" option with an integer keycode +between 0 and 255 will disable or enable autorepeat on that key respectively, +but only if it makes sense for the particular keycode. +Keycodes below 8 are not typically valid for this command. +Example: "\fBxset\ \-r\ 10\fP" +will disable autorepeat for the "1" key on the top row of an IBM PC keyboard. +.IP If the server supports the XFree86-Misc extension, or the XKB extension, -then a parameter -of 'rate' is accepted and should be followed by zero, one or two numeric -values. The first specifies the delay before autorepeat starts and -the second specifies the repeat rate. In the case that the server -supports the XKB extension, the delay is the number of milliseconds -before autorepeat starts, and the rate is the number of repeats -per second. If the rate or delay is not given, it will be set -to the default value. -.PP +then a parameter of \fBrate\fP is accepted +and should be followed by zero, one, or two numeric values. +The first specifies the \fIdelay\fP before autorepeat starts and +the second specifies the repeat \fIrate\fP. +In the case that the server supports the XKB extension, +the \fIdelay\fP is the number of milliseconds before autorepeat starts, +and the \fIrate\fP is the number of repeats per second. +If the \fIrate\fP or \fIdelay\fP is not given, +it will be set to the default value. .TP 8 .B s The \fBs\fP option lets you set the screen saver parameters. -This option accepts up to two numerical parameters, a 'blank/noblank' -flag, an 'expose/noexpose' flag, an 'on/off' flag, an 'activate/reset' flag, -or the 'default' flag. -If no parameters or the 'default' flag is used, the system will be set -to its default screen saver characteristics. -The 'on/off' flags simply turn the screen saver functions on or off. -The 'activate' flag forces activation of screen saver even if the screen +This option accepts up to two numerical parameters, +a \fBblank\fP/\fBnoblank\fP flag, +an \fBexpose\fP/\fBnoexpose\fP flag, +an \fBon\fP/\fBoff\fP flag, +an \fBactivate\fP/\fBreset\fP flag, +or the \fBdefault\fP flag. +If no parameters or the \fBdefault\fP flag is used, +the system will be set to its default screen saver characteristics. +The \fBon/off\fP flags simply turn the screen saver functions on or off. +The \fBactivate\fP flag forces activation of screen saver even if the screen saver had been turned off. -The 'reset' flag forces deactivation of screen saver if it is active. -The 'blank' flag sets the -preference to blank the video (if the hardware can do so) rather than -display a background pattern, while 'noblank' sets the -preference to display a pattern rather than blank the video. -The 'expose' flag sets the -preference to allow window exposures (the server can freely discard -window contents), while 'noexpose' sets the preference to disable -screen saver unless the server can regenerate the screens without -causing exposure events. -The length and period -parameters for the screen saver function determines how long the -server must be inactive for screen saving to activate, and the period -to change the background pattern to avoid burn in. +The \fBreset\fP flag forces deactivation of screen saver if it is active. +The \fBblank\fP flag sets the preference to blank the video +(if the hardware can do so) rather than display a background pattern, +while \fBnoblank\fP sets the preference to +display a pattern rather than blank the video. +The \fBexpose\fP flag sets the preference to allow window exposures +(the server can freely discard window contents), +while \fBnoexpose\fP sets the preference to disable the screen saver +unless the server can regenerate the screens without causing exposure events. +The \fIlength\fP and \fIperiod\fP parameters for the screen saver function +determines how long the server must be inactive for screen saving to activate, +and the period to change the background pattern to avoid burn in. The arguments are specified in seconds. -If only one numerical parameter is given, it will be used for the length. -.PP +If only one numerical parameter is given, it will be used for the \fIlength\fP. .TP 8 .B q The \fBq\fP option gives you information on the current settings. -.PP .TP 8 -.B -version -The \fB-version\fP option prints the program version and exits without +.B \-version +The \fB\-version\fP option prints the program version and exits without doing anything else. .PP These settings will be reset to default values when you log out. @@ -297,7 +286,12 @@ Note that not all X implementations are guaranteed to honor all of these options. .SH "SEE ALSO" -X(__miscmansuffix__), Xserver(__appmansuffix__), xmodmap(__appmansuffix__), xrdb(__appmansuffix__), xsetroot(__appmansuffix__), xinput(__appmansuffix__) +.BR X (__miscmansuffix__), +.BR Xserver (__appmansuffix__), +.BR xinput (__appmansuffix__), +.BR xmodmap (__appmansuffix__), +.BR xrdb (__appmansuffix__), +.BR xsetroot (__appmansuffix__) .SH AUTHOR Bob Scheifler, MIT Laboratory for Computer Science .br @@ -305,4 +299,4 @@ .br XFree86-Misc support added by David Dawes and Joe Moss .br -Manpage updates added by Mike A. Harris <[email protected]> +Manpage updates added by Mike A.\& Harris <[email protected]> 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/xset-1.2.5/meson.build new/xset-1.2.6/meson.build --- old/xset-1.2.5/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xset-1.2.6/meson.build 2026-07-10 02:27:16.000000000 +0200 @@ -0,0 +1,194 @@ +# 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( + 'xset', + 'c', + version: '1.2.6', + 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) + +# Replaces AC_USE_SYSTEM_EXTENSIONS +if host_machine.system() == 'sunos' + system_extensions = '-D__EXTENSIONS__' +elif host_machine.system() == 'netbsd' + system_extensions = '-D_OPENBSD_SOURCE' +else + system_extensions = '-D_GNU_SOURCE' +endif +add_project_arguments(system_extensions, language: ['c']) + +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 system functions +conf.set('HAVE_USLEEP', + cc.has_function( + 'usleep', + args: system_extensions, + prefix: '#include <unistd.h>' + ) ? '1' : false, + description: 'Define to 1 if you have the \'usleep\' function.', +) + +# 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.17') +deps = [dep_libxmuu, dep_libx11, dep_xproto] + +dep_libxext = dependency('xext', required: false) +if dep_libxext.found() + added_to_deps = false + foreach h: ['X11/extensions/dpms.h', 'X11/extensions/MITMisc.h'] + have_h_name = 'HAVE_' + h.to_upper().underscorify() + have_h = cc.check_header( + h, + required: false, + dependencies: [dep_libxext, deps], + prefix: '#include <X11/Xlib.h>', + ) + conf.set( + have_h_name, + have_h ? '1' : false, + description: f'Define to 1 if you have the <@h@> header file.', + ) + if have_h and not added_to_deps + deps += dep_libxext + added_to_deps = true + endif + endforeach +endif + +have_xkblib_h = cc.check_header( + 'X11/XKBlib.h', + required: false, + dependencies: deps, + prefix: '#include <X11/Xlib.h>', +) +conf.set( + 'HAVE_X11_XKBLIB_H', + have_xkblib_h ? '1' : false, + description: 'Define to 1 if you have the <X11/XKBlib.h> header file.', +) +summary('xkb', have_xkblib_h) + +use_xf86misc = false +if get_option('xf86misc').allowed() + dep_xf86misc = dependency('xxf86misc', required: get_option('xf86misc')) + if dep_xf86misc.found() + found = 0 + foreach h: ['X11/extensions/xf86misc.h', 'X11/extensions/xf86mscstr.h'] + have_h_name = 'HAVE_' + h.to_upper().underscorify() + have_h = cc.check_header( + h, + required: false, + dependencies: [dep_xf86misc, deps], + prefix: ['#include <X11/Xlib.h>', '#include <X11/Xproto.h>'] + ) + conf.set( + have_h_name, + have_h ? '1' : false, + description: f'Define to 1 if you have the <@h@> header file.', + ) + found += have_h ? 1 : 0 + endforeach + if found == 2 + deps += dep_xf86misc + use_xf86misc = true + endif + endif +endif +summary('xf86misc', use_xf86misc) + + +use_fontcache = false +if get_option('fontcache').allowed() + dep_fontcache = dependency('xfontcache', required: get_option('fontcache')) + if dep_fontcache.found() + found = 0 + foreach h: ['X11/extensions/fontcache.h', 'X11/extensions/fontcacheP.h'] + have_h_name = 'HAVE_' + h.to_upper().underscorify() + have_h = cc.check_header( + h, + required: false, + dependencies: [dep_fontcache, deps], + prefix: ['#include <X11/Xlib.h>', '#include <X11/Xproto.h>'] + ) + conf.set( + have_h_name, + have_h ? '1' : false, + description: f'Define to 1 if you have the <@h@> header file.', + ) + found += have_h ? 1 : 0 + endforeach + if found == 2 + deps += dep_fontcache + use_fontcache = true + endif + endif +endif +summary('fontcache', use_fontcache) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +add_project_arguments('-D_BSD_SOURCE', language: ['c']) + +executable( + 'xset', + [config_h, 'xset.c'], + dependencies: deps, + install: true +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xset.man', + input: 'man/xset.man', + output: 'xset.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/xset-1.2.5/meson.options new/xset-1.2.6/meson.options --- old/xset-1.2.5/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/xset-1.2.6/meson.options 2026-07-10 02:27:16.000000000 +0200 @@ -0,0 +1,15 @@ +option( + 'fontcache', + type: 'feature', + value : 'auto', + description: 'fontcache support (default is auto)', + deprecated: ['enabled'], +) + +option( + 'xf86misc', + type: 'feature', + value : 'auto', + description: 'xf86misc support (default is auto)', + deprecated: ['enabled'], +) 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/xset-1.2.5/missing new/xset-1.2.6/missing --- old/xset-1.2.5/missing 2022-12-04 01:09:36.000000000 +0100 +++ new/xset-1.2.6/missing 2026-07-10 02:27:20.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/xset-1.2.5/xset.c new/xset-1.2.6/xset.c --- old/xset-1.2.5/xset.c 2022-12-04 01:09:32.000000000 +0100 +++ new/xset-1.2.6/xset.c 2026-07-10 02:27:16.000000000 +0200 @@ -168,11 +168,21 @@ if (++i >= argc) usage("missing argument to -display"); disp = argv[i]; - } else if (strcmp(arg, "-version") == 0) { - puts(PACKAGE_STRING); - exit(EXIT_SUCCESS); } else { - hasargs = True; + /* accept single or double dash for -help & -version */ + if (arg[0] == '-' && arg[1] == '-') { + arg++; + } + + if (strcmp(arg, "-help") == 0) { + usage(NULL); + } + else if (strcmp(arg, "-version") == 0) { + puts(PACKAGE_STRING); + exit(EXIT_SUCCESS); + } + else + hasargs = True; } } if (!hasargs) {
