Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7843

Modified Files:
        gtk-canvas.info 
Added Files:
        gtk-canvas.patch 
Log Message:
gtk-canvas patched to correct bug in source code

--- NEW FILE: gtk-canvas.patch ---
diff -ruN gtk-canvas-0.1.1-orig/gtk-canvas/gtk-canvas-load.c 
gtk-canvas-0.1.1/gtk-canvas/gtk-canvas-load.c
--- gtk-canvas-0.1.1-orig/gtk-canvas/gtk-canvas-load.c  2000-07-20 
21:55:14.000000000 -0700
+++ gtk-canvas-0.1.1/gtk-canvas/gtk-canvas-load.c       2006-04-12 
09:40:04.000000000 -0700
@@ -12,7 +12,7 @@
  */
 #include <config.h>
 #include <gdk_imlib.h>
-#include <malloc.h>
+#
 #include "gtk-canvas.h"
 #include "gtk-canvas-load.h"
 
diff -ruN gtk-canvas-0.1.1-orig/gtk-canvas/gtk-canvas.c 
gtk-canvas-0.1.1/gtk-canvas/gtk-canvas.c
--- gtk-canvas-0.1.1-orig/gtk-canvas/gtk-canvas.c       2002-11-18 
02:06:17.000000000 -0800
+++ gtk-canvas-0.1.1/gtk-canvas/gtk-canvas.c    2006-04-12 09:40:04.000000000 
-0700
@@ -3723,7 +3723,7 @@
        uta->y0 = new_y1;
        uta->width = new_x2 - new_x1;
        uta->height = new_y2 - new_y1;
-       uta->utiles = utiles = art_new (ArtUtaBbox, uta->width * uta->height);
+    uta->utiles = art_new (ArtUtaBbox, uta->width * uta->height);
 
        ofs = 0;
        ofs1 = ofs2 = 0;
@@ -3766,7 +3766,7 @@
                                                        MAX (ART_UTA_BBOX_Y1 
(bb1),
                                                             ART_UTA_BBOX_Y1 
(bb2)));
 
-                       utiles[ofs] = bb;
+                       uta->utiles[ofs] = bb;
 
                        ofs++;
                        ofs1++;

Index: gtk-canvas.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gtk-canvas.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtk-canvas.info     21 Mar 2006 17:12:50 -0000      1.4
+++ gtk-canvas.info     12 Apr 2006 19:39:54 -0000      1.5
@@ -1,6 +1,6 @@
 Package: gtk-canvas
 Version: 0.1.1
-Revision: 22
+Revision: 23
 BuildDepends: gtk+, glib, libiconv-dev, gettext-dev, x11-dev, imlib, 
gnome-libs-dev, libart2 (>= 2.3.16-2)
 #Depends: gtk+-shlibs, libgl, gnome-libs, gnome-libs-shlibs, imlib-shlibs, 
libart2-shlibs (>= 2.3.16-2)
 BuildDependsOnly: true
@@ -20,6 +20,7 @@
 <<
 DescPackaging: <<
   Why does this build its own libart?
+  Because it appears to need to (try it without).
 <<
 DescUsage: <<
   Only the static library is supplied. To compile against
@@ -28,7 +29,8 @@
    gtk+, glib, libiconv-dev, gettext-dev, x11-dev, imlib,
    gnome-libs-dev, libart2 (>= 2.3.16-2)
 <<
-PatchScript:  perl -pi -e 's/include <malloc.h>//g' **/*.c
+#PatchScript:  perl -pi -e 's/include <malloc.h>//g' **/*.c
+Patch: %N.patch
 ConfigureParams: --with-gtk-prefix=%p --with-imlib-prefix=%p  
 InstallScript: <<
 #!/bin/zsh -ef



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to