Hello community, here is the log from the commit of package gimp checked in at Thu Jun 29 22:47:17 CEST 2006. -------- --- GNOME/gimp/gimp.changes 2006-06-14 19:09:56.000000000 +0200 +++ gimp/gimp.changes 2006-06-29 19:26:03.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 19:25:33 CEST 2006 - nadvornik@suse.cz + +- do not use deprecated libpng functions + +------------------------------------------------------------------- New: ---- gimp-libpng.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.DxDpGK/_old 2006-06-29 22:46:48.000000000 +0200 +++ /var/tmp/diff_new_pack.DxDpGK/_new 2006-06-29 22:46:48.000000000 +0200 @@ -17,7 +17,7 @@ %define sysconfdir /etc %define prefix /opt/gnome Version: 2.2.10 -Release: 22 +Release: 24 License: GPL Group: Productivity/Graphics/Bitmap Editors Provides: gimp2 gimp-2.0 @@ -32,6 +32,7 @@ Source2: gimp-splash.png Patch: gimp-warnings.patch Patch1: gimp-gimpdatadir.patch +Patch2: gimp-libpng.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -421,6 +422,7 @@ %setup -q %patch %patch1 +%patch2 rm po*/no.* sed -i "/ALL_LINGUAS=/s/ no / /" configure.in # This trick activates Digital Camera RAW opening, if dcraw-gnome and rawphoto are installed. @@ -518,6 +520,8 @@ %{prefix}/share/gtk-doc/html/* %changelog -n gimp +* Thu Jun 29 2006 - nadvornik@suse.cz +- do not use deprecated libpng functions * Wed Jun 14 2006 - schwab@suse.de - Handle references to datarootdir variable. - Really enable python scripting. ++++++ gimp-libpng.patch ++++++ --- plug-ins/common/png.c +++ plug-ins/common/png.c @@ -1012,12 +1012,16 @@ * Done with the file... */ +#if PNG_LIBPNG_VER > 88 + png_destroy_read_struct(&pp, &info, NULL); +#else png_read_destroy (pp, info, NULL); + free (pp); + free (info); +#endif /* PNG_LIBPNG_VER > 88 */ g_free (pixel); g_free (pixels); - free (pp); - free (info); fclose (fp); @@ -1441,7 +1445,14 @@ }; png_write_end (pp, info); + +#if PNG_LIBPNG_VER > 88 + png_destroy_write_struct(&pp, &info); +#else png_write_destroy (pp); + free (pp); + free (info); +#endif /* PNG_LIBPNG_VER > 88 */ g_free (pixel); g_free (pixels); @@ -1456,9 +1467,6 @@ g_free (text); } - free (pp); - free (info); - fclose (fp); return (1); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org