don't use long deprecated libpng API (#191027, patch by Manish Singh)
This commit is contained in:
parent
5dbcda5beb
commit
9579c384ef
34
gimp-2.2.11-libpng.patch
Normal file
34
gimp-2.2.11-libpng.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
--- gimp-2.2.11/plug-ins/common/png.c.libpng 2004-11-23 09:28:43.000000000 -0500
|
||||||
|
+++ gimp-2.2.11/plug-ins/common/png.c 2006-05-09 10:12:05.000000000 -0400
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * "$Id: png.c,v 1.118 2004/11/23 14:28:43 mitch Exp $"
|
||||||
|
+ * "$Id: png.c,v 1.118.2.1 2006/04/23 07:01:47 yosh Exp $"
|
||||||
|
*
|
||||||
|
* Portable Network Graphics (PNG) plug-in for The GIMP -- an image
|
||||||
|
* manipulation program
|
||||||
|
@@ -1012,7 +1012,11 @@
|
||||||
|
* Done with the file...
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#if PNG_LIBPNG_VER > 99
|
||||||
|
+ png_destroy_read_struct (&pp, &info, NULL);
|
||||||
|
+#else
|
||||||
|
png_read_destroy (pp, info, NULL);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
g_free (pixel);
|
||||||
|
g_free (pixels);
|
||||||
|
@@ -1441,7 +1445,12 @@
|
||||||
|
};
|
||||||
|
|
||||||
|
png_write_end (pp, info);
|
||||||
|
+
|
||||||
|
+#if PNG_LIBPNG_VER > 99
|
||||||
|
+ png_destroy_write_struct (&pp, &info);
|
||||||
|
+#else
|
||||||
|
png_write_destroy (pp);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
g_free (pixel);
|
||||||
|
g_free (pixels);
|
@ -79,6 +79,7 @@ Patch3: gimp-2.2.7-gcc4.patch
|
|||||||
Patch4: gimp-2.2.4-gifload.patch
|
Patch4: gimp-2.2.4-gifload.patch
|
||||||
Patch5: gimp-2.2.11-htmlview.patch
|
Patch5: gimp-2.2.11-htmlview.patch
|
||||||
Patch6: gimp-2.2.11-gimptool.patch
|
Patch6: gimp-2.2.11-gimptool.patch
|
||||||
|
Patch7: gimp-2.2.11-libpng.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The GIMP (GNU Image Manipulation Program) is a powerful image
|
The GIMP (GNU Image Manipulation Program) is a powerful image
|
||||||
@ -112,6 +113,7 @@ extensions.
|
|||||||
%patch4 -p1 -b .gifload
|
%patch4 -p1 -b .gifload
|
||||||
%patch5 -p1 -b .htmlview
|
%patch5 -p1 -b .htmlview
|
||||||
%patch6 -p1 -b .gimptool
|
%patch6 -p1 -b .gimptool
|
||||||
|
%patch7 -p1 -b .libpng
|
||||||
|
|
||||||
%build
|
%build
|
||||||
libtoolize --copy --force
|
libtoolize --copy --force
|
||||||
@ -360,7 +362,7 @@ fi
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue May 09 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.11-4
|
* Tue May 09 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.11-4
|
||||||
- rebuild (#191027)
|
- don't use long deprecated libpng API (#191027, patch by Manish Singh)
|
||||||
|
|
||||||
* Thu Apr 20 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.11-3
|
* Thu Apr 20 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.11-3
|
||||||
- only use pkgconfig if needed in gimptool, require pkgconfig in devel
|
- only use pkgconfig if needed in gimptool, require pkgconfig in devel
|
||||||
|
Loading…
Reference in New Issue
Block a user