Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xpr for openSUSE:Factory checked in at 2026-08-27 18:54:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xpr (Old) and /work/SRC/openSUSE:Factory/.xpr.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xpr" Thu Aug 27 18:54:42 2026 rev:10 rq:1374059 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xpr/xpr.changes 2024-03-04 21:25:19.538808400 +0100 +++ /work/SRC/openSUSE:Factory/.xpr.new.1265/xpr.changes 2026-08-27 18:57:01.356506115 +0200 @@ -1,0 +2,9 @@ +Thu Aug 20 11:34:43 UTC 2026 - Stefan Dirsch <[email protected]> + +- Update to version 1.2.1 + * This release adds support for -help, --help, -version, and + --version options. + * add support for meson build +- switch to meson + +------------------------------------------------------------------- Old: ---- xpr-1.2.0.tar.xz New: ---- xpr-1.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpr.spec ++++++ --- /var/tmp/diff_new_pack.dmAc5r/_old 2026-08-27 18:57:02.085531779 +0200 +++ /var/tmp/diff_new_pack.dmAc5r/_new 2026-08-27 18:57:02.086531815 +0200 @@ -1,7 +1,7 @@ # # spec file for package xpr # -# 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,14 +17,14 @@ Name: xpr -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: Utility to print an X window dump License: MIT Group: System/X11/Utilities URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.xz -BuildRequires: pkgconfig +BuildRequires: meson BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xmuu) BuildRequires: pkgconfig(xorg-macros) >= 1.3 @@ -40,11 +40,11 @@ %setup -q %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %files %license COPYING ++++++ xpr-1.2.0.tar.xz -> xpr-1.2.1.tar.xz ++++++ ++++ 10823 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/xpr-1.2.0/ChangeLog new/xpr-1.2.1/ChangeLog --- old/xpr-1.2.0/ChangeLog 2024-03-04 00:02:23.000000000 +0100 +++ new/xpr-1.2.1/ChangeLog 2026-08-17 19:43:40.000000000 +0200 @@ -1,3 +1,96 @@ +commit 20dfad597880ce8b296fba3ac32cb1890cfaaaac +Author: Alan Coopersmith <[email protected]> +Date: Mon Aug 17 10:38:44 2026 -0700 + + xpr 1.2.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1aa74a69931601f53a578e811e874f84c5a22153 +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 19 12:18:27 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/xpr/-/merge_requests/15> + +commit bb298ccb8ec393793fc6868832c15efc7bc2c8e2 +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/xpr/-/merge_requests/15> + +commit 81947fa827b59a182828ceb2765a0be3660724e6 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 31 10:46:16 2025 -0700 + + man page: fix warnings from `mandoc -T lint` and `groff -rCHECKSTYLE=10` + + mandoc: xdpr.1:1:12: WARNING: cannot parse date, using it verbatim: TH xpr 1.2.0 + mandoc: xpr.1:152:81: STYLE: input text line longer than 80 bytes: This doubles, triple... + mandoc: xpr.1:345:81: STYLE: input text line longer than 80 bytes: Consult the operator... + mandoc: xpr.1:1:11: WARNING: cannot parse date, using it verbatim: TH xpr 1.2.0 + mandoc: xpr.1:327:2: WARNING: skipping paragraph macro: PP after SH + mandoc: xpr.1:339:2: WARNING: skipping paragraph macro: PP after SH + an.tmac:xpr.1:63: style: blank line in input + an.tmac:xpr.1:320: style: blank line in input + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xpr/-/merge_requests/14> + +commit 1458547ce529849f12417076a56dabf3a2868777 +Author: Alan Coopersmith <[email protected]> +Date: Sun Apr 6 13:01:43 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/xpr/-/merge_requests/13> + +commit a70699b351b33250dd5ee2e428c7985f9eb4cf9f +Author: Alan Coopersmith <[email protected]> +Date: Sun Apr 6 12:10:38 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/xpr/-/merge_requests/13> + +commit 718abfff29310bcba29aeb990e4398c043dd9e8e +Author: Alan Coopersmith <[email protected]> +Date: Sun Apr 6 12:10:11 2025 -0700 + + xdpr: add -version option + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xpr/-/merge_requests/13> + +commit 461f432056ffea245585e84c6eb83aadf4c32be8 +Author: Alan Coopersmith <[email protected]> +Date: Sun Apr 6 11:59:58 2025 -0700 + + xpr: add -help option + + Signed-off-by: Alan Coopersmith <[email protected]> + Part-of: <https://gitlab.freedesktop.org/xorg/app/xpr/-/merge_requests/13> + commit cf22dfd15e2db067767534290e4c8f2e6f6130b8 Author: Alan Coopersmith <[email protected]> Date: Sun Mar 3 14:59:05 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/xpr-1.2.0/Makefile.am new/xpr-1.2.1/Makefile.am --- old/xpr-1.2.0/Makefile.am 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/Makefile.am 2026-08-17 19:43:29.000000000 +0200 @@ -43,7 +43,7 @@ CLEANFILES = xdpr -EXTRA_DIST = xdpr.script ChangeLog autogen.sh README.md +EXTRA_DIST = xdpr.script ChangeLog autogen.sh README.md meson.build MAINTAINERCLEANFILES=ChangeLog 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/xpr-1.2.0/compile new/xpr-1.2.1/compile --- old/xpr-1.2.0/compile 2024-03-04 00:02:18.000000000 +0100 +++ new/xpr-1.2.1/compile 2026-08-17 19:43:34.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/xpr-1.2.0/configure.ac new/xpr-1.2.1/configure.ac --- old/xpr-1.2.0/configure.ac 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/configure.ac 2026-08-17 19:43:29.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xpr], [1.2.0], +AC_INIT([xpr], [1.2.1], [https://gitlab.freedesktop.org/xorg/app/xpr/-/issues], [xpr]) 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/xpr-1.2.0/meson.build new/xpr-1.2.1/meson.build --- old/xpr-1.2.0/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xpr-1.2.1/meson.build 2026-08-17 19:43:29.000000000 +0200 @@ -0,0 +1,98 @@ +# 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( + 'xpr', + 'c', + version: '1.2.1', +# license_files: 'COPYING', + meson_version: '>= 0.60.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_libxmuu = dependency('xmuu', required: true) +dep_libx11 = dependency('x11', required: true) +dep_xproto = dependency('xproto', required: true, version: '>= 7.0.25') +deps = [dep_libxmuu, dep_libx11, dep_xproto] + +config_h = configure_file(output: 'config.h', configuration: conf) +add_project_arguments('-DHAVE_CONFIG_H', language: ['c']) + +add_project_arguments('-DNOINLINE', language: ['c']) + +xpr_sources = [ + config_h, + 'pmp.h', + 'x2jet.c', + 'x2pmp.c', + 'xpr.c', + 'xpr.h', +] + +executable( + 'xpr', + xpr_sources, + dependencies: deps, + install: true, +) + +install_data( + 'xdpr.script', + install_mode: 'rwxr-xr-x', + install_dir: get_option('bindir'), + install_tag: 'runtime', + rename: ['xdpr'], +) + +# Man pages +prog_sed = find_program('sed') +foreach p : ['xdpr', 'xpr'] + custom_target( + f'@[email protected]', + input: f'@[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/xpr-1.2.0/missing new/xpr-1.2.1/missing --- old/xpr-1.2.0/missing 2024-03-04 00:02:18.000000000 +0100 +++ new/xpr-1.2.1/missing 2026-08-17 19:43:34.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/xpr-1.2.0/xdpr.man new/xpr-1.2.1/xdpr.man --- old/xpr-1.2.0/xdpr.man 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/xdpr.man 2026-08-17 19:43:29.000000000 +0200 @@ -1,69 +1,66 @@ -.TH XDPR 1 __xorgversion__ +.TH XDPR 1 2022-04-02 __xorgversion__ .SH NAME xdpr \- dump an X window directly to a printer .SH SYNOPSIS .B xdpr -[ -.I filename -] -[ -.B \-display -.I host:display -] -[ -.B \-P\fIprinter\fP -] -[ -.B \-device -.I devtype -] -[ -.I option -\&.\|.\|. -] - +.RI [ filename ] +.RB [ \-display +.IR host:display ] +.RB [ \-P\fIprinter\fP ] +.RB [ \-device +.IR devtype ] +.br +.RI " [" option \&.\|.\|.] .SH DESCRIPTION -.I Xdpr +.B Xdpr uses the commands -.I xwd, -.I xpr, +.BR xwd (1), +.BR xpr (1), and -.I lpr +.BR lpr (1) or -.I lp -to dump an X window, process it for a particular printer type, and -print it out on the printer of your choice. This is the easiest way -to get a printout of a window. \fIXdpr\fP by default will print the +.BR lp (1) +to dump an X window, process it for a particular printer type, +and print it out on the printer of your choice. +This is the easiest way to get a printout of a window. +\fBXdpr\fP by default will print the largest possible representation of the window on the output page. .PP -The options for \fIxdpr\fP are the same as those for \fIxpr\fP, -\fIxwd\fP, and \fIlpr\fP or \fIlp\fP. -The most commonly-used options are described -below; see the manual pages for these commands for +The options for \fBxdpr\fP are the same as those for +.BR xwd (1), +.BR xpr (1), +and +.BR lpr (1) +or +.BR lp (1). +The most commonly-used options are described below; +see the manual pages for these commands for more detailed descriptions of the many options available. .SH OPTIONS .TP .I filename -Specifies a file containing a window dump (created by \fIxwd\fP) to be +Specifies a file containing a window dump (created by \fBxwd\fP) to be printed instead of selecting an X window. .TP .B \-P\fIprinter\fP -Specifies a printer to send the output to. If a printer name is not -specified here, \fIxdpr\fP (really, \fIlpr\fP or \fIlp\fP) -will send your output to the -printer specified by the \fIPRINTER\fP environment variable. +Specifies a printer to send the output to. +If a printer name is not specified here, \fBxdpr\fP +(really, \fBlpr\fP or \fBlp\fP) will send your output to the +printer specified by the \fBPRINTER\fP environment variable. Be sure that type of the printer matches the type specified -with the \fI\-device\fP option. +with the \fB\-device\fP option. .TP -.B \-display \fIhost:display\fP[\fI.screen\fP] +\fB\-display\fP \fIhost:display\fP[\fI.screen\fP] Normally, -.I xdpr -gets the host and display number to use from the environment -variable ``DISPLAY.'' -One can, however, specify them explicitly; see \fIX\fP(__miscmansuffix__). +.B xdpr +gets the host and display number to use from the environment variable +.BR DISPLAY . +One can, however, specify them explicitly; see +.BR X (__miscmansuffix__). .TP .B \-device \fIdevtype\fP -Specifies the device on which the file will be printed. Currently supported: +Specifies the device on which the file will be printed. +Currently supported: .RS 12 .PD 0 .TP @@ -92,30 +89,29 @@ .TP .B \-help This option displays the list of options known to -.I xdpr. +.BR xdpr . .PP -Any other arguments -will be passed to the -.I xwd, -.I xpr, +Any other arguments will be passed to the +.BR xwd (1), +.BR xpr (1), and -.I lpr +.BR lpr (1) or -.I lp +.BR lp (1) commands as appropriate for each. .SH SEE ALSO -.IR xwd (1), -.IR xpr (1), -.IR lpr (1), -.IR lp (1), -.IR xwud (1), -.IR X (__miscmansuffix__) +.BR xwd (1), +.BR xpr (1), +.BR lpr (1), +.BR lp (1), +.BR xwud (1), +.BR X (__miscmansuffix__) .SH ENVIRONMENT .TP 10 -DISPLAY +.B DISPLAY which display to use by default. .TP 10 -PRINTER +.B PRINTER which printer to use by default. .SH AUTHORS Paul Boutin, MIT Project Athena 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/xpr-1.2.0/xdpr.script new/xpr-1.2.1/xdpr.script --- old/xpr-1.2.0/xdpr.script 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/xdpr.script 2026-08-17 19:43:29.000000000 +0200 @@ -47,10 +47,14 @@ # ...arguments interpreted by xdpr itself... - -help) + -help|--help) echo $usage; exit 0;; + -version|--version) + exec xpr -version; + exit 0;; + # ...arguments to xwd... -nobdrs|-root|-xy|-frame) 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/xpr-1.2.0/xpr.c new/xpr-1.2.1/xpr.c --- old/xpr-1.2.0/xpr.c 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/xpr.c 2026-08-17 19:43:29.000000000 +0200 @@ -243,7 +243,7 @@ /* Local prototypes */ -static void usage(void) _X_NORETURN; +static void usage(int exitstatus) _X_NORETURN _X_COLD; static void parse_args( int argc, @@ -483,25 +483,25 @@ { fprintf (stderr, "%s: %s is not a valid value for %s\n\n", progname, value, arg); - usage(); + usage(EXIT_FAILURE); } static void _X_NORETURN _X_COLD missing_arg(const char *arg) { fprintf (stderr, "%s: %s requires an argument\n\n", progname, arg); - usage(); + usage(EXIT_FAILURE); } static void _X_NORETURN _X_COLD unknown_arg(const char *arg) { fprintf (stderr, "%s: unrecognized argument %s\n\n", progname, arg); - usage(); + usage(EXIT_FAILURE); } static void _X_NORETURN _X_COLD -usage(void) +usage(int exitstatus) { fprintf(stderr, "usage: %s [options] [file]\n%s", progname, " -append <file> -noff -output <file>\n" @@ -510,13 +510,14 @@ " -dump\n" " -gamma <correction>\n" " -gray {2 | 3 | 4}\n" - " -height <inches> -width <inches>\n" " -header <string> -trailer <string>\n" + " -height <inches> -width <inches>\n" + " -help\n" " -landscape -portrait\n" " -left <inches> -top <inches>\n" " -noposition\n" " -papertype {letter | legal | A0-A10 | B0-B10 | C0-C10}\n" - " -pheight <inches>[in | cm | mm] -pwidth <inches>[in | cm | mm]\n" + " -pheight <n>[in | cm | mm] -pwidth <n>[in | cm | mm]\n" " -plane <n>\n" " -psfig\n" " -render <type>\n" @@ -527,7 +528,7 @@ " -split <n-pages>\n" " -version\n" ); - exit(EXIT_FAILURE); + exit(exitstatus); } static @@ -642,6 +643,8 @@ argc--; argv++; if (argc == 0) missing_arg(arg); *header = *argv; + } else if (!strcmp(*argv, "-help") || !strcmp(*argv, "--help")) { + usage(EXIT_SUCCESS); } else if (!strcmp(*argv, "-landscape")) { *flags |= F_LANDSCAPE; } else if (!strcmp(*argv, "-left")) { @@ -673,7 +676,7 @@ *paper_length = (int)(300.0 * paper_size[i].length); } } - if (!found) usage(); + if (!found) invalid_arg_value(arg, *argv); } else if (!strcmp(*argv, "-plane")) { argc--; argv++; if (argc == 0) missing_arg(arg); @@ -726,7 +729,7 @@ argc--; argv++; if (argc == 0) missing_arg(arg); *trailer = *argv; - } else if (strcmp(*argv, "-version") == 0) { + } else if (!strcmp(*argv, "-version") || !strcmp(*argv, "--version")) { puts(PACKAGE_STRING); exit(0); } else if (!strcmp(*argv, "-width")) { 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/xpr-1.2.0/xpr.man new/xpr-1.2.1/xpr.man --- old/xpr-1.2.0/xpr.man 2024-03-04 00:02:13.000000000 +0100 +++ new/xpr-1.2.1/xpr.man 2026-08-17 19:43:29.000000000 +0200 @@ -1,106 +1,82 @@ -.TH XPR 1 __xorgversion__ +.TH XPR 1 2025-04-06 __xorgversion__ .SH NAME xpr \- print an X window dump .SH SYNOPSIS .B xpr -[ -.B \-device -.I devtype -] [ -.B \-scale -.I scale -] [ -.B \-height -.I inches -] [ -.B \-width -.I inches -] [ -.B \-left -.I inches -] [ -.B \-top -.I inches -] [ -.B \-header -.I string -] [ -.B \-trailer -.I string -] [ -.B \-landscape -] [ -.B \-portrait -] [ -.B \-plane -.I number -] [ -.B \-gray -] [ -.B \-rv -] [ -.B \-compact -] [ -.B \-output -.I filename -] [ -.B \-append -.I filename -] [ -.B \-noff -] [ -.B \-split -.I n -] [ -.B \-papertype -.I format -] [ -.B \-pheight -.I inches -[ -.I units -]] [ -.B \-pwidth -.I inches -[ -.I units -]] [ -.B \-psfig -] [ -.B \-density -.I dpi -] [ -.B \-cutoff -.I level -] [ -.B \-noposition -] [ -.B \-gamma -.I correction -] [ -.B \-render -.I algorithm -] [ -.B \-slide -] [ -.B \-version -] [ -.I filename -] +.RB [ \-device +.IR devtype ] +.RB [ \-scale +.IR scale ] +.br +.RB " [" \-height +.IR inches ] +.RB [ \-width +.IR inches ] +.RB [ \-left +.IR inches ] +.RB [ \-top +.IR inches ] +.br +.RB " [" \-header +.IR string ] +.RB [ \-trailer +.IR string ] +.RB [ \-landscape ] +.RB [ \-portrait ] +.br +.RB " [" \-plane +.IR number ] +.RB [ \-gray ] +.RB [ \-rv ] +.RB [ \-compact ] +.br +.RB " [" \-output +.IR filename ] +.RB [ \-append +.IR filename ] +.RB [ \-noff ] +.RB [ \-split +.IR n ] +.br +.RB " [" \-papertype +.IR format ] +.RB [ \-pheight +.I size +.RI [ units ]] +.RB [ \-pwidth +.I size +.RI [ units ]] +.br +.RB " [" \-psfig ] +.RB [ \-density +.IR dpi ] +.RB [ \-cutoff +.IR level ] +.RB [ \-noposition ] +.br +.RB " [" \-gamma +.IR correction ] +.RB [ \-render +.IR algorithm ] +.RB [ \-slide ] +.RI [ filename ] +.sp +.B xpr +.BR \-help | \-version .SH DESCRIPTION - -.I xpr +.B xpr takes as input a window dump file produced by -.IR xwd(1) +.BR xwd (1) and formats it for output on PostScript printers, the IBM PP3812 page printer, the HP LaserJet (or other PCL printers), -or the HP PaintJet. If no file -argument is given, the standard input is used. By default, \fIxpr\fP -prints the largest possible representation of the window on the -output page. Options allow the user to add headers and trailers, -specify margins, adjust the scale and orientation, and append -multiple window dumps to a single output file. Output is to -standard output unless +or the HP PaintJet. +If no file argument is given, the standard input is used. +By default, \fBxpr\fP prints the largest possible representation of the window +on the output page. +Options allow the user to add headers and trailers, +specify margins, adjust the scale and orientation, +and append multiple window dumps to a single output file. +Output is to standard output unless .B \-output is specified. .sp 1 @@ -108,7 +84,8 @@ .B Command Options .sp 1 .IP "\fB\-device\fP \fIdevtype\fP" -Specifies the device on which the file will be printed. Currently supported: +Specifies the device on which the file will be printed. +Currently supported: .RS 12 .PD 0 .TP @@ -132,55 +109,58 @@ .RE .IP The default is PostScript. -\fB-device lw\fP (LaserWriter) is equivalent to -device ps and is +\fB-device lw\fP (LaserWriter) is equivalent to \fB-device ps\fP and is provided only for backwards compatibility. .IP "\fB\-scale\fP \fIscale\fP" -Affects the size of the window on the page. The PostScript and HP -printers are able to +Affects the size of the window on the page. +The PostScript and HP printers are able to translate each bit in a window pixel map into a grid of a specified size. -For example each bit might translate into a 3x3 grid. This would be -specified by \fB\-scale\fP \fI3\fP. By default a window is printed -with the largest scale that will fit onto the page for the specified -orientation. +For example each bit might translate into a 3x3 grid. +This would be specified by \fB\-scale\fP \fI3\fP. +By default a window is printed with the largest scale +that will fit onto the page for the specified orientation. .IP "\fB\-height\fP \fIinches\fP" Specifies the maximum height of the page. .IP "\fB\-width\fP \fIinches\fP" Specifies the maximum width of the page. .IP "\fB\-left\fP \fIinches\fP" -Specifies the left margin in inches. Fractions -are allowed. By default the window is centered in the page. +Specifies the left margin in inches. +Fractions are allowed. +By default the window is centered in the page. .IP "\fB\-top\fP \fIinches\fP" -Specifies the top margin for the picture in inches. Fractions are -allowed. +Specifies the top margin for the picture in inches. +Fractions are allowed. .IP "\fB\-header\fP \fIstring\fP" Specifies a header string to be printed above the window. .IP "\fB\-trailer\fP \fIstring\fP" Specifies a trailer string to be printed below the window. .IP "\fB\-landscape\fP" -Forces the window to printed in landscape mode. By default -a window is printed such that its longest side follows the long side of -the paper. +Forces the window to printed in landscape mode. +By default a window is printed such that its longest side +follows the long side of the paper. +.IP "\fB\-portrait\fP" +Forces the window to be printed in portrait mode. +By default a window is printed such that its longest side +follows the long side of the paper. .IP "\fB\-plane\fP \fInumber\fP" -Specifies which bit plane to use in an image. The default is to use the -entire image and map values into black and white based on color intensities. -.IP "\fB\-gray\fP \fI 2 | 3 | 4\fP" +Specifies which bit plane to use in an image. +The default is to use the entire image and +map values into black and white based on color intensities. +.IP "\fB\-gray 2\fP | \fB3\fP | \fB4\fP" Uses a simple 2x2, 3x3, or 4x4 gray scale conversion on a color image, -rather than mapping to strictly black and white. This doubles, -triples, or quadruples the effective width and height of the image. -.IP "\fB\-portrait\fP" -Forces the window to be printed in portrait mode. By default -a window is printed such that its longest side follows the long side of -the paper. +rather than mapping to strictly black and white. +This doubles, triples, or quadruples +the effective width and height of the image. .IP "\fB\-rv\fP" Forces the window to be printed in reverse video. .IP "\fB\-compact\fP" Uses simple run-length encoding for compact representation of windows with lots of white pixels. .IP "\fB\-output\fP \fIfilename\fP" -Specifies an output file name. If this option is not specified, standard -output is used. +Specifies an output file name. +If this option is not specified, standard output is used. .IP "\fB\-append\fP \fIfilename\fP" -Specifies a filename previously produced by \fIxpr\fP to which the window +Specifies a filename previously produced by \fBxpr\fP to which the window is to be appended. .IP "\fB\-noff\fP" When specified in conjunction with \fB\-append\fP, the window will appear @@ -300,13 +280,14 @@ C10 size 28x40 mm or 1.10x 1.57 inches .PD .RE -.IP "\fB\-pheight\fP \fIinches\fP [ \fIunits\fP ]" -This option allows the user to specify a specific paper height. The -default units are in inches (in), but may be overridden with cm or mm +.IP "\fB\-pheight\fP \fIsize\fP [ \fIunits\fP ]" +This option allows the user to specify a specific paper height. +The default units are in inches (\fBin\fP), +but may be overridden with \fBcm\fP or \fBmm\fP for centimeters or millimeters respectively. -.IP "\fB\-pwidth\fP \fIinches\fP [ \fIunits\fP ]" -This option allows the user to specify a specific paper width. The -default units are in inches (in), but may be overridden with cm or mm +.IP "\fB\-pwidth\fP \fIsize\fP [ \fIunits\fP ]" +This option allows the user to specify a specific paper width. +but may be overridden with \fBcm\fP or \fBmm\fP for centimeters or millimeters respectively. .IP "\fB\-psfig\fP" Suppress translation of the PostScript picture to the center of the page. @@ -315,66 +296,68 @@ .IP "\fB\-cutoff\fP \fIlevel\fP" Changes the intensity level where colors are mapped to either black or white for monochrome output on a LaserJet printer. -The \fIlevel\fP is expressed as percentage of -full brightness. Fractions are allowed. +The \fIlevel\fP is expressed as percentage of full brightness. +Fractions are allowed. .IP "\fB\-noposition\fP" This option causes header, trailer, and image positioning command -generation to be bypassed for LaserJet, PaintJet and -PaintJet XL printers. +generation to be bypassed for LaserJet, PaintJet and PaintJet XL printers. .IP "\fB\-gamma\fP \fIcorrection\fP" -This changes the intensity of the colors printed by -PaintJet XL printer. The \fIcorrection\fP is -a floating point value in the range 0.00 to 3.00. +This changes the intensity of the colors printed by a PaintJet XL printer. +The \fIcorrection\fP is a floating point value in the range 0.00 to 3.00. Consult the operator's manual to determine the correct value for the specific printer. .IP "\fB\-render\fP \fIalgorithm\fP" -This allows PaintJet XL printer to render the +This allows a PaintJet XL printer to render the image with the best quality versus performance tradeoff. Consult the operator's manual to determine which \fIalgorithm\fPs are available. .IP "\fB\-slide\fP" This option allows overhead transparencies to be printed using the PaintJet and PaintJet XL printers. +.IP "\fB\-help\fP" +This option prints the program usage information and exits. .IP "\fB\-version\fP" This option prints the program version information and exits. - .SH SEE ALSO -xwd(1), xwud(1), X(__miscmansuffix__) +.BR xdpr (1), +.BR xwd (1), +.BR xwud (1), +.BR X (__miscmansuffix__) .SH LIMITATIONS - Support for PostScript output currently cannot handle the \fB-append\fP, -\fB-noff\fP or \fB-split\fP options. - +\fB-noff\fP, or \fB-split\fP options. +.PP The \fB-compact\fP option is .I only supported for PostScript output. -It compresses white space but not black space, so it is not useful for -reverse-video windows. - +It compresses white space but not black space, +so it is not useful for reverse-video windows. +.PP For color images, should map directly to PostScript image support. - .SH "HP PRINTERS" - -If no \fB\-density\fP is specified on the command line 300 dots per inch -will be assumed for \fIljet\fP and 90 dots per inch for \fIpjet\fP. +If no \fB\-density\fP is specified on the command line, +300 dots per inch will be assumed for \fIljet\fP +and 90 dots per inch for \fIpjet\fP. Allowable \fIdensity\fP values for a LaserJet printer are 300, 150, 100, -and 75 dots per inch. Consult the operator's manual to determine densities +and 75 dots per inch. +Consult the operator's manual to determine densities supported by other printers. - +.PP If no \fB\-scale\fP is specified the image will be expanded to fit the printable page area. - -The default printable page area is 8x10.5 inches. Other paper sizes can -be accommodated using the \fB\-height\fP and \fB\-width\fP options. - +.PP +The default printable page area is 8x10.5 inches. +Other paper sizes can be accommodated using the \fB\-papertype\fP option +or the \fB\-height\fP and \fB\-width\fP options. +.PP Note that a 1024x768 image fits the default printable area when processed at 100 dpi with scale=1, the same image can also be printed using 300 dpi with scale=3 but will require considerably more data be transferred to the printer. - -\fIxpr\fP may be tailored for use with monochrome PCL printers other than -the LaserJet. To print on a ThinkJet (\s-1HP\s+12225A) \fIxpr\fP could be -invoked as: +.PP +\fBxpr\fP may be tailored for use with monochrome PCL printers other than +the LaserJet. +To print on a ThinkJet (\s-1HP\s+12225A) \fIxpr\fP could be invoked as: .sp .RS 4 xpr -density 96 -width 6.667 \fIfilename\fP @@ -385,50 +368,54 @@ .RS 4 xpr -density 180 \fIfilename\fP .RE - -The monochrome intensity of a pixel is computed as 0.30*R + 0.59*G -+ 0.11*B. +.PP +The monochrome intensity of a pixel is computed as +\fI0.30*R + 0.59*G + 0.11*B\fP. If a pixel's computed intensity is less than the \fB\-cutoff\fP -level it will print as white. This maps light-on-dark display images -to black-on-white hardcopy. The default cutoff intensity is 50% of full -brightness. Example: specifying \fB\-cutoff 87.5\fP moves the +level it will print as white. +This maps light-on-dark display images to black-on-white hardcopy. +The default cutoff intensity is 50% of full brightness. +Example: specifying \fB\-cutoff 87.5\fP moves the white/black intensity point to 87.5% of full brightness. - +.PP A LaserJet printer must be configured with sufficient memory to handle the -image. For a full page at 300 dots per inch approximately 2MB of printer +image. +For a full page at 300 dots per inch approximately 2MB of printer memory is required. - -Color images are produced on the PaintJet -at 90 dots per inch. The -PaintJet is limited to sixteen colors from its 330 color palette on each -horizontal print line. \fIxpr\fP will issue a warning message if more than -sixteen colors are encountered on a line. \fIxpr\fP will program the -PaintJet for the first sixteen colors encountered on each line and use the +.PP +Color images are produced on the PaintJet at 90 dots per inch. +The PaintJet is limited to sixteen colors from its 330 color palette on each +horizontal print line. +\fBxpr\fP will issue a warning message if more than +sixteen colors are encountered on a line. +\fBxpr\fP will program the PaintJet for the first sixteen colors encountered +on each line and use the nearest matching programmed value for other colors present on the line. - +.PP Specifying the \fB\-rv\fP, reverse video, option for the PaintJet will cause black and white to be interchanged on the output image. No other colors are changed. - -Multiplane images must be recorded by \fIxwd\fP in \fIZPixmap\fP format. -Single plane (monochrome) images may be in either \fIXYPixmap\fP or -\fIZPixmap\fP format. - -Some PCL printers do not recognize image positioning commands. Output for -these printers will not be centered on the page and header and trailer -strings may not appear where expected. - +.PP +Multiplane images must be recorded by \fBxwd\fP in \fBZPixmap\fP format. +Single plane (monochrome) images may be in either \fBXYPixmap\fP or +\fBZPixmap\fP format. +.PP +Some PCL printers do not recognize image positioning commands. +Output for these printers will not be centered on the page +and header and trailer strings may not appear where expected. +.PP The \fB\-gamma\fP and \fB-render\fP options are supported only on the PaintJet XL printers. - +.PP The \fB\-slide\fP option is not supported for LaserJet printers. - +.PP The \fB\-split\fP option is not supported for HP printers. - +.PP The \fB\-gray\fP option is not supported for HP or IBM printers. .SH AUTHORS Michael R. Gretzinger, MIT Project Athena, Jose Capo, MIT Project Athena (PP3812 support), Marvin Solomon, University of Wisconsin, Bob Scheifler, MIT, Angela Bock and E. Mike Durbin, Rich Inc. (grayscale), -Larry Rupp, HP (HP printer support). +Larry Rupp, HP (HP printer support), +Jay Hobson, Sun Microsystems (papertype support).
