Hello community, here is the log from the commit of package libwps for openSUSE:Factory checked in at Thu May 19 09:28:49 CEST 2011.
-------- --- libwps/libwps.changes 2011-05-04 11:58:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/libwps/libwps.changes 2011-05-18 12:05:25.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 18 12:00:32 CEST 2011 - fst...@novell.com + +- Add libwps-0.2.0-gcc46.patch: fix compilation with gcc 4.6.x + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libwps-0.2.2-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwps.spec ++++++ --- /var/tmp/diff_new_pack.EGJ6gD/_old 2011-05-19 09:27:15.000000000 +0200 +++ /var/tmp/diff_new_pack.EGJ6gD/_new 2011-05-19 09:27:15.000000000 +0200 @@ -22,11 +22,13 @@ BuildRequires: gcc-c++ libwpd-devel >= 0.9.0 pkgconfig Summary: Library for importing the Microsoft Works word processor file format Version: 0.2.2 -Release: 1 +Release: 3 License: LGPLv2.1+ Group: System/Libraries Url: http://libwps.sourceforge.net/ Source: libwps-%{version}.tar.bz2 +#FIX-UPSTREAM +Patch0: libwps-0.2.2-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libwps-0_2-2 = %{version}-%{release} @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 -b .gcc46 %build %configure --disable-static --docdir=%_docdir/%name ++++++ libwps-0.2.2-gcc46.patch ++++++ --- libwps-0.2.2/src/lib/WPS4.cpp 2011-04-04 21:34:27.000000000 +0200 +++ libwps-0.2.2/src/lib/WPS4.cpp 2011-05-18 11:49:54.638226220 +0200 @@ -198,10 +198,7 @@ } input->seek(page_offset, WPX_SEEK_SET); - uint32_t fcFirst; /* Byte number of first character covered by this page - of formatting information */ - - fcFirst = readU32(input); + readU32(input); int first_fod = FODs->size(); --- libwps-0.2.2/src/lib/WPS8.cpp 2011-05-03 15:00:13.000000000 +0200 +++ libwps-0.2.2/src/lib/WPS8.cpp 2011-05-18 11:52:51.813645308 +0200 @@ -159,7 +159,7 @@ for (unsigned i=0; i < n_streams; i++) { uint16_t len; - uint32_t unknown, type = 0; + uint32_t type = 0; len = readU16(input); if (len > 10) { @@ -168,7 +168,7 @@ } if (len > 4) { - unknown = readU32(input); // assume == 0x22000000 + readU32(input); // assume == 0x22000000 type = readU32(input); } else input->seek(len-2,WPX_SEEK_CUR); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
