Author: jaeger Date: 2006-05-16 22:08:31 +0200 (Tue, 16 May 2006) New Revision: 1411 Added: crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch Modified: crux-2.2/ports/opt/gimp/.md5sum crux-2.2/ports/opt/gimp/Pkgfile Log: gimp: added patch for recent libpng API changes Modified: crux-2.2/ports/opt/gimp/.md5sum =================================================================== --- crux-2.2/ports/opt/gimp/.md5sum 2006-05-16 17:15:21 UTC (rev 1410) +++ crux-2.2/ports/opt/gimp/.md5sum 2006-05-16 20:08:31 UTC (rev 1411) @@ -1 +1,2 @@ +c400a51d6433bdf5080b58db461745a6 gimp-2.2.11-libpng.patch 0403e9b4e0415c99cd27b137b9839212 gimp-2.2.11.tar.bz2 Modified: crux-2.2/ports/opt/gimp/Pkgfile =================================================================== --- crux-2.2/ports/opt/gimp/Pkgfile 2006-05-16 17:15:21 UTC (rev 1410) +++ crux-2.2/ports/opt/gimp/Pkgfile 2006-05-16 20:08:31 UTC (rev 1411) @@ -6,10 +6,12 @@ name=gimp version=2.2.11 release=1 -source=(ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-$version.tar.bz2) +source=(ftp://ftp.gimp.org/pub/gimp/v2.2/gimp-$version.tar.bz2 \ + $name-$version-libpng.patch) build() { cd gimp-$version + patch -p1 -i $SRC/$name-$version-libpng.patch sed -i -e '/$(helpbrowser)/d' plug-ins/Makefile.in ./configure --prefix=/usr \ --disable-static Added: crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch =================================================================== --- crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch (rev 0) +++ crux-2.2/ports/opt/gimp/gimp-2.2.11-libpng.patch 2006-05-16 20:08:31 UTC (rev 1411) @@ -0,0 +1,36 @@ +diff -puNr gimp-2.2.11.orig/plug-ins/common/png.c gimp-2.2.11/plug-ins/common/png.c +--- gimp-2.2.11.orig/plug-ins/common/png.c 2004-11-23 15:28:43.000000000 +0100 ++++ gimp-2.2.11/plug-ins/common/png.c 2006-04-15 12:15:58.000000000 +0200 +@@ -1012,12 +1012,10 @@ load_image (const gchar *filename, + * Done with the file... + */ + +- png_read_destroy (pp, info, NULL); ++ png_destroy_read_struct (&pp, &info, NULL); + + g_free (pixel); + g_free (pixels); +- free (pp); +- free (info); + + fclose (fp); + +@@ -1441,7 +1439,7 @@ save_image (const gchar *filename, + }; + + png_write_end (pp, info); +- png_write_destroy (pp); ++ png_destroy_write_struct (&pp, &info); + + g_free (pixel); + g_free (pixels); +@@ -1456,9 +1454,6 @@ save_image (const gchar *filename, + g_free (text); + } + +- free (pp); +- free (info); +- + fclose (fp); + + return (1);