Bug#604603: gobject-introspection: FTBFS on m68k: size checks fail

[Thorsten Glaser]

tags 604603 + patch
thanks

Andreas’ patch helped.

Debdiff to fix this attached.

//mirabilos
-- 
20:54⎜<SvenG:#grml> dmaphy: remember: "In theory there's no difference
     ⎜     between theory and practice, but in practice..."
-------------- next part --------------
diff -Nru gobject-introspection-0.6.14/debian/changelog gobject-introspection-0.6.14/debian/changelog
--- gobject-introspection-0.6.14/debian/changelog	2010-06-07 07:46:32.000000000 +0000
+++ gobject-introspection-0.6.14/debian/changelog	2010-11-24 09:47:58.000000000 +0000
@@ -1,3 +1,9 @@
+gobject-introspection (0.6.14-1+m68k.1) unreleased; urgency=low
+
+  * Add padding to avoid bogus alignment assumptions (Closes: #604603)
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 24 Nov 2010 09:46:57 +0000
+
 gobject-introspection (0.6.14-1) unstable; urgency=low
 
   * New upstream release
diff -Nru gobject-introspection-0.6.14/debian/patches/debian-changes-0.6.14-1+m68k.1 gobject-introspection-0.6.14/debian/patches/debian-changes-0.6.14-1+m68k.1
--- gobject-introspection-0.6.14/debian/patches/debian-changes-0.6.14-1+m68k.1	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-0.6.14/debian/patches/debian-changes-0.6.14-1+m68k.1	2010-11-24 10:31:35.000000000 +0000
@@ -0,0 +1,55 @@
+Description: Upstream changes introduced in version 0.6.14-1+m68k.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ gobject-introspection (0.6.14-1+m68k.1) unreleased; urgency=low
+ .
+   * Add padding to avoid bogus alignment assumptions (Closes: #604603)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Thorsten Glaser <tg at mirbsd.de>
+Bug-Debian: http://bugs.debian.org/604603
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gobject-introspection-0.6.14.orig/girepository/gitypelib-internal.h
++++ gobject-introspection-0.6.14/girepository/gitypelib-internal.h
+@@ -273,7 +273,7 @@ typedef struct {
+   guint16 union_blob_size;
+ 
+   /* <private> */
+-  guint16 padding[7];
++  guint16 padding[8];
+ } Header;
+ 
+ /**
+@@ -401,6 +401,8 @@ typedef struct {
+   gint8        closure;
+   gint8        destroy;
+ 
++  guint16        padding;
++
+   SimpleTypeBlob arg_type;
+ } ArgBlob;
+ 
+@@ -1004,6 +1006,8 @@ typedef struct {
+   guint16 n_vfuncs;
+   guint16 n_constants;
+ 
++  guint16 padding;
++
+   guint32 reserved2;
+   guint32 reserved3;
+ 
diff -Nru gobject-introspection-0.6.14/debian/patches/series gobject-introspection-0.6.14/debian/patches/series
--- gobject-introspection-0.6.14/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-0.6.14/debian/patches/series	2010-11-24 09:58:51.000000000 +0000
@@ -0,0 +1 @@
+debian-changes-0.6.14-1+m68k.1