Package: gimp-gap
Version: 2.6.0+dfsg-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Update implicit-pointer-conversion.patch to include another missing
header. Fixes FTBFS on amd64/ia64. (LP: #770934)
* Add broken-comment-delimiter.patch to resolve a misplaced comment
delimiter that broken the build. Fixes FTBFS.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u gimp-gap-2.6.0+dfsg/debian/patches/implicit-pointer-conversion.patch gimp-gap-2.6.0+dfsg/debian/patches/implicit-pointer-conversion.patch
--- gimp-gap-2.6.0+dfsg/debian/patches/implicit-pointer-conversion.patch
+++ gimp-gap-2.6.0+dfsg/debian/patches/implicit-pointer-conversion.patch
@@ -1,6 +1,6 @@
-diff -urpN gimp-gap-2.6.0.orig/gap/gap_story_dialog.h gimp-gap-2.6.0/gap/gap_story_dialog.h
---- gimp-gap-2.6.0.orig/gap/gap_story_dialog.h 2009-06-04 14:38:03.000000000 -0600
-+++ gimp-gap-2.6.0/gap/gap_story_dialog.h 2009-07-10 13:30:35.833743151 -0600
+diff -Nur -x '*.orig' -x '*~' gimp-gap-2.6.0+dfsg//gap/gap_story_dialog.h gimp-gap-2.6.0+dfsg.new//gap/gap_story_dialog.h
+--- gimp-gap-2.6.0+dfsg//gap/gap_story_dialog.h 2009-06-04 16:38:03.000000000 -0400
++++ gimp-gap-2.6.0+dfsg.new//gap/gap_story_dialog.h 2011-08-30 17:07:43.000000000 -0400
@@ -32,6 +32,8 @@
#include "gap_story_main.h"
#include "gap_story_properties.h"
@@ -10,9 +10,9 @@
void gap_storyboard_dialog(GapStbMainGlobalParams *gpp);
void gap_story_dlg_attw_render_all(GapStbAttrWidget *attw);
-diff -urpN gimp-gap-2.6.0.orig/gap/gap_story_properties.c gimp-gap-2.6.0/gap/gap_story_properties.c
---- gimp-gap-2.6.0.orig/gap/gap_story_properties.c 2009-06-04 14:38:03.000000000 -0600
-+++ gimp-gap-2.6.0/gap/gap_story_properties.c 2009-07-10 13:31:59.424583981 -0600
+diff -Nur -x '*.orig' -x '*~' gimp-gap-2.6.0+dfsg//gap/gap_story_properties.c gimp-gap-2.6.0+dfsg.new//gap/gap_story_properties.c
+--- gimp-gap-2.6.0+dfsg//gap/gap_story_properties.c 2009-06-04 16:38:03.000000000 -0400
++++ gimp-gap-2.6.0+dfsg.new//gap/gap_story_properties.c 2011-08-30 17:07:43.000000000 -0400
@@ -55,6 +55,7 @@
#include "gap_timeconv.h"
#include "gap_thumbnail.h"
@@ -21,9 +21,9 @@
#include "gap_story_vthumb.h"
-diff -urpN gimp-gap-2.6.0.orig/libgapvidutil/gap_gve_misc_util.c gimp-gap-2.6.0/libgapvidutil/gap_gve_misc_util.c
---- gimp-gap-2.6.0.orig/libgapvidutil/gap_gve_misc_util.c 2009-06-04 14:38:03.000000000 -0600
-+++ gimp-gap-2.6.0/libgapvidutil/gap_gve_misc_util.c 2009-07-10 13:33:22.379426254 -0600
+diff -Nur -x '*.orig' -x '*~' gimp-gap-2.6.0+dfsg//libgapvidutil/gap_gve_misc_util.c gimp-gap-2.6.0+dfsg.new//libgapvidutil/gap_gve_misc_util.c
+--- gimp-gap-2.6.0+dfsg//libgapvidutil/gap_gve_misc_util.c 2009-06-04 16:38:03.000000000 -0400
++++ gimp-gap-2.6.0+dfsg.new//libgapvidutil/gap_gve_misc_util.c 2011-08-30 17:07:43.000000000 -0400
@@ -34,6 +34,7 @@
#include <sys/stat.h>
#include <errno.h>
@@ -34,0 +35,11 @@
+diff -Nur -x '*.orig' -x '*~' gimp-gap-2.6.0+dfsg//vid_enc_avi/gap_enc_avi_main.c gimp-gap-2.6.0+dfsg.new//vid_enc_avi/gap_enc_avi_main.c
+--- gimp-gap-2.6.0+dfsg//vid_enc_avi/gap_enc_avi_main.c 2009-06-04 16:38:03.000000000 -0400
++++ gimp-gap-2.6.0+dfsg.new//vid_enc_avi/gap_enc_avi_main.c 2011-08-30 17:09:07.000000000 -0400
+@@ -57,6 +57,7 @@
+
+ #include "gap_gve_story.h" /* for STORYBOARD support */
+
++#include "gap_gve_png.h"
+ #include "gap_gve_jpeg.h" /* for the builtin JPEG support */
+ #include "gap_gve_raw.h" /* for raw CODEC support */
+ #include "gap_gve_xvid.h" /* for XVID CODEC support */
only in patch2:
unchanged:
--- gimp-gap-2.6.0+dfsg.orig/debian/patches/broken-comment-delimiter.patch
+++ gimp-gap-2.6.0+dfsg/debian/patches/broken-comment-delimiter.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gimp-gap-2.6.0+dfsg//libgapvidutil/gap_gve_png.h gimp-gap-2.6.0+dfsg.new//libgapvidutil/gap_gve_png.h
+--- gimp-gap-2.6.0+dfsg//libgapvidutil/gap_gve_png.h 2009-06-04 16:38:03.000000000 -0400
++++ gimp-gap-2.6.0+dfsg.new//libgapvidutil/gap_gve_png.h 2011-08-30 17:26:26.000000000 -0400
+@@ -23,7 +23,7 @@
+ app0_length: the length of the APP0-marker.
+ out:PNG_size: The size of the buffer that is returned.
+ returns: guchar *: A buffer, allocated by this routines, which contains
+- the compressed PNG, NULL on error. */
++ the compressed PNG, NULL on error.
+ */
+
+ guchar *gap_gve_png_drawable_encode_png(GimpDrawable *drawable, gint32 png_interlaced, gint32 *PNG_size,
