Hello community, here is the log from the commit of package libHX for openSUSE:Factory checked in at 2014-01-07 13:54:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libHX (Old) and /work/SRC/openSUSE:Factory/.libHX.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libHX" Changes: -------- --- /work/SRC/openSUSE:Factory/libHX/libHX.changes 2013-11-24 12:05:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libHX.new/libHX.changes 2014-01-07 13:54:38.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 3 09:24:44 UTC 2014 - [email protected] + +- Update to new upstream release 3.18 +* Incorrect behavior in HX_strltrim has been fixed +* Added a HX_stpltrim function + +------------------------------------------------------------------- Old: ---- libHX-3.17.tar.xz libHX-3.17.tar.xz.asc New: ---- libHX-3.18.tar.xz libHX-3.18.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libHX.spec ++++++ --- /var/tmp/diff_new_pack.eViMgK/_old 2014-01-07 13:54:39.000000000 +0100 +++ /var/tmp/diff_new_pack.eViMgK/_new 2014-01-07 13:54:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libHX # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -21,7 +21,7 @@ Summary: Useful collection of routines for C and C++ programming License: LGPL-2.1 or LGPL-3.0 Group: Development/Libraries/C and C++ -Version: 3.17 +Version: 3.18 Release: 0 Url: http://libhx.sf.net/ ++++++ libHX-3.17.tar.xz -> libHX-3.18.tar.xz ++++++ ++++ 5216 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/libHX-3.17/build-aux/ar-lib new/libHX-3.18/build-aux/ar-lib --- old/libHX-3.17/build-aux/ar-lib 2013-11-16 05:17:43.000000000 +0100 +++ new/libHX-3.18/build-aux/ar-lib 2014-01-03 10:23:30.000000000 +0100 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 Free Software Foundation, Inc. # Written by Peter Rosin <[email protected]>. # # This program is free software; you can redistribute it and/or modify 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/libHX-3.17/build-aux/compile new/libHX-3.18/build-aux/compile --- old/libHX-3.17/build-aux/compile 2013-11-16 05:17:43.000000000 +0100 +++ new/libHX-3.18/build-aux/compile 2014-01-03 10:23:30.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -112,6 +112,11 @@ 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 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/libHX-3.17/build-aux/missing new/libHX-3.18/build-aux/missing --- old/libHX-3.17/build-aux/missing 2013-11-16 05:17:43.000000000 +0100 +++ new/libHX-3.18/build-aux/missing 2014-01-03 10:23:30.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ 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 - 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. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + 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. - ;; +# 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 - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - 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 - ;; - - 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 - ;; - - *) - 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/libHX-3.17/build-aux/test-driver new/libHX-3.18/build-aux/test-driver --- old/libHX-3.17/build-aux/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/libHX-3.18/build-aux/test-driver 2014-01-03 10:23:32.000000000 +0100 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# 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 <[email protected]> or send patches to +# <[email protected]>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# 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/libHX-3.17/configure.ac new/libHX-3.18/configure.ac --- old/libHX-3.17/configure.ac 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/configure.ac 2014-01-03 10:22:47.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([libHX], [3.17]) +AC_INIT([libHX], [3.18]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) 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/libHX-3.17/doc/Makefile.am new/libHX-3.18/doc/Makefile.am --- old/libHX-3.17/doc/Makefile.am 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/doc/Makefile.am 2014-01-03 10:22:47.000000000 +0100 @@ -8,3 +8,9 @@ srcdir="${srcdir}" ${srcdir}/generate; EXTRA_DIST = libHX_Documentation.lyx api.txt changelog.txt + +install-data-local: + if test -e libHX_Documentation.pdf; then \ + ${MKDIR_P} "${DESTDIR}${docdir}" || exit 1; \ + ${INSTALL_DATA} libHX_Documentation.pdf "${DESTDIR}${docdir}" || exit $$?; \ + fi 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/libHX-3.17/doc/api.txt new/libHX-3.18/doc/api.txt --- old/libHX-3.17/doc/api.txt 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/doc/api.txt 2014-01-03 10:22:47.000000000 +0100 @@ -135,7 +135,6 @@ 2.8 2.8 2.8 HXPROC_NULL_STDOUT 2.6 2.6 2.6 HX_fls 2.6 2.6 2.6 wxACV -2.6 2.6 2.6 wxCFF 2.6 2.6 2.6 wxDPOS 2.6 2.6 2.6 wxDSIZE 2.6 2.6 2.6 wxfu8 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/libHX-3.17/doc/changelog.txt new/libHX-3.18/doc/changelog.txt --- old/libHX-3.17/doc/changelog.txt 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/doc/changelog.txt 2014-01-03 10:22:47.000000000 +0100 @@ -4,6 +4,16 @@ ==== +v3.18 (2014-03-01) +================== +Enhancements: +- string: add the HX_stpltrim function +Fixes: +- Make HX_strltrim move the correct number of bytes +Changes: +- remove wxCFF from wx_helper.hpp + + v3.17 (2013-11-16) ================== Enhancements: 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/libHX-3.17/doc/libHX_Documentation.lyx new/libHX-3.18/doc/libHX_Documentation.lyx --- old/libHX-3.17/doc/libHX_Documentation.lyx 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/doc/libHX_Documentation.lyx 2014-01-03 10:22:47.000000000 +0100 @@ -74,7 +74,7 @@ \begin_body \begin_layout Title -libHX 3.17 +libHX 3.18 \begin_inset Newline newline \end_inset @@ -11350,6 +11350,28 @@ \series bold char * \series default +HX_stpltrim( +\series bold +const char * +\series default +s); +\begin_inset Index idx +status open + +\begin_layout Plain Layout +HX_stpltrim +\end_layout + +\end_inset + + +\begin_inset Newline newline +\end_inset + + +\series bold +char * +\series default HX_strlower( \series bold char * @@ -11486,6 +11508,18 @@ \begin_layout Description \family typewriter +HX_stpltrim +\family default + Returns a pointer to the first non-whitespace character in +\family typewriter +s +\family default +. +\end_layout + +\begin_layout Description + +\family typewriter HX_strlower \family default Transforms all characters in the string @@ -24293,38 +24327,6 @@ \begin_layout Plain Layout \family typewriter -wxCFF -\end_layout - -\end_inset - - -\family typewriter -wxCFF -\family default - Expands to a set of -\begin_inset Quotes eld -\end_inset - -common frame flags -\begin_inset Quotes erd -\end_inset - - for -\family typewriter -wxFrame -\family default -s, which includes having a caption, resizable border, system menu, as well - as buttons for close, minimze and maximize. -\end_layout - -\begin_layout Description -\begin_inset Index idx -status open - -\begin_layout Plain Layout - -\family typewriter wxCDF \end_layout @@ -24334,24 +24336,24 @@ \family typewriter wxCDF \family default - Expands to a set of -\begin_inset Quotes eld -\end_inset - -common dialog flags -\begin_inset Quotes erd -\end_inset - - for + Expands to a set of common dialog flags for \family typewriter wxDialog \family default s, which includes \family typewriter -wxCFF +wxDEFAULT_\SpecialChar \- +FRAME_\SpecialChar \- +STYLE \family default and a flag such that the dialog does not create a new window in the task - bar. + bar ( +\family typewriter +wxFRAME_\SpecialChar \- +NO_\SpecialChar \- +TASKBAR +\family default +). \end_layout \begin_layout Description Files old/libHX-3.17/doc/libHX_Documentation.pdf and new/libHX-3.18/doc/libHX_Documentation.pdf differ 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/libHX-3.17/include/libHX/string.h new/libHX-3.18/include/libHX/string.h --- old/libHX-3.17/include/libHX/string.h 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/include/libHX/string.h 2014-01-03 10:22:47.000000000 +0100 @@ -75,6 +75,7 @@ extern char *HX_strlncat(char *, const char *, size_t, size_t); extern char *HX_strlower(char *); extern size_t HX_strltrim(char *); +extern char *HX_stpltrim(const char *); extern char *HX_strmid(const char *, long, long); extern char *HX_strndup(const char *, size_t); extern size_t HX_strnlen(const char *, size_t); 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/libHX-3.17/include/libHX/wx_helper.hpp new/libHX-3.18/include/libHX/wx_helper.hpp --- old/libHX-3.17/include/libHX/wx_helper.hpp 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/include/libHX/wx_helper.hpp 2014-01-03 10:22:47.000000000 +0100 @@ -10,11 +10,8 @@ /* Convert from wxString to UTF-8; limited validity */ #define wxtu8(s) static_cast<const char *>((s).ToUTF8()) -/* Common frame flags */ -#define wxCFF (wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | \ - wxCLOSE_BOX | wxMAXIMIZE_BOX | wxMINIMIZE_BOX) /* Common dialog flags */ -#define wxCDF (wxCFF | wxFRAME_NO_TASKBAR) +#define wxCDF (wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR) #define wxACV wxALIGN_CENTER_VERTICAL #define wxDPOS wxDefaultPosition #define wxDSIZE wxDefaultSize 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/libHX-3.17/src/.gitignore new/libHX-3.18/src/.gitignore --- old/libHX-3.17/src/.gitignore 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/.gitignore 2014-01-03 10:22:47.000000000 +0100 @@ -21,3 +21,7 @@ /t?-string /t?-strquote /t?-time + +# automake tests +*.log +*.trs 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/libHX-3.17/src/Makefile.am new/libHX-3.18/src/Makefile.am --- old/libHX-3.17/src/Makefile.am 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/Makefile.am 2014-01-03 10:22:47.000000000 +0100 @@ -13,7 +13,7 @@ mc.c misc.c opt.c \ rand.c string.c time.c libHX_la_LIBADD = ${libdl_LIBS} ${libpthread_LIBS} ${librt_LIBS} -libHX_la_LDFLAGS = -no-undefined -version-info 30:0:2 \ +libHX_la_LDFLAGS = -no-undefined -version-info 31:0:3 \ -Wl,--version-script=${srcdir}/libHX.map libHX_la_DEPENDENCIES = libHX.map 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/libHX-3.17/src/libHX.map new/libHX-3.18/src/libHX.map --- old/libHX-3.17/src/libHX.map 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/libHX.map 2014-01-03 10:22:47.000000000 +0100 @@ -190,3 +190,9 @@ global: HX_strchr2; } LIBHX_3.13; + +# ABI 31 +LIBHX_3.18 { +global: + HX_stpltrim; +} LIBHX_3.15; 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/libHX-3.17/src/rtcheck.c new/libHX-3.18/src/rtcheck.c --- old/libHX-3.17/src/rtcheck.c 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/rtcheck.c 2014-01-03 10:22:47.000000000 +0100 @@ -257,6 +257,8 @@ stub4(HX_split, (const char *a, const char *b, int *c, int d)); stub4(HX_split4, (char *a, const char *b, int *c, int d)); stub4(HX_split5, (char *a, const char *b, int c, char **d)); +stub1(HX_stpltrim, (const char *a)); +stub1(HX_stprtrim, (char *a)); stub3(HX_strbchr, (const char *a, const char *b, char c)); stub2(HX_strclone, (char **a, const char *b)); stub1(HX_strlower, (char *a)); 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/libHX-3.17/src/string.c new/libHX-3.18/src/string.c --- old/libHX-3.17/src/string.c 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/string.c 2014-01-03 10:22:47.000000000 +0100 @@ -357,13 +357,20 @@ size_t diff = 0; travp = expr; - while (*travp != '\0' && HX_isspace(*travp)) + while (HX_isspace(*travp)) ++travp; if ((diff = travp - expr) > 0) - memmove(expr, travp, diff); + memmove(expr, travp, strlen(travp) + 1); return diff; } +EXPORT_SYMBOL char *HX_stpltrim(const char *p) +{ + while (HX_isspace(*p)) + ++p; + return const_cast1(char *, p); +} + /* supports negative offsets like scripting languages */ EXPORT_SYMBOL char *HX_strmid(const char *expr, long offset, long length) { 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/libHX-3.17/src/tc-link.c new/libHX-3.18/src/tc-link.c --- old/libHX-3.17/src/tc-link.c 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/tc-link.c 2014-01-03 10:22:47.000000000 +0100 @@ -97,6 +97,7 @@ HX_split, HX_split4, HX_split5, + HX_stpltrim, HX_strbchr, HX_strchr2, HX_strclone, 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/libHX-3.17/src/tc-string.c new/libHX-3.18/src/tc-string.c --- old/libHX-3.17/src/tc-string.c 2013-11-16 05:12:41.000000000 +0100 +++ new/libHX-3.18/src/tc-string.c 2014-01-03 10:22:47.000000000 +0100 @@ -7,11 +7,13 @@ * (at your option) any later version. */ #ifndef __cplusplus +# include <assert.h> # include <errno.h> # include <stddef.h> # include <stdio.h> # include <stdlib.h> #else +# include <cassert> # include <cerrno> # include <cstddef> # include <cstdio> @@ -131,6 +133,30 @@ printf("%s\n", ret); } +static void t_strtrim(void) +{ + char a[] = " a and b ", aexp[] = "a and b "; + char b[] = " a and b ", bexp[] = " a and b"; + char c[] = "a&b", cexp[] = "a&b"; + const char *r; + + r = HX_stpltrim(a); + printf("HX_stpltrim(\"%s\") = \"%s\"\n", a, r); + assert(strcmp(r, aexp) == 0); + + printf("HX_strltrim(\"%s\") = ", a); + printf("\"%s\"\n", (HX_strltrim(a), a)); + assert(strcmp(a, aexp) == 0); + + printf("HX_strrtrim(\"%s\") = ", b); + printf("\"%s\"\n", (HX_strrtrim(b), b)); + assert(strcmp(b, bexp) == 0); + + assert(strcmp(cexp, HX_stpltrim(c)) == 0); + assert(strcmp(cexp, (HX_strltrim(c), c)) == 0); + assert(strcmp(cexp, (HX_strrtrim(c), c)) == 0); +} + static void t_split(void) { char t1[] = "root:x:0:0:root:/root:/bin/bash"; @@ -202,6 +228,7 @@ t_strnlen(); t_strdup(); t_strsep(); + t_strtrim(); t_split(); t_split2(); HXmc_free(tx); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
