Hello community, here is the log from the commit of package abiword checked in at Tue Dec 19 15:29:32 CET 2006. -------- --- GNOME/abiword/abiword.changes 2006-11-07 13:36:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/abiword/abiword.changes 2006-12-19 10:29:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 19 10:28:55 CET 2006 - meissner@suse.de + +- fixed build fail due to warnings. + +------------------------------------------------------------------- New: ---- abiword-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.Ep3fhP/_old 2006-12-19 13:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.Ep3fhP/_new 2006-12-19 13:55:02.000000000 +0100 @@ -16,7 +16,7 @@ BuildRequires: valgrind %endif %define prefix /opt/gnome -License: GNU General Public License (GPL) - all versions, MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL) Group: Productivity/Office/Other Requires: ghostscript-fonts-std, ghostscript-fonts-other, gnome-icon-theme Autoreqprov: on @@ -24,7 +24,7 @@ Obsoletes: abiword2 Summary: A Multiplatform Word Processor Version: 2.4.5 -Release: 24 +Release: 34 URL: http://www.abisource.com/ Source: %{name}-%{version}.tar.bz2 Patch2: abiword-uninited-vars.patch @@ -34,6 +34,7 @@ Patch6: abiword-missing-sentinel.patch Patch7: abiword-compiler-warning.patch Patch8: abiword-shutdown-crash.patch +Patch9: abiword-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +63,7 @@ %patch6 %patch7 %patch8 +%patch9 -p1 find . -name ".cvsignore" -exec rm -f {} \; %{?suse_update_config:%{suse_update_config -f $DIR}} sed "s:config_flags=':& --with-libwmf=/usr/%_lib:" <abi/configure >abi/configure~ @@ -126,6 +128,8 @@ /usr/share/pixmaps/*.png %changelog -n abiword +* Tue Dec 19 2006 - meissner@suse.de +- fixed build fail due to warnings. * Tue Nov 07 2006 - ro@suse.de - fix icon permission * Tue Oct 31 2006 - jhargadon@suse.de ++++++ abiword-fixes.patch ++++++ --- abiword-2.4.5/abi/src/af/xap/unix/xap_UnixPSGraphics.cpp.xx 2006-12-19 10:08:39.000000000 +0100 +++ abiword-2.4.5/abi/src/af/xap/unix/xap_UnixPSGraphics.cpp 2006-12-19 10:10:54.000000000 +0100 @@ -1188,6 +1188,7 @@ UT_uint16 col = 0; while (cursor < end) { + UT_Byte red, green, blue; /* This is a pretty tight loop, for speed. We're taking each sample and averaging the R, G, and B values and @@ -1206,10 +1207,12 @@ // TODO : Balance these colors! I don't like the output // TODO : I get from a simple average or adding the YIQ // TODO : weights. Look at Netscape for something better. - - g_snprintf(reinterpret_cast<char *>(&hexbuf[0]), sizeof(hexbuf), "%.2X", ( static_cast<UT_Byte>( ( static_cast<float>(*cursor++) * static_cast<float>(1) + - static_cast<float>(*cursor++) * static_cast<float>(1) + - static_cast<float>(*cursor++) * static_cast<float>(1) ) / + red = *cursor++; + green = *cursor++; + blue = *cursor++; + g_snprintf(reinterpret_cast<char *>(&hexbuf[0]), sizeof(hexbuf), "%.2X", ( static_cast<UT_Byte>( ( static_cast<float>(red) * static_cast<float>(1) + + static_cast<float>(green) * static_cast<float>(1) + + static_cast<float>(blue) * static_cast<float>(1) ) / static_cast<float>(3.0) )) ); m_ps->writeBytes(hexbuf, 2); --- abiword-2.4.5/abi/src/tools/pfa2afm/unix/parsepfa.c.xx 2006-12-19 10:11:54.000000000 +0100 +++ abiword-2.4.5/abi/src/tools/pfa2afm/unix/parsepfa.c 2006-12-19 10:14:03.000000000 +0100 @@ -641,6 +641,7 @@ for ( pt = str, end = str+len-1; pt<end && (ch=getc(file))!=EOF && ch!='\r' && ch!='\n'; *pt++ = ch ); + if (pt < end) { if ( ch=='\n' ) *pt++ = '\n'; else if ( ch=='\r' ) { @@ -648,6 +649,7 @@ if ((ch=getc(file))!='\n' ) ungetc(ch,file); } + } if ( pt==str ) return( NULL ); *pt = '\0'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org