Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mkcomposecache for openSUSE:Factory checked in at 2026-04-19 18:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkcomposecache (Old) and /work/SRC/openSUSE:Factory/.mkcomposecache.new.11940 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkcomposecache" Sun Apr 19 18:15:43 2026 rev:7 rq:1348008 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mkcomposecache/mkcomposecache.changes 2022-04-13 21:03:55.564515350 +0200 +++ /work/SRC/openSUSE:Factory/.mkcomposecache.new.11940/mkcomposecache.changes 2026-04-19 18:15:44.359028203 +0200 @@ -1,0 +2,8 @@ +Sun Apr 19 09:53:45 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.3 + * This release adds support for building with meson as well as + autoconf. +- switch to meson + +------------------------------------------------------------------- Old: ---- mkcomposecache-1.2.2.tar.xz New: ---- mkcomposecache-1.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkcomposecache.spec ++++++ --- /var/tmp/diff_new_pack.z42Itn/_old 2026-04-19 18:15:44.819046948 +0200 +++ /var/tmp/diff_new_pack.z42Itn/_new 2026-04-19 18:15:44.819046948 +0200 @@ -1,7 +1,7 @@ # # spec file for package mkcomposecache # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: mkcomposecache -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Utility to create Compose cache files License: MIT Group: System/X11/Utilities URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz +BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.3 @@ -41,15 +42,16 @@ %setup -q %build -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS ChangeLog +%license COPYING %{_sbindir}/mkcomposecache %{_mandir}/man8/mkcomposecache.8%{?ext_man} ++++++ mkcomposecache-1.2.2.tar.xz -> mkcomposecache-1.2.3.tar.xz ++++++ ++++ 14720 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/mkcomposecache-1.2.2/ChangeLog new/mkcomposecache-1.2.3/ChangeLog --- old/mkcomposecache-1.2.2/ChangeLog 2022-04-03 21:17:24.000000000 +0200 +++ new/mkcomposecache-1.2.3/ChangeLog 2026-04-19 00:18:41.000000000 +0200 @@ -1,3 +1,69 @@ +commit e95d57021de7fb0dd22afdfb5c9f15cdcd1fa425 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 18 15:11:48 2026 -0700 + + mkcomposecache 1.2.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 55c75ba5cc90db32c513e53bcbb903f93370efa1 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 14 12:46:19 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/mkcomposecache/-/merge_requests/6> + +commit 0e03d63aefc00881838b979d0df1767d907cde70 +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/mkcomposecache/-/merge_requests/6> + +commit 497d16f5cbdcddf5aad22a52a350e7b82d7c8686 +Author: Alan Coopersmith <[email protected]> +Date: Sun Aug 3 15:20:17 2025 -0700 + + Strip trailing whitespace from source files + + Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'` + + `git diff -w` & `git diff -b` show no diffs from this change + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/mkcomposecache/-/merge_requests/5> + +commit 48cc272583cb92971523f7556e9dc505f390bdf5 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 22 15:06:45 2025 -0700 + + Add --help and --version options + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/mkcomposecache/-/merge_requests/4> + +commit 445076ac0ca56566eebca0df1c9bd48163c44a76 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <[email protected]> + commit d13bc957c537d3a348f787c23cc4e185f884b89f Author: Alan Coopersmith <[email protected]> Date: Sun Apr 3 12:14:40 2022 -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/mkcomposecache-1.2.2/Makefile.am new/mkcomposecache-1.2.3/Makefile.am --- old/mkcomposecache-1.2.2/Makefile.am 2022-04-03 21:17:14.000000000 +0200 +++ new/mkcomposecache-1.2.3/Makefile.am 2026-04-19 00:18:30.000000000 +0200 @@ -5,7 +5,7 @@ mkcomposecache_SOURCES = mkcomposecache.c mkcomposecache_LDADD = $(XLIB_LIBS) -EXTRA_DIST = mkallcomposecaches.sh README.md +EXTRA_DIST = mkallcomposecaches.sh README.md meson.build MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL 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/mkcomposecache-1.2.2/compile new/mkcomposecache-1.2.3/compile --- old/mkcomposecache-1.2.2/compile 2022-04-03 21:17:18.000000000 +0200 +++ new/mkcomposecache-1.2.3/compile 2026-04-19 00:18:35.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/mkcomposecache-1.2.2/config.h.in new/mkcomposecache-1.2.3/config.h.in --- old/mkcomposecache-1.2.2/config.h.in 2022-04-03 21:17:18.000000000 +0200 +++ new/mkcomposecache-1.2.3/config.h.in 2026-04-19 00:18:34.000000000 +0200 @@ -1,6 +1,6 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the `asprintf' function. */ +/* Define to 1 if you have the 'asprintf' function. */ #undef HAVE_ASPRINTF /* Define to 1 if you have the <inttypes.h> header file. */ @@ -12,7 +12,7 @@ /* Define to 1 if you have the <minix/config.h> header file. */ #undef HAVE_MINIX_CONFIG_H -/* Define to 1 if you have the `setlocale' function. */ +/* Define to 1 if you have the 'setlocale' function. */ #undef HAVE_SETLOCALE /* Define to 1 if you have the <stdint.h> header file. */ @@ -39,7 +39,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `unsetenv' function. */ +/* Define to 1 if you have the 'unsetenv' function. */ #undef HAVE_UNSETENV /* Define to 1 if you have the <wchar.h> header file. */ @@ -75,15 +75,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 @@ -141,11 +145,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/mkcomposecache-1.2.2/configure.ac new/mkcomposecache-1.2.3/configure.ac --- old/mkcomposecache-1.2.2/configure.ac 2022-04-03 21:17:14.000000000 +0200 +++ new/mkcomposecache-1.2.3/configure.ac 2026-04-19 00:18:30.000000000 +0200 @@ -1,7 +1,8 @@ # -*- Autoconf -*- AC_PREREQ([2.60]) -AC_INIT([mkcomposecache], [1.2.2], [https://gitlab.freedesktop.org/xorg/app/mkcomposecache/issues]) +AC_INIT([mkcomposecache], [1.2.3], + [https://gitlab.freedesktop.org/xorg/app/mkcomposecache/-/issues]) AC_CONFIG_SRCDIR([mkcomposecache.c]) 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/mkcomposecache-1.2.2/meson.build new/mkcomposecache-1.2.3/meson.build --- old/mkcomposecache-1.2.2/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/mkcomposecache-1.2.3/meson.build 2026-04-19 00:18:30.000000000 +0200 @@ -0,0 +1,96 @@ +# 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( + 'mkcomposecache', + 'c', + version: '1.2.3', + license: 'HPND-sell-variant', + license_files: 'COPYING', + meson_version: '>= 1.3.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 pkg-config packages +dep_libx11 = dependency('x11', required: true) +deps = [dep_libx11] + +# Check for essential headers +foreach h: ['stdio.h', 'stdlib.h', 'string.h', 'unistd.h', 'locale.h'] + cc.check_header(h, required: true) +endforeach + +# Check for essential and optional functions +cc.has_function('setlocale', prefix: '#include <locale.h>', required: true) +conf.set('HAVE_ASPRINTF', cc.has_function('asprintf') ? '1' : false) +conf.set('HAVE_UNSETENV', cc.has_function('unsetenv') ? '1' : false) + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +executable( + 'mkcomposecache', + [config_h, 'mkcomposecache.c'], + dependencies: deps, + install: true, + install_dir: get_option('sbindir') +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'mkcomposecache.man', + input: 'man/mkcomposecache.man', + output: 'mkcomposecache.8', + command: [ + prog_sed, + '-e', 's/__xorgversion__/"@0@" "X Version 11"/'.format(package_string), + '-e', 's/__adminmansuffix__/8/g', + '@INPUT@', + ], + capture: true, + install: true, + install_dir: get_option('mandir') / 'man8', + 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/mkcomposecache-1.2.2/missing new/mkcomposecache-1.2.3/missing --- old/mkcomposecache-1.2.2/missing 2022-04-03 21:17:18.000000000 +0200 +++ new/mkcomposecache-1.2.3/missing 2026-04-19 00:18:35.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/mkcomposecache-1.2.2/mkcomposecache.c new/mkcomposecache-1.2.3/mkcomposecache.c --- old/mkcomposecache-1.2.2/mkcomposecache.c 2022-04-03 21:17:14.000000000 +0200 +++ new/mkcomposecache-1.2.3/mkcomposecache.c 2026-04-19 00:18:30.000000000 +0200 @@ -1,14 +1,14 @@ /* Copyright 2005 SUSE Products GmbH - * + * * 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 * copyright notice and this permission notice appear in supporting * documentation. - * + * * The above copyright notice and this permission notice 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. @@ -76,9 +76,30 @@ XIM im; char *src, *dest; int ret; + const char * const usage = + "Usage: %s <Locale> <ComposeFile> <CacheDir> [<InternalName>]\n"; + + /* Only looks at first argument for option flags */ + if ((argc > 1) && (argv[1][0] == '-')) { + const char *argn = argv[1]; + /* accept single or double dash for -help & -version */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + fprintf(stdout, usage, argv[0]); + exit(0); + } + if (strcmp(argn, "-version") == 0) { + puts(PACKAGE_STRING); + exit(0); + } + } + if (argc != 4 && argc != 5) { - fprintf (stderr, "Usage: %s <Locale> <ComposeFile> <CacheDir> [<InternalName>]\n", argv[0]); + fprintf (stderr, "%s: incorrect number of arguments\n", argv[0]); + fprintf (stderr, usage, argv[0]); return 1; }
