Hello community, here is the log from the commit of package xdpyinfo for openSUSE:Factory checked in at 2013-06-25 07:38:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdpyinfo (Old) and /work/SRC/openSUSE:Factory/.xdpyinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdpyinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/xdpyinfo/xdpyinfo.changes 2012-05-08 12:02:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdpyinfo.new/xdpyinfo.changes 2013-06-25 14:47:15.000000000 +0200 @@ -1,0 +2,18 @@ +Sun Jun 23 18:07:41 UTC 2013 - zai...@opensuse.org + +- Update to version 1.3.1: + + Mark num_known_extensions as a const, since the size is fixed + at compile time. + + Convert sprintf calls to snprintf. + + Rename i & count in inner loop to avoid shadowing same named + vars in outer loop. + + Add xrandr to SEE ALSO section of man page. + + Add -version option to print version number. + + Combine usage messages into a single string. + + Declare 'len' as size_t to avoid unneccessary back-and-forth + conversions, fixes clang warnings. + + Mark usage() as _X_NORETURN. + + Include Xwindows.h on WIN32 to avoid type clashes. + + Add pkgconfig(xproto) BuildRequires: new dependency. + +------------------------------------------------------------------- Old: ---- xdpyinfo-1.3.0.tar.bz2 New: ---- xdpyinfo-1.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdpyinfo.spec ++++++ --- /var/tmp/diff_new_pack.vC4KEb/_old 2013-06-25 14:47:16.000000000 +0200 +++ /var/tmp/diff_new_pack.vC4KEb/_new 2013-06-25 14:47:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xdpyinfo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xdpyinfo -Version: 1.3.0 -Release: 1 -License: MIT +Version: 1.3.1 +Release: 0 Summary: Utility to display information about an X server -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(dmx) @@ -33,6 +34,7 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xxf86dga) ++++++ xdpyinfo-1.3.0.tar.bz2 -> xdpyinfo-1.3.1.tar.bz2 ++++++ ++++ 12394 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/xdpyinfo-1.3.0/ChangeLog new/xdpyinfo-1.3.1/ChangeLog --- old/xdpyinfo-1.3.0/ChangeLog 2011-10-22 06:35:12.000000000 +0200 +++ new/xdpyinfo-1.3.1/ChangeLog 2013-05-21 03:49:49.000000000 +0200 @@ -1,3 +1,105 @@ +commit b980cacaa342cbbaa3012f06ffc2c9a9c21d33ee +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon May 20 18:48:42 2013 -0700 + + xdpyinfo 1.3.1 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit fa36071570461e73b57583e490d794334b038f48 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Feb 10 19:50:21 2013 -0800 + + Mark num_known_extensions as a const, since the size is fixed at compile time + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 57a45f3b7bb745a082e459d965bee2b11e3bd7b6 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Feb 10 19:29:05 2013 -0800 + + Convert sprintf calls to snprintf + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f08b3613b2fd6995da264ea0a39c6d48dd28bf97 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Feb 10 19:10:57 2013 -0800 + + Rename i & count in inner loop to avoid shadowing same named vars in outer loop + + xdpyinfo.c: In function `print_dmx_info': + xdpyinfo.c:1282: warning: declaration of 'count' shadows a previous local + xdpyinfo.c:1231: warning: shadowed declaration is here + xdpyinfo.c:1282: warning: declaration of 'i' shadows a previous local + xdpyinfo.c:1232: warning: shadowed declaration is here + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 97db6f80f06b753c84de0276db093205ee34b0b0 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Jan 21 23:15:04 2013 -0800 + + Add xrandr to SEE ALSO section of man page + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 1b9a3d5459f61abf6285df81e4a75cb472e2a40c +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Jan 21 23:13:03 2013 -0800 + + Add -version option to print version number + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 27c57ec56abbd175c7a3ea7c50d85e91e1940c87 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Jan 21 23:08:43 2013 -0800 + + Combine usage messages into a single string + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f407231c855bc0349d0f8543a9dfe9dff4b2508b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Jan 21 23:03:48 2013 -0800 + + Declare 'len' as size_t to avoid unneccessary back-and-forth conversions + + Fixes clang warnings: + + xdpyinfo.c:1463:12: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + int len = strlen(arg); + ~~~ ^~~~~~~~~~~ + xdpyinfo.c:1465:32: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (!strncmp("-display", arg, len)) { + ~~~~~~~ ^~~ + xdpyinfo.c:1468:47: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + } else if (!strncmp("-queryExtensions", arg, len)) { + ~~~~~~~ ^~~ + xdpyinfo.c:1470:35: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + } else if (!strncmp("-ext", arg, len)) { + ~~~~~~~ ^~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ee596f7f67b203d04974fce16deadfcd122d0441 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Jan 21 23:02:57 2013 -0800 + + Mark usage() as _X_NORETURN + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 5509502647a997959ec056fec23d471b73eddb5f +Author: Jon TURNEY <jon.tur...@dronecode.org.uk> +Date: Wed Jan 4 18:21:51 2012 +0000 + + Include Xwindows.h on WIN32 to avoid type clashes + + Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + Reviewed-by: Yaakov Selkowitz <yselkow...@users.sourceforge.net> + commit 02376118fb58c05067054be3f2e469f461f81757 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri Oct 21 21:34:32 2011 -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/xdpyinfo-1.3.0/configure.ac new/xdpyinfo-1.3.1/configure.ac --- old/xdpyinfo-1.3.0/configure.ac 2011-10-22 06:34:21.000000000 +0200 +++ new/xdpyinfo-1.3.1/configure.ac 2013-05-21 03:49:03.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xdpyinfo], [1.3.0], +AC_INIT([xdpyinfo], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xdpyinfo]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -36,7 +36,7 @@ AC_CONFIG_HEADERS([config.h]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst x11-xcb xcb) +PKG_CHECK_MODULES(XDPYINFO, [xext x11 xtst x11-xcb xcb xproto >= 7.0.17]) # This is used below to allow <X11/Xlib.h> to be found PKG_CHECK_MODULES(DPY_X11, x11) 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/xdpyinfo-1.3.0/man/xdpyinfo.man new/xdpyinfo-1.3.1/man/xdpyinfo.man --- old/xdpyinfo-1.3.0/man/xdpyinfo.man 2011-09-29 05:41:43.000000000 +0200 +++ new/xdpyinfo-1.3.1/man/xdpyinfo.man 2013-05-21 03:49:03.000000000 +0200 @@ -30,6 +30,7 @@ [\-display \fIdisplayname\fP] [\-queryExtensions] [\-ext \fIextension-name\fP] +[-version] .SH DESCRIPTION .PP .I Xdpyinfo @@ -49,6 +50,9 @@ \fB\-ext\fP \fIextensionName\fP option. If \fIextensionName\fP is \fBall\fP, information about all extensions supported by both \fIxdpyinfo\fP and the server is displayed. +.PP +If \fB-version\fP is specified, xdpyinfo prints its version and exits, without +contacting the X server. .SH ENVIRONMENT .PP .TP 8 @@ -59,6 +63,7 @@ .IR xprop (__appmansuffix__), .IR xrdb (__appmansuffix__), .IR xwininfo (__appmansuffix__), +.IR xrandr (__appmansuffix__), .IR xdriinfo (__appmansuffix__), .IR xvinfo (__appmansuffix__), .IR glxinfo (__appmansuffix__) 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/xdpyinfo-1.3.0/missing new/xdpyinfo-1.3.1/missing --- old/xdpyinfo-1.3.0/missing 2011-10-22 06:34:57.000000000 +0200 +++ new/xdpyinfo-1.3.1/missing 2013-05-21 03:49:11.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-autom...@gnu.org>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + 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:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' 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 "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + 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/>" + ;; + 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." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/xdpyinfo-1.3.0/xdpyinfo.c new/xdpyinfo-1.3.1/xdpyinfo.c --- old/xdpyinfo-1.3.0/xdpyinfo.c 2011-09-29 05:51:46.000000000 +0200 +++ new/xdpyinfo-1.3.1/xdpyinfo.c 2013-05-21 03:49:03.000000000 +0200 @@ -78,6 +78,10 @@ #endif +#ifdef WIN32 +#include <X11/Xwindows.h> +#endif + #include <X11/Xlib-xcb.h> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -332,7 +336,8 @@ case LSBFirst: cp = "LSBFirst"; break; case MSBFirst: cp = "MSBFirst"; break; default: - sprintf (dummybuf, "unknown order %d", BitmapBitOrder (dpy)); + snprintf (dummybuf, sizeof(dummybuf), + "unknown order %d", BitmapBitOrder (dpy)); cp = dummybuf; break; } @@ -343,7 +348,8 @@ case LSBFirst: cp = "LSBFirst"; break; case MSBFirst: cp = "MSBFirst"; break; default: - sprintf (dummybuf, "unknown order %d", ImageByteOrder (dpy)); + snprintf (dummybuf, sizeof(dummybuf), + "unknown order %d", ImageByteOrder (dpy)); cp = dummybuf; break; } @@ -417,7 +423,7 @@ case TrueColor: class = "TrueColor"; break; case DirectColor: class = "DirectColor"; break; default: - sprintf (errorbuf, "unknown class %d", vip->class); + snprintf (errorbuf, sizeof(errorbuf), "unknown class %d", vip->class); class = errorbuf; break; } @@ -1275,15 +1281,15 @@ if (ext && ext != (XExtensionVersion *)NoSuchExtension) { - int count, i; + int dcount, d; XDeviceInfo *devInfo = XListInputDevices(backend, - &count); + &dcount); if (devInfo) { - for (i = 0; i < count; i++) { + for (d = 0; d < dcount; d++) { if ((unsigned)iinfo.physicalId - == devInfo[i].id - && devInfo[i].name) { - backendname = strdup(devInfo[i].name); + == devInfo[d].id + && devInfo[d].name) { + backendname = strdup(devInfo[d].name); break; } } @@ -1369,7 +1375,7 @@ /* add new extensions here */ }; -static int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0]; +static const int num_known_extensions = sizeof known_extensions / sizeof known_extensions[0]; static void print_known_extensions(FILE *f) @@ -1432,14 +1438,15 @@ } } -static void +static void _X_NORETURN usage(void) { - fprintf (stderr, "usage: %s [options]\n", ProgramName); - fprintf (stderr, "-display displayname\tserver to query\n"); - fprintf (stderr, "-queryExtensions\tprint info returned by XQueryExtension\n"); - fprintf (stderr, "-ext all\t\tprint detailed info for all supported extensions\n"); - fprintf (stderr, "-ext extension-name\tprint detailed info for extension-name if one of:\n "); + fprintf (stderr, "usage: %s [options]\n%s", ProgramName, + "-display displayname\tserver to query\n" + "-version\t\tprint program version and exit\n" + "-queryExtensions\tprint info returned by XQueryExtension\n" + "-ext all\t\tprint detailed info for all supported extensions\n" + "-ext extension-name\tprint detailed info for extension-name if one of:\n "); print_known_extensions(stderr); fprintf (stderr, "\n"); exit (1); @@ -1456,7 +1463,7 @@ for (i = 1; i < argc; i++) { char *arg = argv[i]; - int len = strlen(arg); + size_t len = strlen(arg); if (!strncmp("-display", arg, len)) { if (++i >= argc) usage (); @@ -1466,6 +1473,9 @@ } else if (!strncmp("-ext", arg, len)) { if (++i >= argc) usage (); mark_extension_for_printing(argv[i]); + } else if (!strncmp("-version", arg, len)) { + printf("%s\n", PACKAGE_STRING); + exit (0); } else usage (); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
