Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkfontscale for openSUSE:Factory checked in at 2026-04-19 18:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkfontscale (Old) and /work/SRC/openSUSE:Factory/.mkfontscale.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkfontscale" Sun Apr 19 18:15:43 2026 rev:16 rq:1348011 version:1.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/mkfontscale/mkfontscale.changes 2024-03-05 18:46:51.612760907 +0100 +++ /work/SRC/openSUSE:Factory/.mkfontscale.new.11940/mkfontscale.changes 2026-04-19 18:15:45.099058358 +0200 @@ -1,0 +2,8 @@ +Sun Apr 19 09:59:52 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.4 + * This release adds support for building with meson as well as + autoconf. +- switch to meson + +------------------------------------------------------------------- Old: ---- mkfontscale-1.2.3.tar.xz New: ---- mkfontscale-1.2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkfontscale.spec ++++++ --- /var/tmp/diff_new_pack.Lv8Fh4/_old 2026-04-19 18:15:45.587078244 +0200 +++ /var/tmp/diff_new_pack.Lv8Fh4/_new 2026-04-19 18:15:45.591078407 +0200 @@ -1,7 +1,7 @@ # # spec file for package mkfontscale # -# 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,13 +17,14 @@ Name: mkfontscale -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: Utility to create index of scalable font files 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 +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: pkgconfig(fontenc) @@ -44,11 +45,11 @@ %setup -q %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %files %license COPYING ++++++ mkfontscale-1.2.3.tar.xz -> mkfontscale-1.2.4.tar.xz ++++++ ++++ 10672 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/mkfontscale-1.2.3/ChangeLog new/mkfontscale-1.2.4/ChangeLog --- old/mkfontscale-1.2.3/ChangeLog 2024-03-03 19:13:22.000000000 +0100 +++ new/mkfontscale-1.2.4/ChangeLog 2026-04-19 00:25:28.000000000 +0200 @@ -1,3 +1,69 @@ +commit d01cb89de429b4ed124399008dcec5e6de8e83af +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 18 15:22:37 2026 -0700 + + mkfontscale 1.2.4 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 445449c961f78ca319d4d5fc935ff88be898c3a9 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 4 09:46:46 2026 -0700 + + mkfontscale.man: drop ttmkfdir from See Also list + + Few distros still include the ttmkfdir package since most have switched to + mkfontscale instead. + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/mkfontscale/-/merge_requests/13> + +commit d84ec0885a39b341b9340d5d74528fd55d3911e9 +Author: Alan Coopersmith <[email protected]> +Date: Sun Mar 15 12:29:57 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/mkfontscale/-/merge_requests/12> + +commit 8ab23896bfe6a95021f9388d44d663044a18514f +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/mkfontscale/-/merge_requests/12> + +commit 9c9c8834dc4ce17d0e878a28d36ff5e736bddb9b +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 22 15:28:12 2025 -0700 + + Add --help and --version options + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/mkfontscale/-/merge_requests/11> + +commit b9c84d00d98724200f63d1786a49b2465a2c7f54 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 22 15:21:10 2025 -0700 + + Report unknown argument before printing usage message + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/mkfontscale/-/merge_requests/11> + commit bcfa27aeef3a9eb720e6b48e3fb8a4c2813fef52 Author: Alan Coopersmith <[email protected]> Date: Sun Mar 3 10:06:37 2024 -0800 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/mkfontscale-1.2.3/Makefile.am new/mkfontscale-1.2.4/Makefile.am --- old/mkfontscale-1.2.3/Makefile.am 2024-03-03 19:13:12.000000000 +0100 +++ new/mkfontscale-1.2.4/Makefile.am 2026-04-19 00:25:17.000000000 +0200 @@ -66,4 +66,4 @@ $(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES) endif LINT -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/mkfontscale-1.2.3/compile new/mkfontscale-1.2.4/compile --- old/mkfontscale-1.2.3/compile 2024-03-03 19:13:16.000000000 +0100 +++ new/mkfontscale-1.2.4/compile 2026-04-19 00:25:22.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/mkfontscale-1.2.3/config.h.in new/mkfontscale-1.2.4/config.h.in --- old/mkfontscale-1.2.3/config.h.in 2024-03-03 19:13:16.000000000 +0100 +++ new/mkfontscale-1.2.4/config.h.in 2026-04-19 00:25:22.000000000 +0200 @@ -78,6 +78,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/mkfontscale-1.2.3/configure.ac new/mkfontscale-1.2.4/configure.ac --- old/mkfontscale-1.2.3/configure.ac 2024-03-03 19:13:12.000000000 +0100 +++ new/mkfontscale-1.2.4/configure.ac 2026-04-19 00:25:17.000000000 +0200 @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([mkfontscale], [1.2.3], +AC_INIT([mkfontscale], [1.2.4], [https://gitlab.freedesktop.org/xorg/app/mkfontscale/-/issues], [mkfontscale]) 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/mkfontscale-1.2.3/man/mkfontscale.man new/mkfontscale-1.2.4/man/mkfontscale.man --- old/mkfontscale-1.2.3/man/mkfontscale.man 2024-03-03 19:13:12.000000000 +0100 +++ new/mkfontscale-1.2.4/man/mkfontscale.man 2026-04-19 00:25:17.000000000 +0200 @@ -1,6 +1,5 @@ -.\" $XFree86: xc/programs/mkfontscale/mkfontscale.man,v 1.4 2003/06/20 15:49:52 eich Exp $ .\" -.TH MKFONTSCALE __appmansuffix__ __vendorversion__ +.TH MKFONTSCALE __appmansuffix__ __xorgversion__ .SH NAME mkfontscale \- create an index of scalable font files for X .SH SYNOPSIS @@ -46,10 +45,10 @@ ] \|.\|.\|. .SH DESCRIPTION For each directory argument, -.I mkfontscale -reads all of the scalable font files in the directory. For every font -file found, an X11 font name (XLFD) is generated, and is written -together with the file name to a file +.B mkfontscale +reads all of the scalable font files in the directory. +For every font file found, an X11 font name (XLFD) is generated, +and is written together with the file name to a file .B fonts.scale in the directory. @@ -134,20 +133,29 @@ disable (\fI-u\fP) or enable (\fI-U\fP) indexing of ISO 10646:1 font encodings (default: enabled). .TP -.B \-v +.B \-v, \--version print program version and exit. .TP +.B \--help +print program usage and exit. +.TP .B \-\- end of options. .SH SEE ALSO -X(__miscmansuffix__), Xserver(__appmansuffix__), mkfontdir(__appmansuffix__), ttmkfdir(__appmansuffix__), xfs(__appmansuffix__), xset(__appmansuffix__) +.BR X (__miscmansuffix__), +.BR Xserver (__appmansuffix__), +.BR mkfontdir (__appmansuffix__), +.BR xfs (__appmansuffix__), +.BR xset (__appmansuffix__) .SH NOTES The format of the .BR fonts.scale , .B fonts.dir and .B encodings.dir -files is documented in the mkfontdir(__appmansuffix__) manual page. +files is documented in the +.BR mkfontdir (__appmansuffix__) +manual page. .B Mkfontscale will overwrite any 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/mkfontscale-1.2.3/meson.build new/mkfontscale-1.2.4/meson.build --- old/mkfontscale-1.2.3/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/mkfontscale-1.2.4/meson.build 2026-04-19 00:25:17.000000000 +0200 @@ -0,0 +1,129 @@ +# 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( + 'mkfontscale', + 'c', + version: '1.2.4', + license: 'MIT AND MIT-open-group AND HPND-sell-variant', + 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') + +# Replaces AC_USE_SYSTEM_EXTENSIONS +if host_machine.system() == 'sunos' + add_project_arguments('-D__EXTENSIONS__', language: ['c']) +elif host_machine.system() == 'netbsd' + add_project_arguments('-D_OPENBSD_SOURCE', language: ['c']) +else + add_project_arguments('-D_GNU_SOURCE', language: ['c']) +endif + +# 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 / libraries +conf.set('HAVE_VASPRINTF', cc.has_function('vasprintf') ? '1' : false) + +# Checks for pkg-config packages +dep_fontenc = dependency('fontenc', required: true) +dep_freetype = dependency('freetype2', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.25') +dep_zlib = dependency('zlib', required: true) +mkfontscale_deps = [dep_fontenc, dep_freetype, dep_xproto, dep_zlib] + +if get_option('bzip2') == true + dep_bz2 = cc.find_library('bz2', required: true) + mkfontscale_deps += dep_bz2 + conf.set('X_BZIP2_FONT_COMPRESSION', 1, + description: 'Support bzip2 for bitmap fonts') +endif +summary('bzip2', get_option('bzip2')) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +# mkfontdir script +mkfontdir_conf = configuration_data() +mkfontdir_conf.set('bindir', get_option('prefix') / get_option('bindir')) +mkfontdir = configure_file( + input: 'mkfontdir.in', + output: 'mkfontdir', + configuration: mkfontdir_conf, + install: true, + install_dir: get_option('bindir'), + install_mode: 'rwxr-xr-x', + install_tag: 'runtime', +) + +# mkfontscale compiled binary +mkfontscale_sources = [ + config_h, + 'constlist.c', + 'constlist.h', + 'data.h', + 'hash.c', + 'hash.h', + 'ident.c', + 'ident.h', + 'list.c', + 'list.h', + 'mkfontscale.c', +] + +executable( + 'mkfontscale', + mkfontscale_sources, + dependencies: mkfontscale_deps, + install: true +) + +# Man pages +prog_sed = find_program('sed') +foreach p : ['mkfontdir', 'mkfontscale'] + custom_target( + f'@[email protected]', + input: f'man/@[email protected]', + output: f'@[email protected]', + 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', + ) +endforeach 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/mkfontscale-1.2.3/meson.options new/mkfontscale-1.2.4/meson.options --- old/mkfontscale-1.2.3/meson.options 1970-01-01 01:00:00.000000000 +0100 +++ new/mkfontscale-1.2.4/meson.options 2026-04-19 00:25:17.000000000 +0200 @@ -0,0 +1,6 @@ +option( + 'bzip2', + type: 'boolean', + description: 'Support bzip2 compressed bitmap fonts (default is false)', + value: false +) 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/mkfontscale-1.2.3/missing new/mkfontscale-1.2.4/missing --- old/mkfontscale-1.2.3/missing 2024-03-03 19:13:17.000000000 +0100 +++ new/mkfontscale-1.2.4/missing 2026-04-19 00:25:22.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/mkfontscale-1.2.3/mkfontscale.c new/mkfontscale-1.2.4/mkfontscale.c --- old/mkfontscale-1.2.3/mkfontscale.c 2024-03-03 19:13:12.000000000 +0100 +++ new/mkfontscale-1.2.4/mkfontscale.c 2026-04-19 00:25:17.000000000 +0200 @@ -120,21 +120,21 @@ static char *ProgramName; static void _X_NORETURN _X_COLD -usage(void) +usage(int exitstatus) { fprintf(stderr, "Usage:\n" "mkfontscale [ -b ] [ -s ] [ -o filename ] [-x suffix ]\n" " [ -a encoding ] [ -f fuzz ] [ -l ]\n" " [ -e directory ] [ -p prefix ] [ -n ] [ -r ] \n" " [-u] [-U] [-v] [ directory ]...\n"); - exit(1); + exit(exitstatus); } static void _X_NORETURN _X_COLD missing_arg(const char *option) { fprintf(stderr, "%s: %s requires an argument\n", ProgramName, option); - usage(); + usage(1); } int @@ -178,7 +178,7 @@ while (argn < argc) { if (argv[argn][0] == '\0' || argv[argn][0] != '-') break; - if (argv[argn][1] == '-') { + if ((argv[argn][1] == '-') && (argv[argn][2] == '\0')) { argn++; break; } @@ -203,7 +203,7 @@ if (strlen(argv[argn + 1]) > NPREFIX - 1) { fprintf(stderr, "%s: argument to -p cannot be longer than " "%d characters\n", ProgramName, NPREFIX - 1); - usage(); + usage(1); } free(encodingPrefix); encodingPrefix = strdup(argv[argn + 1]); @@ -262,12 +262,17 @@ bigEncodingFuzz = strtof(argv[argn + 1], NULL) / 100.0f; argn += 2; } - else if (strcmp(argv[argn], "-v") == 0) { - printf("%s\n", PACKAGE_STRING); + else if ((strcmp(argv[argn], "-v") == 0) || + (strcmp(argv[argn], "--version") == 0)) { + puts(PACKAGE_STRING); exit(0); } + else if (strcmp(argv[argn], "--help") == 0) { + usage(0); + } else { - usage(); + fprintf(stderr, "%s: Unknown argument: %s\n\n", argv[0], argv[argn]); + usage(1); } }
