Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Thu Apr 8 22:15:00 CEST 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-04-03 00:23:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-04-08 22:14:37.345506000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 8 13:55:08 UTC 2010 - llunak@novell.com + +- fix compile with png14 + +------------------------------------------------------------------- koffice2.changes: same change calling whatdependson for head-i586 New: ---- png14.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.Tdz0dv/_old 2010-04-08 22:14:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Tdz0dv/_new 2010-04-08 22:14:50.000000000 +0200 @@ -27,7 +27,7 @@ Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 2 +Release: 3 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.Tdz0dv/_old 2010-04-08 22:14:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Tdz0dv/_new 2010-04-08 22:14:50.000000000 +0200 @@ -29,16 +29,17 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPLv2 ; GPLv2+ ; LGPLv2.1 ; LGPLv2.1+ +License: GPLv2+ ; LGPLv2.1+ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 2 +Release: 3 Source0: koffice-%version.tar.bz2 Patch1: koffice_remove_kohyphen.diff Patch2: koffice_remove_python_shebangs.diff Patch3: gcc-45.diff +Patch4: png14.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -65,6 +66,7 @@ #%patch1 #%patch2 %patch3 +%patch4 -p2 %build %cmake_kde4 -d build ++++++ png14.diff ++++++ --- trunk/koffice/krita/ui/kis_png_converter.cpp 2010/01/16 16:16:16 1075719 +++ trunk/koffice/krita/ui/kis_png_converter.cpp 2010/01/25 21:31:27 1080210 @@ -408,7 +408,12 @@ png_byte signature[8]; iod->peek((char*)signature, 8); + +#if PNG_LIBPNG_VER < 10400 if (!png_check_sig(signature, 8)) { +#else + if (png_sig_cmp(signature, 0, 8) != 0) { +#endif iod->close(); return (KisImageBuilder_RESULT_BAD_FETCH); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org