Hello community, here is the log from the commit of package icoutils for openSUSE:Factory checked in at 2012-12-21 14:41:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icoutils (Old) and /work/SRC/openSUSE:Factory/.icoutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icoutils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/icoutils/icoutils.changes 2011-12-21 10:00:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icoutils.new/icoutils.changes 2012-12-21 14:41:30.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 20 18:07:32 UTC 2012 - [email protected] + +- Update to 0.30.0. + * Fix crash with libpng version prior to 1.2.25. + * Man page improvements. + * Limit size of extracted icon to size of resource. Fixes a + segfault (rh#701855). +- Correct build dependencies: remove zlib-devel; libpng-devel -> + pkgconfig(libpng). +- Verify GPG signature. + +------------------------------------------------------------------- Old: ---- icoutils-0.29.1.tar.bz2 New: ---- icoutils-0.30.0.tar.bz2 icoutils-0.30.0.tar.bz2.sig icoutils.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icoutils.spec ++++++ --- /var/tmp/diff_new_pack.0y4TBw/_old 2012-12-21 14:41:31.000000000 +0100 +++ /var/tmp/diff_new_pack.0y4TBw/_new 2012-12-21 14:41:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icoutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,17 +16,20 @@ # - Name: icoutils -Version: 0.29.1 -Release: 3 -License: GPL-3.0+ +Version: 0.30.0 +Release: 0 Summary: Extracting and Converting Microsoft Icon and Cursor Files -Url: http://www.nongnu.org/icoutils/ +License: GPL-3.0+ Group: Productivity/Graphics/Convertors +Url: http://www.nongnu.org/icoutils/ Source0: http://savannah.nongnu.org/download/icoutils/%{name}-%{version}.tar.bz2 -BuildRequires: libpng-devel -BuildRequires: zlib-devel +Source1: http://savannah.nongnu.org/download/icoutils/%{name}-%{version}.tar.bz2.sig +Source2: %{name}.keyring +BuildRequires: pkgconfig(libpng) +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,6 +39,9 @@ libraries (.dll-files). %prep +%if 0%{?gpg_verify:1} +%gpg_verify %{SOURCE1} +%endif %setup -q %build ++++++ icoutils-0.29.1.tar.bz2 -> icoutils-0.30.0.tar.bz2 ++++++ ++++ 41997 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/icoutils-0.29.1/AUTHORS new/icoutils-0.30.0/AUTHORS --- old/icoutils-0.29.1/AUTHORS 2010-02-28 13:19:12.000000000 +0100 +++ new/icoutils-0.30.0/AUTHORS 2012-08-23 17:25:27.000000000 +0200 @@ -22,6 +22,9 @@ Joel Holdsworth<[email protected]> Martin Gieseking -Martin Storsj�<[email protected]> +Martin Storsjö<[email protected]> Mathew Eis <[email protected]> - - misc. fixes + - Miscellaneous fixes and improvements + +Markus Schölzel <[email protected]> + - man page improvements 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/icoutils-0.29.1/NEWS new/icoutils-0.30.0/NEWS --- old/icoutils-0.29.1/NEWS 2010-02-13 18:39:01.000000000 +0100 +++ new/icoutils-0.30.0/NEWS 2012-08-23 17:27:56.000000000 +0200 @@ -1,4 +1,11 @@ -2010-02-14: icoutils 0.29.0 released. +2012-08-23: icoutils 0.30.0 released. + Fix crash with libpng version prior to 1.2.25. (Martin Storsjö) + Man page improvements. (Markus Schölzel) + Limit size of extracted icon to size of resource. + Fixes a segfault, see https://bugzilla.redhat.com/show_bug.cgi?id=701855 (Martin Gieseking). + Also independently discovered and reported by Sasha Zivojinovic. + +2010-02-14: icoutils 0.29.0 released. Maintainer position adopted by Frank Richter <[email protected]>. Fixed icotool to correctly populate the planes and bit_count fields of Win32CursorIconFileDirEntry for icons (Joel Holdsworth). Fix occasional infinite loop when presented a corrupted icon file (Mathew Eis). @@ -47,7 +54,7 @@ Gabeler-Lee). Applied Mac OS X 10.3 fixes from Kaoru Shirai. Added support for broken NE files to wrestool (broken file contributed by - Denilson F. de S�). + Denilson F. de Sá). 2004-07-05: icoutils 0.23.0 released. Fixed some #if/#ifndef typos (reported by Andrew Taylor). @@ -83,7 +90,7 @@ transparency: none and completely transparent (bug reported by Steve van Bennekom). Link with -lz -lm since libpng requires it on some systems (bug reported - by G�tz Waschk). + by Götz Waschk). Fixed some minor compilation warnings. 2003-05-26: icoutils 0.19.0 released. 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/icoutils-0.29.1/build-aux/missing new/icoutils-0.30.0/build-aux/missing --- old/icoutils-0.29.1/build-aux/missing 2010-01-02 21:12:54.000000000 +0100 +++ new/icoutils-0.30.0/build-aux/missing 2012-05-04 01:15:22.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# 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 @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <[email protected]>." exit $? ;; @@ -106,15 +107,22 @@ 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). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + 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 @@ -240,7 +248,7 @@ fi ;; - lex|flex) + 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 @@ -263,7 +271,7 @@ fi ;; - help2man) + 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 @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + 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 @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# 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/icoutils-0.29.1/config.h.in new/icoutils-0.30.0/config.h.in --- old/icoutils-0.29.1/config.h.in 2010-01-02 20:27:58.000000000 +0100 +++ new/icoutils-0.30.0/config.h.in 2012-05-04 01:15:20.000000000 +0200 @@ -448,6 +448,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/icoutils-0.29.1/configure.ac new/icoutils-0.30.0/configure.ac --- old/icoutils-0.29.1/configure.ac 2010-02-28 13:19:37.000000000 +0100 +++ new/icoutils-0.30.0/configure.ac 2012-08-23 17:36:30.000000000 +0200 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(icoutils, 0.29.1, [email protected]) +AC_INIT(icoutils, 0.30.0, [email protected]) AC_CONFIG_MACRO_DIR([m4]) # doesn't seem to have any effect at the moment AC_CONFIG_SRCDIR([icotool/icotool.h]) AC_CONFIG_HEADER([config.h]) 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/icoutils-0.29.1/extresso/extresso new/icoutils-0.30.0/extresso/extresso --- old/icoutils-0.29.1/extresso/extresso 2010-02-28 13:21:54.000000000 +0100 +++ new/icoutils-0.30.0/extresso/extresso 2012-08-23 17:40:29.000000000 +0200 @@ -71,7 +71,7 @@ exit; } if ($arg_version) { - print "$PROGRAM (icoutils) 0.29.1\n"; + print "$PROGRAM (icoutils) 0.30.0\n"; print "Written by Oskar Liljeblad.\n\n"; print "Copyright (C) 1998-2005 Oskar Liljeblad.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; 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/icoutils-0.29.1/extresso/extresso.1 new/icoutils-0.30.0/extresso/extresso.1 --- old/icoutils-0.29.1/extresso/extresso.1 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/extresso/extresso.1 2012-05-04 01:14:50.000000000 +0200 @@ -60,8 +60,8 @@ ``win98_shell32'', assuming it is available in ``/windows/windows/system/shell32.dll'', and placing output in ``out/'': - $ extresso ../data/resscripts/win98_shell32 --base=/windows/windows --output=out/ - $ find out/ -type f | wc -l + $ extresso ../data/resscripts/win98_shell32 \-\-base=/windows/windows \-\-output=out/ + $ find out/ \-type f | wc \-l 339 $ .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/icoutils-0.29.1/extresso/genresscript new/icoutils-0.30.0/extresso/genresscript --- old/icoutils-0.29.1/extresso/genresscript 2010-02-28 13:21:54.000000000 +0100 +++ new/icoutils-0.30.0/extresso/genresscript 2012-08-23 17:40:29.000000000 +0200 @@ -58,7 +58,7 @@ exit; } if ($arg_version) { - print "$PROGRAM (icoutils) 0.29.1\n"; + print "$PROGRAM (icoutils) 0.30.0\n"; print "Written by Oskar Liljeblad.\n\n"; print "Copyright (C) 1998-2005 Oskar Liljeblad.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; 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/icoutils-0.29.1/icotool/Makefile.am new/icoutils-0.30.0/icotool/Makefile.am --- old/icoutils-0.29.1/icotool/Makefile.am 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/icotool/Makefile.am 2012-05-04 01:14:50.000000000 +0200 @@ -12,6 +12,7 @@ win32.h icotool_LDADD = \ + @INTLLIBS@ \ @PNG_LIBS@ \ ../common/libcommon.a \ ../lib/libgnu.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/icoutils-0.29.1/icotool/create.c new/icoutils-0.30.0/icotool/create.c --- old/icoutils-0.29.1/icotool/create.c 2010-02-13 18:35:40.000000000 +0100 +++ new/icoutils-0.30.0/icotool/create.c 2012-08-23 16:57:16.000000000 +0200 @@ -114,7 +114,7 @@ } if (!xfread(header, 8, img[c].in)) goto cleanup; - if (png_sig_cmp(header, 0, 8)) { + if (png_sig_cmp((png_bytep)header, 0, 8)) { warn(_("not a png file")); goto cleanup; @@ -425,7 +425,8 @@ { png_read_end(img[c].png_ptr, img[c].info_ptr); } - png_destroy_read_struct(&img[c].png_ptr, &img[c].info_ptr, NULL); + if (img[c].png_ptr) + png_destroy_read_struct(&img[c].png_ptr, &img[c].info_ptr, NULL); fclose(img[c].in); memset(&img[c], 0, sizeof(*img)); } 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/icoutils-0.29.1/icotool/icotool.1 new/icoutils-0.30.0/icotool/icotool.1 --- old/icoutils-0.29.1/icotool/icotool.1 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/icotool/icotool.1 2012-05-04 01:14:50.000000000 +0200 @@ -62,8 +62,8 @@ This options tells icotool that images in all given icon/cursor files are to be listed. The output will look something like this: - --icon --index=1 --width=16 --height=16 --bit-depth=4 --palette-size=16 - --icon --index=2 --width=32 --height=32 --bit-depth=8 --palette-size=256 + \-\-icon \-\-index=1 \-\-width=16 \-\-height=16 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=2 \-\-width=32 \-\-height=32 \-\-bit-depth=8 \-\-palette-size=256 .TP .B \-c, \-\-create This options tells icotool to create an icon/cursor file using all the @@ -78,16 +78,17 @@ extract only the N'th image in each file. The first image has index 1. This option has no effect in create mode. +.TP .B \-w, \-\-width=\fIPIXELS\fR -Similar to --index, but this option allows the image width to be matched +Similar to \-\-index, but this option allows the image width to be matched instead. This option has no effect in create mode. .TP .B \-h, \-\-height=\fIPIXELS\fR -Similar to --index, but this option allows the image height to be matched +Similar to \-\-index, but this option allows the image height to be matched instead. This option has no effect in create mode. .TP .B \-b, \-\-bit-depth=\fICOUNT\fR -Similar to --index, but this option allows the number of bits per pixel +Similar to \-\-index, but this option allows the number of bits per pixel in the image to be matched instead. Valid values are 1, 2, 4, 8, 16, 24 and 32. @@ -103,7 +104,7 @@ .\".TP .TP .B \-p, \-\-palette-size=\fIPIXELS\fR -Similar to --index, but this option allows the number of colors in +Similar to \-\-index, but this option allows the number of colors in the image palette to be matched instead. Images with 24 or 32 bits in icon/cursor files do not have a palette, and will therefore have a palette size equal to 0. @@ -111,13 +112,13 @@ This option has no effect in create mode. .TP .B \-X, \-\-hotspot-x=\fICOORD\fR -Similar to --index, but this option allows the x-coordinate of the +Similar to \-\-index, but this option allows the x-coordinate of the hotspot to be matched. This option only has effect on cursor files. In create mode, this can be used to specify the hotspot x-coordinate. .TP .B \-Y, \-\-hotspot-y=\fICOORD\fR -Similar to --index, but this option allows the y-coordinate of the +Similar to \-\-index, but this option allows the y-coordinate of the hotspot to be matched. This option only has effect on cursor files. In create mode, this can be used to specify the hotspot y-coordinate. @@ -159,25 +160,25 @@ .SH EXAMPLES List all images in the file `demo.ico': .br - $ \fBicotool -l demo.ico\fP - --icon --index=1 --width=16 --height=16 --bit-depth=4 --palette-size=16 - --icon --index=2 --width=32 --height=32 --bit-depth=4 --palette-size=16 - --icon --index=3 --width=48 --height=48 --bit-depth=4 --palette-size=16 - --icon --index=4 --width=16 --height=16 --bit-depth=8 --palette-size=256 - --icon --index=5 --width=32 --height=32 --bit-depth=8 --palette-size=256 - --icon --index=6 --width=48 --height=48 --bit-depth=8 --palette-size=256 + $ \fBicotool \-l demo.ico\fP + \-\-icon \-\-index=1 \-\-width=16 \-\-height=16 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=2 \-\-width=32 \-\-height=32 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=3 \-\-width=48 \-\-height=48 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=4 \-\-width=16 \-\-height=16 \-\-bit-depth=8 \-\-palette-size=256 + \-\-icon \-\-index=5 \-\-width=32 \-\-height=32 \-\-bit-depth=8 \-\-palette-size=256 + \-\-icon \-\-index=6 \-\-width=48 \-\-height=48 \-\-bit-depth=8 \-\-palette-size=256 .PP List only 16-color images in `demo.ico': .br - $ \fBicotool -l --palette-size=16 demo.ico\fP - --icon --index=1 --width=16 --height=16 --bit-depth=4 --palette-size=16 - --icon --index=2 --width=32 --height=32 --bit-depth=4 --palette-size=16 - --icon --index=3 --width=48 --height=48 --bit-depth=4 --palette-size=16 + $ \fBicotool \-l \-\-palette-size=16 demo.ico\fP + \-\-icon \-\-index=1 \-\-width=16 \-\-height=16 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=2 \-\-width=32 \-\-height=32 \-\-bit-depth=4 \-\-palette-size=16 + \-\-icon \-\-index=3 \-\-width=48 \-\-height=48 \-\-bit-depth=4 \-\-palette-size=16 .PP Extract all images to current directory, naming the destination files `demo.ico_I_WxHxD.xpm': .br - $ \fBicotool -x -o . demo.ico\fP + $ \fBicotool \-x \-o . demo.ico\fP $ \fBls *.png\fP demo_1_16x16x4.png demo_3_48x48x4.png demo_5_32x32x8.png demo_2_32x32x4.png demo_4_16x16x8.png demo_6_48x48x8.png @@ -185,11 +186,11 @@ Extract all 256-color icon images in all .ico files in the current directory, placing the extracted images in `img/' .br - $ \fBicotool -x -o img/ -p 256 *.ico\fP + $ \fBicotool \-x \-o img/ \-p 256 *.ico\fP .PP Create an icon named `favicon.ico' with two images: .br - $ \fBicotool -c -o favicon.ico mysite_32x32.png mysite_64x64.png\fP + $ \fBicotool \-c \-o favicon.ico mysite_32x32.png mysite_64x64.png\fP .SH AUTHOR The \fBicoutils\fP were written by Oskar Liljeblad <\[email protected]\fP>. .SH COPYRIGHT 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/icoutils-0.29.1/icotool/win32.h new/icoutils-0.30.0/icotool/win32.h --- old/icoutils-0.29.1/icotool/win32.h 2010-02-28 13:18:32.000000000 +0100 +++ new/icoutils-0.30.0/icotool/win32.h 2012-05-18 18:32:37.000000000 +0200 @@ -36,7 +36,7 @@ uint16_t height; } Win32CursorDir; -typedef struct { +typedef struct PACKED { union { Win32IconResDir icon; Win32CursorDir cursor; @@ -47,11 +47,11 @@ uint16_t res_id; } Win32CursorIconDirEntry; -typedef struct { +typedef struct PACKED { uint16_t reserved; uint16_t type; uint16_t count; - Win32CursorIconDirEntry entries[0] PACKED; + Win32CursorIconDirEntry entries[0]; } Win32CursorIconDir; typedef struct { Files old/icoutils-0.29.1/po/[email protected] and new/icoutils-0.30.0/po/[email protected] 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/icoutils-0.29.1/po/[email protected] new/icoutils-0.30.0/po/[email protected] --- old/icoutils-0.29.1/po/[email protected] 2010-02-28 13:22:16.000000000 +0100 +++ new/icoutils-0.30.0/po/[email protected] 2012-08-23 17:40:34.000000000 +0200 @@ -1,7 +1,7 @@ # English translations for icoutils package. -# Copyright (C) 2010 Oskar Liljeblad +# Copyright (C) 2012 Oskar Liljeblad # This file is distributed under the same license as the icoutils package. -# Automatically generated, 2010. +# Automatically generated, 2012. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,12 +30,13 @@ # msgid "" msgstr "" -"Project-Id-Version: icoutils 0.29.1\n" +"Project-Id-Version: icoutils 0.30.0\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-02-28 13:22+0100\n" -"PO-Revision-Date: 2010-02-28 13:22+0100\n" +"POT-Creation-Date: 2012-08-23 17:35+0200\n" +"PO-Revision-Date: 2012-08-23 17:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" Files old/icoutils-0.29.1/po/[email protected] and new/icoutils-0.30.0/po/[email protected] 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/icoutils-0.29.1/po/[email protected] new/icoutils-0.30.0/po/[email protected] --- old/icoutils-0.29.1/po/[email protected] 2010-02-28 13:22:16.000000000 +0100 +++ new/icoutils-0.30.0/po/[email protected] 2012-08-23 17:40:34.000000000 +0200 @@ -1,7 +1,7 @@ # English translations for icoutils package. -# Copyright (C) 2010 Oskar Liljeblad +# Copyright (C) 2012 Oskar Liljeblad # This file is distributed under the same license as the icoutils package. -# Automatically generated, 2010. +# Automatically generated, 2012. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,12 +27,13 @@ # msgid "" msgstr "" -"Project-Id-Version: icoutils 0.29.1\n" +"Project-Id-Version: icoutils 0.30.0\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2010-02-28 13:22+0100\n" -"PO-Revision-Date: 2010-02-28 13:22+0100\n" +"POT-Creation-Date: 2012-08-23 17:35+0200\n" +"PO-Revision-Date: 2012-08-23 17:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" 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/icoutils-0.29.1/wrestool/Makefile.am new/icoutils-0.30.0/wrestool/Makefile.am --- old/icoutils-0.29.1/wrestool/Makefile.am 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/wrestool/Makefile.am 2012-05-04 01:14:50.000000000 +0200 @@ -11,6 +11,7 @@ ../icotool/win32-endian.c wrestool_LDADD = \ + @INTLLIBS@ \ ../common/libcommon.a \ ../lib/libgnu.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/icoutils-0.29.1/wrestool/extract.c new/icoutils-0.30.0/wrestool/extract.c --- old/icoutils-0.29.1/wrestool/extract.c 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/wrestool/extract.c 2012-08-23 16:57:16.000000000 +0200 @@ -172,7 +172,7 @@ if (iconsize != icondir->entries[c].bytes_in_res) { warn(_("%s: mismatch of size in icon resource `%s' and group (%d vs %d)"), fi->name, name, iconsize, icondir->entries[c].bytes_in_res); } - size += iconsize; /* size += icondir->entries[c].bytes_in_res; */ + size += iconsize < icondir->entries[c].bytes_in_res ? icondir->entries[c].bytes_in_res : iconsize; /* cursor resources have two additional WORDs that contain * hotspot info */ 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/icoutils-0.29.1/wrestool/wrestool.1 new/icoutils-0.30.0/wrestool/wrestool.1 --- old/icoutils-0.29.1/wrestool/wrestool.1 2010-01-02 20:39:16.000000000 +0100 +++ new/icoutils-0.30.0/wrestool/wrestool.1 2012-05-04 01:14:50.000000000 +0200 @@ -41,14 +41,14 @@ .TP .B \-x, \-\-extract Extract resources. (By default, resources will be extracted to -standard out if --output was not specified.) +standard out if \-\-output was not specified.) .TP .B \-l, \-\-list Output list of resources (default). .TP .B \-t, \-\-type=[+|\-]ID -Resource type identifier of affected resources. If preceeded -with a dash (``-''), id must be numeric; if preceeded with a +Resource type identifier of affected resources. If preceded +with a dash (``-''), id must be numeric; if preceded with a plus sign (``+''), id must be a string. The type ID may also be the name of a resource type. (If this is @@ -57,7 +57,7 @@ section. .TP .B \-n, \-\-name=[+|\-]ID -Resource name identifier of affected resources. Like the --type +Resource name identifier of affected resources. Like the \-\-type option, a leading dash or plus sign controls the datatype of the id. .TP @@ -77,12 +77,12 @@ .TP .B \-R, \-\-raw Do not parse resource contents - extract raw data. (This option -will probably be replaced with --format=raw in future version of +will probably be replaced with \-\-format=raw in future version of icoutils.) .TP .B \-v, \-\-verbose Explain what is being done. The verbose option may be specified -more than once, like ``-vv'', to make wrestool even more +more than once, like ``\-vv'', to make wrestool even more verbose. .TP .B \-\-help @@ -171,21 +171,21 @@ .SH EXAMPLES List all resources in file `write.exe': .br - $ \fBwrestool -l write.exe\fP - --type=3 --name=1 --lang=1033 [type=icon offset=0x3120 size=752] - --type=3 --name=2 --lang=1033 [type=icon offset=0x3410 size=304] - --type=14 --name=1 --lang=1033 [type=group_icon offset=0x3540 size=34] - --type=16 --name=1 --lang=1033 [type=version offset=0x3564 size=808] + $ \fBwrestool \-l write.exe\fP + \-\-type=3 \-\-name=1 \-\-lang=1033 [type=icon offset=0x3120 size=752] + \-\-type=3 \-\-name=2 \-\-lang=1033 [type=icon offset=0x3410 size=304] + \-\-type=14 \-\-name=1 \-\-lang=1033 [type=group_icon offset=0x3540 size=34] + \-\-type=16 \-\-name=1 \-\-lang=1033 [type=version offset=0x3564 size=808] .PP List all (group-) icon resource in file `write.exe': .br - $ \fBwrestool -l --type=group_icon write.exe\fP - --type=14 --name=1 --lang=1033 [type=group_icon offset=0x3540 size=34] + $ \fBwrestool \-l \-\-type=group_icon write.exe\fP + \-\-type=14 \-\-name=1 \-\-lang=1033 [type=group_icon offset=0x3540 size=34] .PP Extract all icons to current directory, naming the destination files `write.exe_T_N.ico': .br - $ \fBwrestool -x --output=. -t14 write.exe\fP + $ \fBwrestool \-x \-\-output=. \-t14 write.exe\fP $ \fBls *.ico\fP write.exe_14_1.ico .SH SEE ALSO ++++++ icoutils.keyring ++++++ pub 1024D/4FF4EDEC 2003-10-13 uid Frank Richter <[email protected]> uid res__ <[email protected]> uid Frank Richter (res) <[email protected]> uid Frank Richter <[email protected]> sub 1024g/90E945F7 2003-10-13 -----BEGIN PGP PUBLIC KEY BLOCK----- mQGiBD+KtQERBACBAldELF5dlrXwoOp0gtQ3AXaR8qBZoLsok8jQNke9/UIDJhGU tP4GMc9hd4yqnN981x9CWbdQWosjlGxG27uP69lCLSBE5Z0am1Y0x7/lvGnB/vtq /MU323u7qHbqAujbUxjuZzxEpVzgE4dMb7fDVfhUUOtQ10QYQ5FE1BYWzwCg01oc HJE0Bx0Q/0q/pOwgAWhYOncD+gNtnw1bt6YG7rVx+jiGbmoXsgzyxK11JFAd6pn7 8yOG9XYQM93rxWDoz9ihUzLBNKIjWa+ae+fmgQqt7YVac4GSa+I5hvKKPSKjP64R klY8povlTpZXsQCJrUS+TPIa6ZPGL+qt19F/zsCHU0HYmHDhFi1DOdtdVH8+JpSw AhelA/9NvFBoagTzGcxQ5quymMWQBFxHrkW+lb2AvCm6oCWR4GBZTqKrDOsun+Cf YIbL2tlLMpL7jdWwx5u+Zc6oRh0TeBovrzZVgVyBLGizxRf5tZKyh1WB4If7bI6m bQWRnjY1hs3kMFDTNAG4HMoPAUnjMVjJXh0FLUGz/O4/R6E+arQUcmVzX18gPHJl c3F1QGdteC5jaD6IVwQTEQIAFwULBwoDBAMVAwIDFgIBAheABQJCPtMEAAoJEDQk 83BP9O3shY0AoM4DKOmHw7IjABT5viCLVDZwf7qpAJ98Zce5uVtza90PoQyLirSm LpKnTrQiRnJhbmsgUmljaHRlciAocmVzKSA8cmVzcXVAZ214LmNoPoheBBMRAgAe AhsjBgsJCAcDAgMVAgMDFgIBAh4BAheABQJI0UjOAAoJEDQk83BP9O3sbo0AoJlH lzJueRA8P1HVQtjyuyxUx/T1AKC5/xq2eyfyYj+/hds0S0ykAmZBHbQmRnJhbmsg UmljaHRlciA8cmVzQGNyeXN0YWxzcGFjZTNkLm9yZz6IXgQTEQIAHgIbIwYLCQgH AwIDFQIDAxYCAQIeAQIXgAUCSNFItgAKCRA0JPNwT/Tt7NItAKDMMg5tm+ShtMEd AHvakuTTMgT09wCgoUYQfF9p9/jh0bFQONeTsoaraOu0J0ZyYW5rIFJpY2h0ZXIg PGZyYW5rLnJpY2h0ZXJAZ21haWwuY29tPohhBBMRAgAhAhsjBgsJCAcDAgMVAgMD FgIBAh4BAheABQJI0UjOAhkBAAoJEDQk83BP9O3ssaUAnitAk2lGT7LV2MgE9O+4 VkBM6g5oAJ9QuXY6OeSYJc1PrMOzPWSHLWcf07kBDQQ/irUDEAQAqwbqouSLglXB /ryckdfEdXkeX+x/7jppxueL157hkjI48DX9J8TG8Khg80TLd/tKWSerou45jqSa 4G73rsp+CEAKnOx4JcIRepZDXkLBuU+2orcKwnI4Ws7qcCBbAlAxm5hFXl98WUbL 3n6tW2egMPawZVMJwFWBEdxuIUqKyrcAAwcEAKCJFyQUud7twxxD8azV/IHveomP npP6Il3MRuVTxNmeGRdjrPaXlI4m8LkBJxC6pCh0B/nIwmKyvVx8yZW4t2D5QeYq yara9s8SgX/JLgImCg+vho1oRh/TX8T2nzDRLT2mZa7bRCqOl87NivEv6eFPD2VW 75QvdZqYY7SJ6lqHiEYEGBECAAYFAj+KtQMACgkQNCTzcE/07ew2qgCglbytHmwv tr7Yp4IQiDGV2V+l5kAAoJAXA9u3+Dr9ZPugMrAgnWL91iiN =lNBM -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
