Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xstdcmap for openSUSE:Factory checked in at 2026-07-13 14:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xstdcmap (Old) and /work/SRC/openSUSE:Factory/.xstdcmap.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xstdcmap" Mon Jul 13 14:28:40 2026 rev:9 rq:1365278 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xstdcmap/xstdcmap.changes 2022-12-05 18:01:18.520616713 +0100 +++ /work/SRC/openSUSE:Factory/.xstdcmap.new.1991/xstdcmap.changes 2026-07-13 14:29:12.149746336 +0200 @@ -1,0 +2,12 @@ +Mon Jul 13 09:33:07 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.6 + * Bypass Xrm for handling -help & -version arguments (Closes: #1) + * Improve man page formatting + * man page: fix warnings from mandoc -T lint and groff -rCHECKSTYLE=10 + * gitlab CI: drop the ci-fairy check-mr job + * Strip trailing whitespace from source files + * meson: Add option to build with meson +- Switch to Meson build system + +------------------------------------------------------------------- Old: ---- xstdcmap-1.0.5.tar.xz New: ---- xstdcmap-1.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xstdcmap.spec ++++++ --- /var/tmp/diff_new_pack.L5r5Xm/_old 2026-07-13 14:29:12.881771360 +0200 +++ /var/tmp/diff_new_pack.L5r5Xm/_new 2026-07-13 14:29:12.885771497 +0200 @@ -1,7 +1,7 @@ # # spec file for package xstdcmap # -# 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,17 +17,19 @@ Name: xstdcmap -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: Utility to define standard colormap properties 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 >= 1.1.0 +BuildRequires: ninja BuildRequires: pkgconfig BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xmu) -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 @@ %setup -q %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %files %license COPYING ++++++ xstdcmap-1.0.5.tar.xz -> xstdcmap-1.0.6.tar.xz ++++++ ++++ 14680 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/xstdcmap-1.0.5/ChangeLog new/xstdcmap-1.0.6/ChangeLog --- old/xstdcmap-1.0.5/ChangeLog 2022-12-04 01:22:03.000000000 +0100 +++ new/xstdcmap-1.0.6/ChangeLog 2026-07-12 00:43:49.000000000 +0200 @@ -1,3 +1,93 @@ +commit 65dd902e8e0b23d2895aa1ad7484b448c25bf839 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jul 11 15:39:54 2026 -0700 + + xstdcmap 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ef74e27b51432fe7e820b4b4e208bb434fef88c2 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 16 18:43:59 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/xstdcmap/-/merge_requests/7> + +commit 03b058361090c7aeed57f0c1a9755c96169cc79a +Author: Alan Coopersmith <[email protected]> +Date: Sat May 16 18:29:07 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/xstdcmap/-/merge_requests/7> + +commit 93667370c73792a06903074c9db473184ab05517 +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/xstdcmap/-/merge_requests/7> + +commit 3b68fb604f8d3695aff02835a6ebae8f1f4a9c0a +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 13:00:12 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xstdcmap.1:44:116: STYLE: input text line longer than 80 bytes: [\fB\-all\fP] [\fB\-... + mandoc: xstdcmap.1:39:16: WARNING: cannot parse date, using it verbatim: TH xstdcmap 1.0.5 + mandoc: xstdcmap.1:45:2: WARNING: skipping paragraph macro: br before text line with leading blank + mandoc: xstdcmap.1:48:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xstdcmap.1:56:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xstdcmap.1:110:2: WARNING: skipping paragraph macro: PP empty + an.tmac:xstdcmap.1:46: style: 9 leading space(s) on input line + an.tmac:xstdcmap.1:118: style: blank line in input + an.tmac:xstdcmap.1:119: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xstdcmap/-/merge_requests/6> + +commit ab005a9249ea75608f265ce4331f8359d6419933 +Author: Alan Coopersmith <[email protected]> +Date: Sat Apr 12 14:05:37 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/xstdcmap/-/merge_requests/5> + +commit cf28e3bf739cda49e038cd53e8bb241fc1c2e81d +Author: Alan Coopersmith <[email protected]> +Date: Fri Apr 12 15:09:32 2024 -0700 + + Bypass Xrm for handling -help & -version arguments + + Closes: #1 + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xstdcmap/-/merge_requests/4> + commit ea263607d3fbe4eca3319a3824c3f641dade4871 Author: Alan Coopersmith <[email protected]> Date: Sat Dec 3 16:19:36 2022 -0800 @@ -150,7 +240,7 @@ Signed-off-by: Alan Coopersmith <[email protected]> commit 16959f67461cb3bceb5d9428759bc6f8925aa1ee -Author: Stéphane Aulery <[email protected]> +Author: Stéphane Aulery <[email protected]> Date: Thu Jul 4 00:40:01 2013 +0200 Use the same parameter names in the help. @@ -502,13 +592,13 @@ configure cache, you cache it, and the cached value is probably wrong. commit 1b024ee5c3ddf09fb5d900cc8e1733d2ba0679d1 -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 8b9becb78c06d7d99e00750a18ccf9bceb5d2b2b -Author: Søren Sandmann Pedersen <[email protected]> +Author: Søren Sandmann Pedersen <[email protected]> Date: Fri Jul 1 20:09:09 2005 +0000 xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove 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/xstdcmap-1.0.5/Makefile.am new/xstdcmap-1.0.6/Makefile.am --- old/xstdcmap-1.0.5/Makefile.am 2022-12-04 01:21:54.000000000 +0100 +++ new/xstdcmap-1.0.6/Makefile.am 2026-07-12 00:43:39.000000000 +0200 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -40,4 +40,4 @@ dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.5/compile new/xstdcmap-1.0.6/compile --- old/xstdcmap-1.0.5/compile 2022-12-04 01:21:58.000000000 +0100 +++ new/xstdcmap-1.0.6/compile 2026-07-12 00:43:44.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/xstdcmap-1.0.5/config.h.in new/xstdcmap-1.0.6/config.h.in --- old/xstdcmap-1.0.5/config.h.in 2022-12-04 01:21:58.000000000 +0100 +++ new/xstdcmap-1.0.6/config.h.in 2026-07-12 00:43:43.000000000 +0200 @@ -57,7 +57,7 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.5/configure.ac new/xstdcmap-1.0.6/configure.ac --- old/xstdcmap-1.0.5/configure.ac 2022-12-04 01:21:54.000000000 +0100 +++ new/xstdcmap-1.0.6/configure.ac 2026-07-12 00:43:39.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([xstdcmap], [1.0.5], +AC_INIT([xstdcmap], [1.0.6], [https://gitlab.freedesktop.org/xorg/app/xstdcmap/-/issues], [xstdcmap]) 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/xstdcmap-1.0.5/man/xstdcmap.man new/xstdcmap-1.0.6/man/xstdcmap.man --- old/xstdcmap-1.0.5/man/xstdcmap.man 2022-12-04 01:21:54.000000000 +0100 +++ new/xstdcmap-1.0.6/man/xstdcmap.man 2026-07-12 00:43:39.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ +.\" .\" Copyright 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,94 +23,79 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $ -.\" -.de EX \"Begin example -.ne 5 -.if n .sp 1 -.if t .sp .5 -.nf -.in +.5i -.. -.de EE -.fi -.in -.5i -.if n .sp 1 -.if t .sp .5 -.. -.TH XSTDCMAP 1 __xorgversion__ +.TH XSTDCMAP 1 2013-07-04 __xorgversion__ .SH NAME xstdcmap - X standard colormap utility .SH SYNOPSIS -.B xstdcmap -[-all] [-best] [-blue] [-default] [-delete \fImap\fP] [-display \fIdpy\fP] -[-gray] [-green] [-help] [-red] [-verbose] [-version] +.nf +\fBxstdcmap\fP [\fB\-all\fP] [\fB\-best\fP] [\fB\-blue\fP] [\fB\-default\fP] [\fB\-delete\fP \fImap\fP] [\fB\-display\fP \fIdpy\fP] + [\fB\-gray\fP] [\fB\-green\fP] [\fB\-help\fP] [\fB\-red\fP] [\fB\-verbose\fP] [\fB\-version\fP] +.fi .SH DESCRIPTION -.PP -The \fIxstdcmap\fP utility can be used to selectively define standard colormap -properties. It is intended to be run from a user's X startup script to +The \fBxstdcmap\fP utility can be used to selectively define standard colormap +properties. +It is intended to be run from a user's X startup script to create standard colormap definitions in order to facilitate sharing of -scarce colormap resources among clients. Where at all possible, colormaps -are created with read-only allocations. +scarce colormap resources among clients. +Where at all possible, colormaps are created with read-only allocations. .SH OPTIONS -.PP -The following options may be used with \fIxstdcmap\fP: +The following options may be used with \fBxstdcmap\fP: .TP 8 .B \-all This option indicates that all six standard colormap properties should be -defined on each screen of the display. Not all screens will support -visuals under which all six standard colormap properties are meaningful. -\fIxstdcmap\fP will determine the best -allocations and visuals for the colormap properties of a screen. Any -previously existing standard colormap properties will be replaced. +defined on each screen of the display. +Not all screens will support visuals under which +all six standard colormap properties are meaningful. +\fBxstdcmap\fP will determine the best +allocations and visuals for the colormap properties of a screen. +Any previously existing standard colormap properties will be replaced. .TP 8 .B \-best -This option indicates that the RGB_BEST_MAP should be defined. +This option indicates that the \fBRGB_BEST_MAP\fP should be defined. .TP 8 .B \-blue -This option indicates that the RGB_BLUE_MAP should be defined. +This option indicates that the \fBRGB_BLUE_MAP\fP should be defined. .TP 8 .B \-default -This option indicates that the RGB_DEFAULT_MAP should be defined. +This option indicates that the \fBRGB_DEFAULT_MAP\fP should be defined. .TP 8 .B \-delete \fImap\fP This option specifies that a specific standard colormap property, or all such properties, should be removed. -\fImap\fP may be one of: default, best, red, green, blue, gray, or all. +\fImap\fP may be one of: \fBdefault\fP, \fBbest\fP, \fBred\fP, \fBgreen\fP, +\fBblue\fP, \fBgray\fP, or \fBall\fP. .TP 8 .B \-display \fIdpy\fP -This option specifies the host and display to use; see \fIX(__miscmansuffix__)\fP. +This option specifies the host and display to use; see +.BR X (__miscmansuffix__). .TP 8 .B \-gray -This option indicates that the RGB_GRAY_MAP should be defined. +This option indicates that the \fBRGB_GRAY_MAP\fP should be defined. .TP 8 .B \-green -This option indicates that the RGB_GREEN_MAP should be defined. +This option indicates that the \fBRGB_GREEN_MAP\fP should be defined. .TP 8 .B \-help This option indicates that a brief description of the command line arguments -should be printed on the standard error. This will be done whenever an -unhandled argument is given to -.I xstdcmap. +should be printed on the standard error. +This will be done whenever an unhandled argument is given to +.B xstdcmap. .TP 8 .B \-red -This option indicates that the RGB_RED_MAP should be defined. +This option indicates that the \fBRGB_RED_MAP\fP should be defined. .TP 8 .B \-verbose -This option indicates that \fIxstdcmap\fP should +This option indicates that \fBxstdcmap\fP should print logging information as it parses its input and defines the standard colormap properties. .TP 8 .B \-version -This option indicates that \fIxstdcmap\fP should print its version and exit. +This option indicates that \fBxstdcmap\fP should print its version and exit. .SH ENVIRONMENT -.PP .TP 8 .B DISPLAY to get default host and display number. .SH SEE ALSO -X(__miscmansuffix__) +.BR X (__miscmansuffix__) .SH AUTHOR Donna Converse, MIT X Consortium - - 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/xstdcmap-1.0.5/meson.build new/xstdcmap-1.0.6/meson.build --- old/xstdcmap-1.0.5/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xstdcmap-1.0.6/meson.build 2026-07-12 00:43:39.000000000 +0200 @@ -0,0 +1,80 @@ +# 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( + 'xstdcmap', + 'c', + version: '1.0.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) + +cc = meson.get_compiler('c') + +# Replacement for XORG_DEFAULT_OPTIONS +if cc.has_argument('-fno-strict-aliasing') + add_project_arguments('-fno-strict-aliasing', language: 'c') +endif + +# Checks for pkg-config packages +dep_libxmu = dependency('xmu', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.17') +deps = [dep_libxmu, dep_libx11, dep_xproto] + +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( + 'xstdcmap', + [config_h, 'xstdcmap.c'], + dependencies: deps, + install: true, +) + +# Man page +prog_sed = find_program('sed') + +custom_target( + 'xstdcmap.man', + input: 'man/xstdcmap.man', + output: 'xstdcmap.1', + command: [ + prog_sed, + '-e', f's/__xorgversion__/"@package_string@" "X Version 11"/', + '-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/xstdcmap-1.0.5/missing new/xstdcmap-1.0.6/missing --- old/xstdcmap-1.0.5/missing 2022-12-04 01:21:58.000000000 +0100 +++ new/xstdcmap-1.0.6/missing 2026-07-12 00:43:44.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/xstdcmap-1.0.5/xstdcmap.c new/xstdcmap-1.0.6/xstdcmap.c --- old/xstdcmap-1.0.5/xstdcmap.c 2022-12-04 01:21:54.000000000 +0100 +++ new/xstdcmap-1.0.6/xstdcmap.c 2026-07-12 00:43:39.000000000 +0200 @@ -1,7 +1,7 @@ /* * $Xorg: xstdcmap.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ * - * + * Copyright 1989, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -113,7 +113,7 @@ static void usage(Status status); -static void +static void parse(int argc, char **argv) { XrmDatabase database = NULL; @@ -157,7 +157,7 @@ propertyTable[i].delete++; } } - + snprintf(option, sizeof(option), "%s%s", program_name, ".display"); if (XrmGetResource(database, option, (char *) NULL, &type, &value)) display_name = value.addr; @@ -204,7 +204,7 @@ } /* Determine the visual of greatest depth in a given visual class. - * If no such visual exists, return NULL. + * If no such visual exists, return NULL. */ static XVisualInfo * getDeepestVisual(int visual_class, /* specifies the desired visual class */ @@ -213,7 +213,7 @@ { int maxdepth = 0; XVisualInfo *v = NULL; - + for (int i = 0; i < nvisuals; i++, vinfo++) { if (vinfo->class == visual_class && vinfo->depth > maxdepth) { @@ -231,7 +231,7 @@ getBestVisual(Atom property, /* specifies the standard colormap */ XVisualInfo *vinfo, /* specifies all visuals of the screen */ int nvisuals) /* specifies number of visuals of screen */ -{ +{ XVisualInfo *v1, *v2; if (vinfo == NULL) /* unexpected: a screen with no visuals */ @@ -272,13 +272,13 @@ return "unknown visual class"; } -static int +static int doIndividualColormaps(void) { int screen, nvisuals; Status status = -1; XVisualInfo *vinfo, *v = NULL, template; - + screen = DefaultScreen(dpy); template.screen = screen; vinfo = XGetVisualInfo(dpy, VisualScreenMask, &template, &nvisuals); @@ -293,9 +293,9 @@ program_name, propertyTable[i].name); } - if (! propertyTable[i].create) + if (! propertyTable[i].create) continue; - + /* which visual is best for this property? */ v = getBestVisual(propertyTable[i].property, vinfo, nvisuals); if (v == NULL) { @@ -312,7 +312,7 @@ "%s: making %s on a %s visual of depth %u.\n", program_name, propertyTable[i].name, visualStringFromClass(v->class), v->depth); - + status = XmuLookupStandardColormap(dpy, screen, v->visualid, v->depth, propertyTable[i].property, @@ -341,6 +341,22 @@ else program_name = *argv; + /* Handle args that don't require opening a display or initializing Xrm */ + for (int n = 1; n < argc; n++) { + const char *argn = argv[n]; + /* accept single or double dash for -help & -version */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + usage(0); + } + if (strcmp(argn, "-version") == 0) { + puts(PACKAGE_STRING); + exit(0); + } + } + parse(argc, argv); if (help) { @@ -371,7 +387,7 @@ else { status = doIndividualColormaps(); if (!status && verbose) - (void) fprintf(stderr, + (void) fprintf(stderr, "Not all new colormap definitions will be retained.\n"); } Exit((status == 0) ? 1 : 0);
