Hello community, here is the log from the commit of package gtkwave for openSUSE:Factory checked in at 2013-03-24 21:56:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkwave (Old) and /work/SRC/openSUSE:Factory/.gtkwave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkwave", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkwave/gtkwave.changes 2013-03-08 09:13:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkwave.new/gtkwave.changes 2013-03-24 21:58:46.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 22 20:22:11 UTC 2013 - [email protected] + +- Update to version 3.3.45 + * Fix for VCDNAM_ESCAPE character in treesearch window + +------------------------------------------------------------------- Old: ---- gtkwave-3.3.44.tar.gz New: ---- gtkwave-3.3.45.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkwave.spec ++++++ --- /var/tmp/diff_new_pack.Vdc703/_old 2013-03-24 21:58:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Vdc703/_new 2013-03-24 21:58:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: gtkwave -Version: 3.3.44 +Version: 3.3.45 Release: 0 Summary: Waveform viewer for Ditital Signals License: GPL-2.0+ ++++++ gtkwave-3.3.44.tar.gz -> gtkwave-3.3.45.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/CHANGELOG.TXT new/gtkwave-3.3.45/CHANGELOG.TXT --- old/gtkwave-3.3.44/CHANGELOG.TXT 2013-02-16 15:51:12.000000000 +0100 +++ new/gtkwave-3.3.45/CHANGELOG.TXT 2013-02-28 07:22:53.000000000 +0100 @@ -1278,3 +1278,5 @@ Added conditional compile for stat() being available. 3.3.44 16feb13 gdk_draw_layout assertion `GDK_IS_DRAWABLE (drawable)' assertion fix. +3.3.45 28feb13 Fix for VCDNAM_ESCAPE character in treesearch window. This + sometimes occurs for structure identifiers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/LICENSE.TXT new/gtkwave-3.3.45/LICENSE.TXT --- old/gtkwave-3.3.44/LICENSE.TXT 2013-02-05 04:50:34.000000000 +0100 +++ new/gtkwave-3.3.45/LICENSE.TXT 2013-02-28 07:22:53.000000000 +0100 @@ -1,6 +1,6 @@ ########################################################################## -GTKWave 3.3.44 Wave Viewer is Copyright (C) 1999-2013 Tony Bybell. +GTKWave 3.3.45 Wave Viewer is Copyright (C) 1999-2013 Tony Bybell. Portions of GTKWave are Copyright (C) 1999-2013 Udi Finkelstein. Context support is Copyright (C) 2007-2013 Kermin Elliott Fleming. Trace group support is Copyright (C) 2009-2013 Donald Baltus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/configure new/gtkwave-3.3.45/configure --- old/gtkwave-3.3.44/configure 2013-02-05 04:50:34.000000000 +0100 +++ new/gtkwave-3.3.45/configure 2013-02-28 07:22:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gtkwave 3.3.44. +# Generated by GNU Autoconf 2.63 for gtkwave 3.3.45. # # Report bugs to <[email protected]>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='gtkwave' PACKAGE_TARNAME='gtkwave' -PACKAGE_VERSION='3.3.44' -PACKAGE_STRING='gtkwave 3.3.44' +PACKAGE_VERSION='3.3.45' +PACKAGE_STRING='gtkwave 3.3.45' PACKAGE_BUGREPORT='[email protected]' ac_unique_file="src/vcd.c" @@ -1387,7 +1387,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtkwave 3.3.44 to adapt to many kinds of systems. +\`configure' configures gtkwave 3.3.45 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1453,7 +1453,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkwave 3.3.44:";; + short | recursive ) echo "Configuration of gtkwave 3.3.45:";; esac cat <<\_ACEOF @@ -1590,7 +1590,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkwave configure 3.3.44 +gtkwave configure 3.3.45 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1604,7 +1604,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtkwave $as_me 3.3.44, which was +It was created by gtkwave $as_me 3.3.45, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2454,7 +2454,7 @@ # Define the identity of the package. PACKAGE='gtkwave' - VERSION='3.3.44' + VERSION='3.3.45' cat >>confdefs.h <<_ACEOF @@ -14345,7 +14345,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtkwave $as_me 3.3.44, which was +This file was extended by gtkwave $as_me 3.3.45, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14408,7 +14408,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gtkwave config.status 3.3.44 +gtkwave config.status 3.3.45 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/configure.ac new/gtkwave-3.3.45/configure.ac --- old/gtkwave-3.3.44/configure.ac 2013-02-05 04:50:34.000000000 +0100 +++ new/gtkwave-3.3.45/configure.ac 2013-02-28 07:22:53.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gtkwave, 3.3.44, [email protected]) +AC_INIT(gtkwave, 3.3.45, [email protected]) AC_CONFIG_SRCDIR([src/vcd.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/contrib/bundle_for_osx/Info-gtkwave.plist new/gtkwave-3.3.45/contrib/bundle_for_osx/Info-gtkwave.plist --- old/gtkwave-3.3.44/contrib/bundle_for_osx/Info-gtkwave.plist 2013-02-05 04:50:34.000000000 +0100 +++ new/gtkwave-3.3.45/contrib/bundle_for_osx/Info-gtkwave.plist 2013-02-28 07:22:53.000000000 +0100 @@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>gtkwave</string> <key>CFBundleGetInfoString</key> - <string>3.3.44, (C) 1999-2013 Tony Bybell http://gtkwave.sourceforge.net</string> + <string>3.3.45, (C) 1999-2013 Tony Bybell http://gtkwave.sourceforge.net</string> <key>CFBundleIconFile</key> <string>gtkwave.icns</string> <key>CFBundleIdentifier</key> @@ -18,11 +18,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.3.44</string> + <string>3.3.45</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3.3.44</string> + <string>3.3.45</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1999 - 2013 Tony Bybell, GNU General Public License.</string> <key>LSMinimumSystemVersion</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.44/src/treesearch_gtk2.c new/gtkwave-3.3.45/src/treesearch_gtk2.c --- old/gtkwave-3.3.44/src/treesearch_gtk2.c 2012-05-30 19:16:46.000000000 +0200 +++ new/gtkwave-3.3.45/src/treesearch_gtk2.c 2013-02-28 07:22:53.000000000 +0100 @@ -75,6 +75,40 @@ return(lastmatch ? lastmatch : nam); } +/* fix escaped signal names */ +static void *fix_escaped_names(char *s, int do_free) +{ +char *s2 = s; +int found = 0; +int len; + +while(*s2) + { + if((*s2) == VCDNAM_ESCAPE) + { + found = 1; + break; + } + s2++; + } + +if(found) + { + len = strlen(s); + s2 = strdup_2(s); + if(do_free) free_2(s); + s = s2; + + while(*s2) + { + if(*s2 == VCDNAM_ESCAPE) { *s2 = GLOBALS->hier_delimeter; } /* restore back to normal */ + s2++; + } + } + +return(s); +} + /* Fill the store model using current SIG_ROOT and FILTER_STR. */ void @@ -97,6 +131,7 @@ int i = t->t_which; char *s, *tmp2; int vartype; + int is_tname = 0; if(i < 0) continue; @@ -108,7 +143,9 @@ if(!GLOBALS->facs[i]->vec_root) { + is_tname = 1; s = t->name; + s = fix_escaped_names(s, 0); } else { @@ -122,6 +159,7 @@ s=(char *)malloc_2(strlen(p)+4); strcpy(s,"[] "); strcpy(s+3, p); + s = fix_escaped_names(s, 1); free_2(tmp2); } else @@ -130,19 +168,25 @@ s=(char *)malloc_2(strlen(p)+4); strcpy(s,"[] "); strcpy(s+3, p); + s = fix_escaped_names(s, 1); } } if (GLOBALS->filter_str_treesearch_gtk2_c_1 == NULL || wave_regex_match(t->name, WAVE_REGEX_TREE)) { gtk_list_store_prepend (GLOBALS->sig_store_treesearch_gtk2_c_1, &iter); - if(s == t->name) + if(is_tname) { gtk_list_store_set (GLOBALS->sig_store_treesearch_gtk2_c_1, &iter, - NAME_COLUMN, t->name, + NAME_COLUMN, s, TREE_COLUMN, t, TYPE_COLUMN, vartype_strings[vartype], -1); + + if(s != t->name) + { + free_2(s); + } } else { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
