tags 383823 + pending
thanks

Hi!

I have applied and tested the patch by John Wright and it works fine.
Therefore, I prepared an NMU that gets this patch into the package.

I'm attaching the interdiff output of the NMU that I'm about to upload.  As
you can see, it's only the patch and the changelog entry.

-- 
Love,
        Marga
diff -u gimp-gap-2.2.0/debian/changelog gimp-gap-2.2.0/debian/changelog
--- gimp-gap-2.2.0/debian/changelog
+++ gimp-gap-2.2.0/debian/changelog
@@ -1,3 +1,11 @@
+gimp-gap (2.2.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload to fix crash wehn duplicating images.
+  * Added debian/patches/gap_thumbnail-free.diff backported from version
+    2.2.1, thanks to John Wright for the patch. (Closes: #383823)
+
+ -- Margarita Manterola <[EMAIL PROTECTED]>  Sun, 27 Aug 2006 19:54:00 -0300
+
 gimp-gap (2.2.0-2) unstable; urgency=low
 
   * Update to fix RC bug since there hasn't been any activity from
only in patch2:
unchanged:
--- gimp-gap-2.2.0.orig/debian/patches/gap_thumbnail-free.diff
+++ gimp-gap-2.2.0/debian/patches/gap_thumbnail-free.diff
@@ -0,0 +1,46 @@
+--- gimp-gap-2.2.0/gap/gap_thumbnail.c 2004-04-30 12:08:22.000000000 -0600
++++ gimp-gap-2.2.1/gap/gap_thumbnail.c 2006-05-31 03:58:29.000000000 -0600
+@@ -42,7 +42,6 @@
+ #include "config.h"
+ 
+ /* SYSTEM (UNIX) includes */
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
+ #include <string.h>
+@@ -53,6 +52,8 @@
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
++#include <glib/gstdio.h>
++
+ #ifdef G_OS_WIN32
+ #include <io.h>
+ #  ifndef S_ISDIR
+@@ -295,7 +296,7 @@
+                                        );
+               g_object_unref(pixbuf);
+           }
+-          g_free(thumbnail);
++          g_object_unref(thumbnail);
+         }
+           g_free(dst_png_thumb_full);
+         }
+@@ -450,7 +451,7 @@
+         if(gap_lib_file_exists(png_thumb_full) == 1)
+         {
+           if (gap_debug) printf ("gap_thumb_file_delete_thumbnail: 
png_thumb_full: %s\n", png_thumb_full);
+-          remove(png_thumb_full);
++          g_remove(png_thumb_full);
+         }
+         g_free(png_thumb_full);
+       }
+@@ -600,7 +601,7 @@
+       *th_bpp = nchannels;
+ 
+     }
+-    g_free(thumbnail);
++    g_object_unref(thumbnail);
+   }
+ 
+   return (pixbuf);

Reply via email to