Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xkbprint for openSUSE:Factory checked in at 2026-07-31 15:27:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkbprint (Old) and /work/SRC/openSUSE:Factory/.xkbprint.new.2004 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkbprint" Fri Jul 31 15:27:05 2026 rev:10 rq:1368186 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xkbprint/xkbprint.changes 2024-10-14 13:07:24.637216338 +0200 +++ /work/SRC/openSUSE:Factory/.xkbprint.new.2004/xkbprint.changes 2026-07-31 16:11:01.712196034 +0200 @@ -1,0 +2,10 @@ +Tue Jul 21 11:10:54 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.8 + * meson: include headers when checking for functions + * meson: Add option to build with meson + * Strip trailing whitespace from source files + * gitlab CI: drop the ci-fairy check-mr job +- Switch to meson build system. + +------------------------------------------------------------------- Old: ---- xkbprint-1.0.7.tar.xz New: ---- xkbprint-1.0.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkbprint.spec ++++++ --- /var/tmp/diff_new_pack.SeOxRQ/_old 2026-07-31 16:11:03.216248356 +0200 +++ /var/tmp/diff_new_pack.SeOxRQ/_new 2026-07-31 16:11:03.220248495 +0200 @@ -1,7 +1,7 @@ # # spec file for package xkbprint # -# Copyright (c) 2024 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,17 +17,18 @@ Name: xkbprint -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Utility to print an XKB keyboard description License: MIT Group: System/X11/Utilities -URL: http://xorg.freedesktop.org/ -Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +URL: https://xorg.freedesktop.org/ +Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson >= 1.1.0 +BuildRequires: ninja BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xkbfile) -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 @@ -40,15 +41,16 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files %defattr(-,root,root) -%doc ChangeLog COPYING README.md +%license COPYING +%doc ChangeLog README.md %{_bindir}/xkbprint %{_mandir}/man1/xkbprint.1%{?ext_man} ++++++ xkbprint-1.0.7.tar.xz -> xkbprint-1.0.8.tar.xz ++++++ ++++ 8583 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/xkbprint-1.0.7/ChangeLog new/xkbprint-1.0.8/ChangeLog --- old/xkbprint-1.0.7/ChangeLog 2024-10-12 20:12:21.000000000 +0200 +++ new/xkbprint-1.0.8/ChangeLog 2026-07-19 23:50:45.000000000 +0200 @@ -1,3 +1,97 @@ +commit f785a8ffe4765397c9f8ecea1500378637f68afa +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 19 14:45:56 2026 -0700 + + xkbprint 1.0.8 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 91206d2c2684376f85a504dbc0adc79cb7d41aea +Author: Alan Coopersmith <[email protected]> +Date: Mon Jul 6 14:49:26 2026 -0700 + + meson: include headers when checking for functions + + Trying to workaround https://github.com/mesonbuild/meson/issues/3740 + which causes meson to fail to detect missing functions in some cases. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbprint/-/merge_requests/12> + +commit 9aa4674adba24a3b216be096cf079688ca23ad17 +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 10:52:00 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/xkbprint/-/merge_requests/11> + +commit 5bf31b57bad45634724b7892bf3121c8a9481d6d +Author: Alan Coopersmith <[email protected]> +Date: Sun May 24 10:36:19 2026 -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/xkbprint/-/merge_requests/11> + +commit 16a41c3e8a26a571a6bc6533e906464226895ce0 +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/xkbprint/-/merge_requests/11> + +commit f82155060090e00a0524eafd025aad64ea3ba305 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 26 12:42:38 2025 -0700 + + man page: fix warnings from `mandoc -T lint` + + mandoc: xkbprint.1:2:16: WARNING: cannot parse date, using it verbatim: TH xkbprint 1.0.7 + mandoc: xkbprint.1:9:2: WARNING: skipping paragraph macro: PP after SH + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xkbprint/-/merge_requests/10> + +commit 89d31354bf9b0eedfdfa09518b6af56fa88e7868 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 10:59:50 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/xkbprint/-/merge_requests/9> + +commit 85b3cee2c244684b120e78472a985f4ca1965fe3 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 5 10:52:11 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/xkbprint/-/merge_requests/9> + commit 8ea4c3e22a2ff79d373f8a364309c5a4a0c01ced Author: Alan Coopersmith <[email protected]> Date: Sat Oct 12 11:04:07 2024 -0700 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/xkbprint-1.0.7/Makefile.am new/xkbprint-1.0.8/Makefile.am --- old/xkbprint-1.0.7/Makefile.am 2024-10-12 20:12:10.000000000 +0200 +++ new/xkbprint-1.0.8/Makefile.am 2026-07-19 23:50:35.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 @@ -45,4 +45,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/xkbprint-1.0.7/compile new/xkbprint-1.0.8/compile --- old/xkbprint-1.0.7/compile 2024-10-12 20:12:14.000000000 +0200 +++ new/xkbprint-1.0.8/compile 2026-07-19 23:50:39.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2024-06-19.01; # UTC +scriptversion=2025-06-18.21; # UTC -# Copyright (C) 1999-2024 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"` @@ -343,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/xkbprint-1.0.7/config.h.in new/xkbprint-1.0.8/config.h.in --- old/xkbprint-1.0.7/config.h.in 2024-10-12 20:12:14.000000000 +0200 +++ new/xkbprint-1.0.8/config.h.in 2026-07-19 23:50:39.000000000 +0200 @@ -75,6 +75,10 @@ #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 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/xkbprint-1.0.7/configure.ac new/xkbprint-1.0.8/configure.ac --- old/xkbprint-1.0.7/configure.ac 2024-10-12 20:12:10.000000000 +0200 +++ new/xkbprint-1.0.8/configure.ac 2026-07-19 23:50:35.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([xkbprint], [1.0.7], +AC_INIT([xkbprint], [1.0.8], [https://gitlab.freedesktop.org/xorg/app/xkbprint/-/issues], [xkbprint]) 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/xkbprint-1.0.7/man/xkbprint.man new/xkbprint-1.0.8/man/xkbprint.man --- old/xkbprint-1.0.7/man/xkbprint.man 2024-10-12 20:12:10.000000000 +0200 +++ new/xkbprint-1.0.8/man/xkbprint.man 2026-07-19 23:50:35.000000000 +0200 @@ -1,32 +1,34 @@ .\" -.TH XKBPRINT 1 __xorgversion__ +.TH XKBPRINT 1 2022-04-02 __xorgversion__ .SH NAME xkbprint \- print an XKB keyboard description .SH SYNOPSIS .B xkbprint -[options] source [ output_file ] +[\fIoptions\fB] \fIsource\fB [\fIoutput_file\fB] .SH DESCRIPTION -.PP The -.I xkbprint +.B xkbprint command generates a printable or encapsulated PostScript description of the -XKB keyboard description specified by \fIsource\fP. The \fIsource\fP can be -any compiled keymap (.xkm) file that includes a geometry description or an -X display specification. If an \fIoutput_file\fP is specified, xkbprint -writes to it. If no output file is specified, xkbprint creates replaces -the extension of the source file with \fI.ps\fP or \fI.eps\fP depending -on the requested format. If the source is a non-local X display (e.g.:0), -xkbprint appends the appropriate prefix to the display specification, -replacing the colon with a dash. For a local display, xkprint uses -server-\fIn\fP where \fIn\fP is the number of the display. +XKB keyboard description specified by \fIsource\fP. +The \fIsource\fP can be any compiled keymap (.xkm) file +that includes a geometry description or an X display specification. +If an \fIoutput_file\fP is specified, \fBxkbprint\fP writes to it. +If no output file is specified, +\fBxkbprint\fP replaces the extension of the source file with +\fI.ps\fP or \fI.eps\fP depending on the requested format. +If the source is a non-local X display (e.g., \fBexample.com:0\fP), +\fBxkbprint\fP appends the appropriate prefix to the display specification, +replacing the colon with a dash. +For a local display, \fBxkbprint\fP uses +\fBserver\-\fP\fIn\fP where \fIn\fP is the number of the display. .SH OPTIONS .TP 8 .B \-?, \-help Prints a usage message. .TP 8 .B \-color -Print using the colors specified in the geometry file; by default, xkbprint -prints a black-and-white image of the keyboard. +Print using the colors specified in the geometry file; +by default, \fBxkbprint\fP prints a black-and-white image of the keyboard. .TP 8 .B \-dflts Attempt to compute default names for any missing components, such as keys. @@ -47,15 +49,15 @@ Print a grid with \fIres\fP\ mm resolution over the keyboard. .TP 8 .B \-if\ \fIfontName\fP -Specifies an internal PostScript type 1 font to dump to the specified +Specifies an internal PostScript Type 1 font to dump to the specified output file or to \fIfontName\fP.pfa, if no output file is specified. No keyboard description is printed if an internal font is dumped. .TP 8 .B \-label\ \fItype\fP -Specifies the labels to be printed on keys; valid types are: \fInone\fP, -\fIname\fP, \fIcode\fP, and \fIsymbols\fP. +Specifies the labels to be printed on keys; +valid types are: \fBnone\fP, \fBname\fP, \fBcode\fP, and \fBsymbols\fP. .TP 8 -.B \-lc\ \fI<locale>\fP +.B \-lc\ \fIlocale\fP Specifies a locale in which KeySyms should be resolved. .TP 8 .B \-level1 @@ -80,19 +82,19 @@ Print the symbols in \fInum\fP keyboard groups. .TP 8 .B \-npk\ \fInum\fP -Number of keyboard images to print on each page; for EPS files, this -specifies the total number of keyboard images to print. +Number of keyboard images to print on each page; +for EPS files, this specifies the total number of keyboard images to print. .TP 8 .B \-o\ \fIfile\fP Write output to \fIfile\fP. .TP 8 .B \-R\fIdirectory\fP -Use \fIdirectory\fP as the root directory; all path names are interpreted -relative to \fIdirectory\fP. +Use \fIdirectory\fP as the root directory; +all path names are interpreted relative to \fIdirectory\fP. .TP 8 .B \-pict \fIwhich\fP Controls use of pictographs instead of keysym names where available. -\fIwhich\fP can be any of \fIall\fP, \fInone\fP, or \fIcommon\fP (default). +\fIwhich\fP can be any of \fBall\fP, \fBnone\fP, or \fBcommon\fP (default). .TP 8 .B \-synch Forces synchronization for X requests. 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/xkbprint-1.0.7/meson.build new/xkbprint-1.0.8/meson.build --- old/xkbprint-1.0.7/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xkbprint-1.0.8/meson.build 2026-07-19 23:50:35.000000000 +0200 @@ -0,0 +1,110 @@ +# 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( + 'xkbprint', + 'c', + version: '1.0.8', + license: 'HPND-sell-variant AND HPND-DEC', + 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 library functions. +conf.set( + 'HAVE_ASPRINTF', + cc.has_function( + 'asprintf', + args: system_extensions, + prefix: '#include <stdio.h>', + ) ? '1' : false, + description: 'Define to 1 if you have the \'asprintf\' function.', +) + +# Checks for pkg-config packages +dep_libxkbfile = dependency('xkbfile', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17') +deps = [dep_libxkbfile, dep_libx11, dep_xproto] + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +xkbprint_sources = [ + config_h, + 'isokeys.h', + 'psgeom.c', + 'utils.c', + 'utils.h', + 'xkbprint.c', + 'xkbprint.h', +] + +executable( + 'xkbprint', + xkbprint_sources, + dependencies: deps, + install: true, +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xkbprint.man', + input: 'man/xkbprint.man', + output: 'xkbprint.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/xkbprint-1.0.7/missing new/xkbprint-1.0.8/missing --- old/xkbprint-1.0.7/missing 2024-10-12 20:12:14.000000000 +0200 +++ new/xkbprint-1.0.8/missing 2026-07-19 23:50:39.000000000 +0200 @@ -1,11 +1,11 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU and other programs. -scriptversion=2024-06-07.14; # UTC +scriptversion=2025-06-18.21; # UTC # shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells -# Copyright (C) 1996-2024 Free Software Foundation, Inc. +# 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 @@ -228,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/xkbprint-1.0.7/xkbprint.c new/xkbprint-1.0.8/xkbprint.c --- old/xkbprint-1.0.7/xkbprint.c 2024-10-12 20:12:10.000000000 +0200 +++ new/xkbprint-1.0.8/xkbprint.c 2026-07-19 23:50:35.000000000 +0200 @@ -156,7 +156,8 @@ } } else if ((strcmp(argv[i], "-?") == 0) || - (strcmp(argv[i], "-help") == 0)) { + (strcmp(argv[i], "-help") == 0) || + (strcmp(argv[i], "--help") == 0)) { Usage(argc, argv); exit(0); } @@ -383,7 +384,8 @@ (strcmp(argv[i], "-s") == 0)) { synch = True; } - else if (strcmp(argv[i], "-version") == 0) { + else if ((strcmp(argv[i], "-version") == 0) || + (strcmp(argv[i], "--version") == 0)) { puts(PACKAGE_STRING); exit(0); }
