Hello community, here is the log from the commit of package xrefresh for openSUSE:Factory checked in at 2013-06-25 07:39:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xrefresh (Old) and /work/SRC/openSUSE:Factory/.xrefresh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xrefresh" Changes: -------- --- /work/SRC/openSUSE:Factory/xrefresh/xrefresh.changes 2012-05-08 12:08:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xrefresh.new/xrefresh.changes 2013-06-25 14:47:35.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 21 19:59:25 UTC 2013 - zai...@opensuse.org + +- Update to version 1.0.5: + + Use strcasecmp if available, instead of downcasing string + before strcmp. + + Fix implicit sign conversion & integer size truncation + warnings. + + Combine usage message strings. + + Mark Syntax() with _X_NORETURN to silence gcc warning. + + Add const qualifiers to structs for mapping strings to values. + + Add const qualifiers to fix gcc -Wwrite-strings warnings. + + Properly fallback on CWBackPixmap = None when failing to parse + or allocate a solid color. + + Fix allocateded typo in comment. + + config: move man pages into their own directory. + + man: remove trailing spaces and tabs. +- Add pkgconfig(xproto) BuildRequires: configure now checks for it. + +------------------------------------------------------------------- Old: ---- xrefresh-1.0.4.tar.bz2 New: ---- xrefresh-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xrefresh.spec ++++++ --- /var/tmp/diff_new_pack.X3QivA/_old 2013-06-25 14:47:36.000000000 +0200 +++ /var/tmp/diff_new_pack.X3QivA/_new 2013-06-25 14:47:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xrefresh # -# 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,19 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xrefresh -Version: 1.0.4 +Version: 1.0.5 Release: 0 -License: MIT Summary: Utility to refresh all or part of an X screen -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 Source1: xrefresh.desktop BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xrefresh-1.0.4.tar.bz2 -> xrefresh-1.0.5.tar.bz2 ++++++ ++++ 17669 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/xrefresh-1.0.4/ChangeLog new/xrefresh-1.0.5/ChangeLog --- old/xrefresh-1.0.4/ChangeLog 2010-11-11 04:47:16.000000000 +0100 +++ new/xrefresh-1.0.5/ChangeLog 2013-05-18 03:20:35.000000000 +0200 @@ -1,3 +1,114 @@ +commit 2c08f5dee8b3f2d2da9db8e3c1d4593a66db401e +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 18:20:13 2013 -0700 + + xrefresh 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 1a26cd81c08c008f8252ca03211705ce4951bab2 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jan 13 09:09:19 2013 -0800 + + Use strcasecmp if available, instead of downcasing string before strcmp + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 865c7c3da3a827cff080a763613d02729e9d4e33 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jan 13 08:37:49 2013 -0800 + + Fix implicit sign conversion & integer size truncation warnings + + xrefresh.c:125:14: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + arglen = strlen (arg); + ~ ^~~~~~~~~~~~ + xrefresh.c:126:12: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + slen = strlen (s); + ~ ^~~~~~~~~~ + xrefresh.c:132:26: warning: implicit conversion changes signedness: 'int' to + 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (strncmp (arg, s, slen) == 0) return (True); + ~~~~~~~ ^~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 4fa0dd48d6c9fcd54276a66c221fdafda2395c02 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Apr 16 17:22:16 2012 -0700 + + Combine usage message strings + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit c0b077a85fb2e624ec87fb8bec906ce30bc473e4 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Apr 16 17:18:35 2012 -0700 + + Mark Syntax() with _X_NORETURN to silence gcc warning + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit d944df52b7b2c5c9e6789b0ff7bb390108613c6c +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Apr 16 17:10:23 2012 -0700 + + Add const qualifiers to structs for mapping strings to values + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 71c97a091a511d403fdb8587d0e1240ec3913820 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Apr 16 17:04:35 2012 -0700 + + Add const qualifiers to fix gcc -Wwrite-strings warnings + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit cde30320d98b95f7c0cec5bed906b7107124f8fa +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun May 8 16:52:55 2011 -0700 + + Properly fallback on CWBackPixmap = None when failing to parse or allocate a solid color + + xrefresh.c:319:3: warning: Value stored to 'action' is never read + action = doNone; + ^ ~~~~~~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 289e8d27a8417ca94fd2063a44b84338ff499a3e +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Jan 28 20:53:06 2011 -0800 + + Fix allocateded typo in comment + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 18f7dcdd9fb30b784b3d99cb91d9f5c80cc19f44 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 19 10:06:57 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit d604128cf39507dc80a46449a15050f2a066d50f +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 13 11:15:48 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit 631be2568befbd4aee98a3cd4849403554db79d7 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Nov 10 19:46:37 2010 -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/xrefresh-1.0.4/Makefile.am new/xrefresh-1.0.5/Makefile.am --- old/xrefresh-1.0.4/Makefile.am 2010-11-10 01:34:32.000000000 +0100 +++ new/xrefresh-1.0.5/Makefile.am 2013-05-18 03:20:19.000000000 +0200 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xrefresh AM_CFLAGS = $(CWARNFLAGS) $(XREFRESH_CFLAGS) @@ -27,24 +28,7 @@ xrefresh_SOURCES = \ xrefresh.c -appman_PRE = \ - xrefresh.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrefresh-1.0.4/config.h.in new/xrefresh-1.0.5/config.h.in --- old/xrefresh-1.0.4/config.h.in 2010-11-11 04:47:08.000000000 +0100 +++ new/xrefresh-1.0.5/config.h.in 2013-05-18 03:20:24.000000000 +0200 @@ -12,6 +12,9 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H @@ -60,5 +63,37 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xrefresh-1.0.4/configure.ac new/xrefresh-1.0.5/configure.ac --- old/xrefresh-1.0.4/configure.ac 2010-11-11 04:45:46.000000000 +0100 +++ new/xrefresh-1.0.5/configure.ac 2013-05-18 03:20:19.000000000 +0200 @@ -23,10 +23,11 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xrefresh], [1.0.4], +AC_INIT([xrefresh], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xrefresh]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -38,7 +39,12 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS +AC_CHECK_FUNCS([strcasecmp]) + # Checks for pkg-config packages -PKG_CHECK_MODULES(XREFRESH, x11) +PKG_CHECK_MODULES(XREFRESH, [x11 xproto >= 7.0.17]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT 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/xrefresh-1.0.4/man/Makefile.am new/xrefresh-1.0.5/man/Makefile.am --- old/xrefresh-1.0.4/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xrefresh-1.0.5/man/Makefile.am 2013-05-18 03:20:19.000000000 +0200 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xrefresh.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xrefresh-1.0.4/man/xrefresh.man new/xrefresh-1.0.5/man/xrefresh.man --- old/xrefresh-1.0.4/man/xrefresh.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xrefresh-1.0.5/man/xrefresh.man 2013-05-18 03:20:19.000000000 +0200 @@ -0,0 +1,101 @@ +.\" Copyright 1988, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP 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. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.TH XREFRESH 1 __xorgversion__ +.SH NAME +xrefresh - refresh all or part of an X screen +.SH SYNOPSIS +.B "xrefresh" +[-option ...] +.SH DESCRIPTION +.PP +.I Xrefresh +is a simple X program that causes all or part of your screen to be repainted. +This is useful when system messages have messed up your screen. +.I Xrefresh +maps a window on top of the desired area of the screen and then immediately +unmaps it, +causing refresh events to be sent to all applications. By default, +a window with no background is used, causing all applications to repaint +``smoothly.'' +However, the various options can be used to indicate that a solid background +(of any color) or the root window background should be used instead. +.SH ARGUMENTS +.PP +.TP 10 +.B \-white +Use a white background. The screen just appears to flash quickly, and then +repaint. +.PP +.TP 10 +.B \-black +Use a black background (in effect, turning off all of the electron guns to +the tube). This can be somewhat disorienting as everything goes black for +a moment. +.PP +.TP 10 +.B \-solid \fIcolor\fP +Use a solid background of the specified color. Try green. +.PP +.TP 10 +.B \-root +Use the root window background. +.PP +.TP 10 +.B \-none +This is the default. All of the windows simply repaint. +.PP +.TP 10 +.B \-geometry \fIWxH+X+Y\fP +Specifies the portion of the screen to be repainted; see \fIX(__miscmansuffix__)\fP. +.PP +.TP 10 +.B \-display \fIdisplay\fP +This argument allows you to specify the server and screen to +refresh; see \fIX(__miscmansuffix__)\fP. +.SH X DEFAULTS +The +.I xrefresh +program uses the routine +.I XGetDefault(__libmansuffix__) +to read defaults, so its resource names are all capitalized. +.PP +.TP 8 +.B Black\fP, \fBWhite\fP, \fBSolid\fP, \fBNone\fP, \fBRoot\fP +Determines what sort of window background to use. +.PP +.TP 8 +.B Geometry +Determines the area to refresh. Not very useful. +.SH ENVIRONMENT +.PP +.TP 8 +DISPLAY - To get default host and display number. +.SH SEE ALSO +X(__miscmansuffix__) +.SH BUGS +.PP +It should have just one default type for the background. +.SH AUTHORS +Jim Gettys, Digital Equipment Corp., 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/xrefresh-1.0.4/missing new/xrefresh-1.0.5/missing --- old/xrefresh-1.0.4/missing 2010-11-11 04:47:08.000000000 +0100 +++ new/xrefresh-1.0.5/missing 2013-05-18 03:20:25.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/xrefresh-1.0.4/xrefresh.c new/xrefresh-1.0.5/xrefresh.c --- old/xrefresh-1.0.4/xrefresh.c 2010-11-10 01:34:45.000000000 +0100 +++ new/xrefresh-1.0.5/xrefresh.c 2013-05-18 03:20:19.000000000 +0200 @@ -50,31 +50,38 @@ * screen. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <errno.h> #include <X11/Xos.h> #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <ctype.h> #include <stdlib.h> +#ifndef HAVE_STRCASECMP +# include <ctype.h> +#endif + static Window win; static char *ProgramName; -static void +static void _X_NORETURN Syntax(void) { - fprintf (stderr, "usage: %s [-options] [geometry] [display]\n\n", - ProgramName); - fprintf (stderr, "where the available options are:\n"); - fprintf (stderr, " -display host:dpy or -d\n"); - fprintf (stderr, " -geometry WxH+X+Y or -g spec\n"); - fprintf (stderr, " -black use BlackPixel\n"); - fprintf (stderr, " -white use WhitePixel\n"); - fprintf (stderr, " -solid colorname use the color indicated\n"); - fprintf (stderr, " -root use the root background\n"); - fprintf (stderr, " -none no background in window\n"); + fprintf (stderr, "usage: %s [-options] [geometry] [display]\n\n%s", + ProgramName, + "where the available options are:\n" + " -display host:dpy or -d\n" + " -geometry WxH+X+Y or -g spec\n" + " -black use BlackPixel\n" + " -white use WhitePixel\n" + " -solid colorname use the color indicated\n" + " -root use the root background\n" + " -none no background in window\n"); fprintf (stderr, "\nThe default is: %s -none\n\n", ProgramName); exit (1); } @@ -87,22 +94,29 @@ static int parse_boolean_option(char *option) { - static struct _booltable { - char *name; + static const struct _booltable { + const char *name; int value; } booltable[] = { { "off", 0 }, { "n", 0 }, { "no", 0 }, { "false", 0 }, { "on", 1 }, { "y", 1 }, { "yes", 1 }, { "true", 1 }, { NULL, -1 }}; - register struct _booltable *t; + register const struct _booltable *t; + +#ifndef HAVE_STRCASECMP register char *cp; for (cp = option; *cp; cp++) { if (isascii (*cp) && isupper (*cp)) *cp = tolower (*cp); } +#endif for (t = booltable; t->name; t++) { +#ifdef HAVE_STRCASECMP + if (strcasecmp (option, t->name) == 0) return (t->value); +#else if (strcmp (option, t->name) == 0) return (t->value); +#endif } return (-1); } @@ -114,10 +128,10 @@ */ static Bool -isabbreviation(char *arg, char *s, int minslen) +isabbreviation(const char *arg, char *s, size_t minslen) { - int arglen; - int slen; + size_t arglen; + size_t slen; /* exact match */ if (strcmp (arg, s) == 0) return (True); @@ -138,8 +152,8 @@ enum e_action {doDefault, doBlack, doWhite, doSolid, doNone, doRoot}; -static struct s_pair { - char *resource_name; +static const struct s_pair { + const char *resource_name; enum e_action action; } pair_table[] = { { "Black", doBlack }, @@ -225,7 +239,7 @@ } action = doSolid; } else { - struct s_pair *pp; + const struct s_pair *pp; for (pp = pair_table; pp->resource_name != NULL; pp++) { def = XGetDefault (dpy, ProgramName, pp->resource_name); @@ -316,7 +330,8 @@ } else { fprintf (stderr,"%s: unable to allocate color '%s'.\n", ProgramName, solidcolor); - action = doNone; + xswa.background_pixmap = None; + mask |= CWBackPixmap; } break; case doDefault: @@ -342,7 +357,7 @@ * backing store; or do a ClearArea generating exposures on all windows */ XMapWindow (dpy, win); - /* the following will free the color that we might have allocateded */ + /* the following will free the color that we might have allocated */ XCloseDisplay (dpy); exit (0); } 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/xrefresh-1.0.4/xrefresh.man new/xrefresh-1.0.5/xrefresh.man --- old/xrefresh-1.0.4/xrefresh.man 2010-11-10 02:01:05.000000000 +0100 +++ new/xrefresh-1.0.5/xrefresh.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -.\" Copyright 1988, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP 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. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.TH XREFRESH 1 __xorgversion__ -.SH NAME -xrefresh - refresh all or part of an X screen -.SH SYNOPSIS -.B "xrefresh" -[-option ...] -.SH DESCRIPTION -.PP -.I Xrefresh -is a simple X program that causes all or part of your screen to be repainted. -This is useful when system messages have messed up your screen. -.I Xrefresh -maps a window on top of the desired area of the screen and then immediately -unmaps it, -causing refresh events to be sent to all applications. By default, -a window with no background is used, causing all applications to repaint -``smoothly.'' -However, the various options can be used to indicate that a solid background -(of any color) or the root window background should be used instead. -.SH ARGUMENTS -.PP -.TP 10 -.B \-white -Use a white background. The screen just appears to flash quickly, and then -repaint. -.PP -.TP 10 -.B \-black -Use a black background (in effect, turning off all of the electron guns to -the tube). This can be somewhat disorienting as everything goes black for -a moment. -.PP -.TP 10 -.B \-solid \fIcolor\fP -Use a solid background of the specified color. Try green. -.PP -.TP 10 -.B \-root -Use the root window background. -.PP -.TP 10 -.B \-none -This is the default. All of the windows simply repaint. -.PP -.TP 10 -.B \-geometry \fIWxH+X+Y\fP -Specifies the portion of the screen to be repainted; see \fIX(__miscmansuffix__)\fP. -.PP -.TP 10 -.B \-display \fIdisplay\fP -This argument allows you to specify the server and screen to -refresh; see \fIX(__miscmansuffix__)\fP. -.SH X DEFAULTS -The -.I xrefresh -program uses the routine -.I XGetDefault(__libmansuffix__) -to read defaults, so its resource names are all capitalized. -.PP -.TP 8 -.B Black\fP, \fBWhite\fP, \fBSolid\fP, \fBNone\fP, \fBRoot\fP -Determines what sort of window background to use. -.PP -.TP 8 -.B Geometry -Determines the area to refresh. Not very useful. -.SH ENVIRONMENT -.PP -.TP 8 -DISPLAY - To get default host and display number. -.SH SEE ALSO -X(__miscmansuffix__) -.SH BUGS -.PP -It should have just one default type for the background. -.SH AUTHORS -Jim Gettys, Digital Equipment Corp., MIT Project Athena -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
