Hello community, here is the log from the commit of package xclipboard for openSUSE:Factory checked in at 2013-09-13 14:47:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xclipboard (Old) and /work/SRC/openSUSE:Factory/.xclipboard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xclipboard" Changes: -------- --- /work/SRC/openSUSE:Factory/xclipboard/xclipboard.changes 2012-05-08 12:01:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xclipboard.new/xclipboard.changes 2013-09-13 14:47:21.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 12 20:09:30 UTC 2013 - zai...@opensuse.org + +- Update to version 1.1.3: + + Fix some size/sign conversion warnings from clang. + + Delete trailing whitespace from source files. + + Replace malloc(strlen)+strcpy with strdup. + + Convert last sprintf to snprintf. + + Rename state argument to SetButton to not shadow global state + variable. + + Mark Quit functions as _X_NORETURN, as suggested by + -Wmissing-noreturn. + + Don't rely on being able to set tab stops. +- Add pkgconfig(xproto) BuildRequires, new dependency. + +------------------------------------------------------------------- Old: ---- xclipboard-1.1.2.tar.bz2 New: ---- xclipboard-1.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xclipboard.spec ++++++ --- /var/tmp/diff_new_pack.7qPcpd/_old 2013-09-13 14:47:21.000000000 +0200 +++ /var/tmp/diff_new_pack.7qPcpd/_new 2013-09-13 14:47:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xclipboard # -# 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: xclipboard -Version: 1.1.2 -Release: 1 -License: MIT +Version: 1.1.3 +Release: 0 Summary: X clipboard client -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: xclipboard.desktop Source2: xclipboard.png @@ -32,6 +33,7 @@ BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 ++++++ xclipboard-1.1.2.tar.bz2 -> xclipboard-1.1.3.tar.bz2 ++++++ ++++ 11358 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/xclipboard-1.1.2/ChangeLog new/xclipboard-1.1.3/ChangeLog --- old/xclipboard-1.1.2/ChangeLog 2012-02-11 06:38:41.000000000 +0100 +++ new/xclipboard-1.1.3/ChangeLog 2013-09-06 08:22:50.000000000 +0200 @@ -1,3 +1,83 @@ +commit 8cf6dfbbdb10f1ab41deb3d0e87cd0dfb79e3273 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Sep 5 23:22:16 2013 -0700 + + xclipboard 1.1.3 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 25b41a35484ba4db23627e57d105b7156c19816f +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Jul 18 20:25:53 2013 -0700 + + Fix some size/sign conversion warnings from clang + + xclipboard.c:108:27: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + clip->clip = malloc (len + 1); + ~~~~~~ ~~~~^~~ + xclipboard.c:103:11: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + len = strlen (data); + ~ ^~~~~~~~~~~~~ + xclipboard.c:331:15: warning: implicit conversion loses integer precision: + 'int' to 'Boolean' (aka 'char') [-Wconversion] + success = XawAsciiSaveAsFile (XawTextGetSource (text), filename); + ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit de3301ff61c1f7c5d14265ae9bab9917244568ad +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 22:01:41 2013 -0700 + + delete trailing whitespace from source files + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit dc686289695aa3cef2b0b17d14fae68ac54643de +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 21:59:47 2013 -0700 + + Replace malloc(strlen)+strcpy with strdup + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f393be55ace1de85445cb1f24fdf235d6644874a +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 21:56:36 2013 -0700 + + Convert last sprintf to snprintf + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a9f3465dc1d5fcd0c79d5b12bc09fe48e62d7823 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 21:47:39 2013 -0700 + + Rename state argument to SetButton to not shadow global state variable + + xcutsel.c:196: warning: declaration of 'state' shadows a global declaration + xcutsel.c:84: warning: shadowed declaration is here + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a5ae058401d073d1af80214133fbe7f9a9cecbdb +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri May 17 21:21:31 2013 -0700 + + Mark Quit functions as _X_NORETURN, as suggested by -Wmissing-noreturn + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f71a9580e229a6e04c89cf901c98aead5b6dd3cd +Author: Eric S. Raymond <e...@thyrsus.com> +Date: Thu Aug 23 06:16:48 2012 -0400 + + Don't rely on being able to set tab stops. + + Signed-off-by: Eric S. Raymond <e...@thyrsus.com> + commit a614c2be68ce6cb176901fb14bbd1802d39a5a69 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri Feb 10 21:37:33 2012 -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/xclipboard-1.1.2/compile new/xclipboard-1.1.3/compile --- old/xclipboard-1.1.2/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xclipboard-1.1.3/compile 2013-09-06 08:22:41.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tro...@cygnus.com>. +# +# 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# 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. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <bug-autom...@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# 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/xclipboard-1.1.2/configure.ac new/xclipboard-1.1.3/configure.ac --- old/xclipboard-1.1.2/configure.ac 2012-02-11 06:37:20.000000000 +0100 +++ new/xclipboard-1.1.3/configure.ac 2013-09-06 08:22:36.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([xclipboard], [1.1.2], +AC_INIT([xclipboard], [1.1.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xclipboard]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -42,7 +42,7 @@ if test x$XKBPKG = xxkbfile ; then AC_DEFINE([XKB], [1], [Define to use libxkbfile calls like XKBStdBell()]) fi -PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt >= 1.1 x11 ${XKBPKG}]) +PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt >= 1.1 x11 ${XKBPKG} xproto >= 7.0.17]) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` 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/xclipboard-1.1.2/man/xclipboard.man new/xclipboard-1.1.3/man/xclipboard.man --- old/xclipboard-1.1.2/man/xclipboard.man 2011-01-21 08:24:49.000000000 +0100 +++ new/xclipboard-1.1.3/man/xclipboard.man 2013-09-06 08:22:36.000000000 +0200 @@ -86,28 +86,28 @@ is given first, followed by the widget instance name. .sp .nf -.TA .5i 1.0i 1.5i -.ta .5i 1.0i 1.5i +.ft CW XClipboard xclipboard - Form form - Command Quit - Command delete - Command new - Command Save - Command next - Command prev - Label index - Text text - TransientShell fileDialogShell - Dialog fileDialog - Label label - Command accept - Command cancel - Text value - TransientShell failDialogShell - Dialog failDialog - Label label - Command continue + Form form + Command Quit + Command delete + Command new + Command Save + Command next + Command prev + Label index + Text text + TransientShell fileDialogShell + Dialog fileDialog + Label label + Command accept + Command cancel + Text value + TransientShell failDialogShell + Dialog failDialog + Label label + Command continue +.ft .fi .sp .SH SENDING/RETRIEVING CLIPBOARD CONTENTS @@ -118,13 +118,13 @@ file to use the clipboard are: .sp .nf -.TA .5i -.ta .5i 3.0i +.ft CW *VT100.Translations: #override \\ - <Btn3Up>: select-end(CLIPBOARD) \\n\\ - <Btn2Up>: insert-selection(PRIMARY,CLIPBOARD) \\n\\ - <Btn2Down>: ignore () + <Btn3Up>: select-end(CLIPBOARD) \\n\\ + <Btn2Up>: insert-selection(PRIMARY,CLIPBOARD) \\n\\ + <Btn2Down>: ignore () +.ft .fi .sp .SH "SEE ALSO" 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/xclipboard-1.1.2/missing new/xclipboard-1.1.3/missing --- old/xclipboard-1.1.2/missing 2012-02-11 06:37:58.000000000 +0100 +++ new/xclipboard-1.1.3/missing 2013-09-06 08:22:41.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/xclipboard-1.1.2/xclipboard.c new/xclipboard-1.1.3/xclipboard.c --- old/xclipboard-1.1.2/xclipboard.c 2011-07-23 03:50:28.000000000 +0200 +++ new/xclipboard-1.1.3/xclipboard.c 2013-09-06 08:22:36.000000000 +0200 @@ -67,7 +67,7 @@ struct _Clip *next, *prev; char *clip; char *filename; - int avail; + size_t avail; } ClipRec, *ClipPtr; static Atom wm_delete_window; @@ -81,7 +81,7 @@ NULL }; -static long +static long TextLength(Widget w) { return XawTextSourceScan (XawTextGetSource (w), @@ -94,7 +94,7 @@ { Arg args[1]; char *data; - int len; + size_t len; Widget source; source = XawTextGetSource (w); @@ -129,7 +129,7 @@ } /*ARGSUSED*/ -static ClipPtr +static ClipPtr NewClip(Widget w, ClipPtr old) { ClipPtr newClip; @@ -193,7 +193,7 @@ XtSetValues (prevButton, &arg, ONE); XtSetArg (arg, XtNsensitive, nextvalid); XtSetValues (nextButton, &arg, ONE); - sprintf (labelString, "%d", IndexCurrentClip ()); + snprintf (labelString, sizeof(labelString), "%d", IndexCurrentClip ()); XtSetArg (arg, XtNlabel, labelString); XtSetValues (indexLabel, &arg, ONE); } @@ -246,7 +246,7 @@ } /* ARGSUSED */ -static void +static void _X_NORETURN Quit(Widget w, XEvent *ev, String *parms, Cardinal *np) { XtCloseDisplay (XtDisplay (text)); @@ -324,7 +324,7 @@ AcceptSaveFile(Widget w, XEvent *e, String *argv, Cardinal *argc) { char *filename; - Boolean success; + Bool success; Arg args[1]; filename = XawDialogGetValueString (fileDialog); @@ -345,9 +345,7 @@ { if (currentClip->filename) free (currentClip->filename); - currentClip->filename = malloc (strlen (filename) + 1); - if (currentClip->filename) - strcpy (currentClip->filename, filename); + currentClip->filename = strdup (filename); } } @@ -366,7 +364,7 @@ } /*ARGSUSED*/ -static void +static void WMProtocols(Widget w, XEvent *ev, String *params, Cardinal *n) { if (ev->type == ClientMessage && @@ -403,7 +401,7 @@ /* any trailing clips with no text get overwritten */ if (strlen (currentClip->clip) != 0) currentClip = NewClip (text, currentClip); - + textBlock.ptr = data; textBlock.firstPos = 0; textBlock.length = len; @@ -434,7 +432,7 @@ static XtActionsRec xclipboard_actions[] = { - { "NewClip", NewCurrentClip }, + { "NewClip", NewCurrentClip }, { "NextClip", NextCurrentClip }, { "PrevClip", PrevCurrentClip }, { "DeleteClip", DeleteCurrentClip }, @@ -451,17 +449,17 @@ /* {"-nw", "wrap", XrmoptionNoArg, "False"} */ }; -static Boolean ConvertSelection ( Widget w, Atom *selection, Atom *target, - Atom *type, XtPointer *value, +static Boolean ConvertSelection ( Widget w, Atom *selection, Atom *target, + Atom *type, XtPointer *value, unsigned long *length, int *format ); static void LoseSelection ( Widget w, Atom *selection ); static Atom ManagerAtom, ClipboardAtom; /*ARGSUSED*/ -static void -InsertClipboard(Widget w, XtPointer client_data, Atom *selection, - Atom *type, XtPointer value, unsigned long *length, +static void +InsertClipboard(Widget w, XtPointer client_data, Atom *selection, + Atom *type, XtPointer value, unsigned long *length, int *format) { Display *d = XtDisplay(w); @@ -525,14 +523,14 @@ #endif } } - + XtOwnSelection(top, ClipboardAtom, CurrentTime, ConvertSelection, LoseSelection, NULL); } -static Boolean +static Boolean ConvertSelection(Widget w, Atom *selection, Atom *target, - Atom *type, XtPointer *value, unsigned long *length, + Atom *type, XtPointer *value, unsigned long *length, int *format) { Display* d = XtDisplay(w); @@ -567,24 +565,24 @@ *target == XA_LENGTH(d)) { long * temp; - + temp = (long *) XtMalloc(sizeof(long)); if (*target == XA_LIST_LENGTH(d)) *temp = 1L; else /* *target == XA_LENGTH(d) */ *temp = (long) TextLength (text); - + *value = (XPointer) temp; *type = XA_INTEGER; *length = 1L; *format = 32; return True; } - + if (*target == XA_CHARACTER_POSITION(d)) { long * temp; - + temp = (long *) XtMalloc(2 * sizeof(long)); temp[0] = (long) 0; temp[1] = TextLength (text); @@ -594,7 +592,7 @@ *format = 32; return True; } - + if (*target == XA_STRING || *target == XA_TEXT(d) || *target == XA_UTF8_STRING(d) || @@ -635,7 +633,7 @@ return False; } -static void +static void LoseSelection(Widget w, Atom *selection) { Display *d = XtDisplay(w); @@ -644,16 +642,16 @@ } /*ARGSUSED*/ -static Boolean +static Boolean RefuseSelection(Widget w, Atom *selection, Atom *target, - Atom *type, XtPointer *value, unsigned long *length, + Atom *type, XtPointer *value, unsigned long *length, int *format) { return False; } /*ARGSUSED*/ -static void +static void LoseManager(Widget w, Atom *selection) { XtError("another clipboard has taken over control\n"); @@ -687,7 +685,7 @@ top = XtAppInitialize( &xtcontext, "XClipboard", table, XtNumber(table), &argc, argv, fallback_resources, NULL, 0); - XtGetApplicationResources(top, (XtPointer)&userOptions, resources, + XtGetApplicationResources(top, (XtPointer)&userOptions, resources, XtNumber(resources), NULL, 0); XtAppAddActions (xtcontext, @@ -716,7 +714,7 @@ } text = XtCreateManagedWidget( "text", Text, parent, args, n); - + currentClip = NewClip (text, (ClipPtr) 0); set_button_state (); 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/xclipboard-1.1.2/xcutsel.c new/xclipboard-1.1.3/xcutsel.c --- old/xclipboard-1.1.2/xcutsel.c 2011-07-23 03:50:28.000000000 +0200 +++ new/xclipboard-1.1.3/xcutsel.c 2013-09-06 08:22:36.000000000 +0200 @@ -86,14 +86,14 @@ static void Syntax(char *call) { - fprintf (stderr, "usage: %s [-selection name] [-cutbuffer number]\n", + fprintf (stderr, "usage: %s [-selection name] [-cutbuffer number]\n", call); exit (1); } -static void -StoreBuffer(Widget w, XtPointer client_data, Atom *selection, Atom *type, +static void +StoreBuffer(Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) { @@ -108,20 +108,20 @@ XStoreBuffer( XtDisplay(w), (char*)value, (int)(*length), options.buffer ); - + XtFree(value); } -static Boolean +static Boolean ConvertSelection(Widget w, Atom *selection, Atom *target, - Atom *type, XtPointer *value, unsigned long *length, + Atom *type, XtPointer *value, unsigned long *length, int *format) { Display* d = XtDisplay(w); XSelectionRequestEvent* req = XtGetSelectionRequest(w, *selection, (XtRequestId)NULL); - + if (*target == XA_TARGETS(d)) { Atom* targetP; Atom* std_targets; @@ -192,24 +192,24 @@ } -static void -SetButton(ButtonState *state, Boolean on) +static void +SetButton(ButtonState *statep, Boolean on) { - if (state->is_on != on) { + if (statep->is_on != on) { Arg args[2]; Pixel fg, bg; XtSetArg( args[0], XtNforeground, &fg ); XtSetArg( args[1], XtNbackground, &bg ); - XtGetValues( state->button, args, TWO ); + XtGetValues( statep->button, args, TWO ); args[0].value = (XtArgVal)bg; args[1].value = (XtArgVal)fg; - XtSetValues( state->button, args, TWO ); - state->is_on = on; + XtSetValues( statep->button, args, TWO ); + statep->is_on = on; } } -static void +static void LoseSelection(Widget w, Atom *selection) { if (options.value) { @@ -221,7 +221,7 @@ /* ARGSUSED */ -static void +static void _X_NORETURN Quit(Widget w, XtPointer closure, XtPointer callData) { XtCloseDisplay( XtDisplay(w) ); @@ -230,7 +230,7 @@ /* ARGSUSED */ -static void +static void GetSelection(Widget w, XtPointer closure, XtPointer callData) { XtGetSelectionValue(w, options.selection, XA_STRING, @@ -240,7 +240,7 @@ /* ARGSUSED */ -static void +static void GetBuffer(Widget w, XtPointer closure, XtPointer callData) { if (options.value) XFree( options.value ); @@ -255,7 +255,7 @@ } -int +int main(int argc, char *argv[]) { char *label; @@ -309,7 +309,7 @@ XtAddCallback( button, XtNcallback, GetBuffer, (XtPointer)&state ); state.button = button; state.is_on = False; - + XtRealizeWidget(shell); XtAppMainLoop(appcon); exit(0); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
