r31987 - in /desktop/unstable/gobject-introspection/debian: changelog patches/fix-alignment patches/series rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Dec  8 12:28:20 2011
New Revision: 31987

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31987
Log:
Fix invalid alignment assumptions. (Closes: #604603)

Added:
    desktop/unstable/gobject-introspection/debian/patches/fix-alignment
Modified:
    desktop/unstable/gobject-introspection/debian/changelog
    desktop/unstable/gobject-introspection/debian/patches/series
    desktop/unstable/gobject-introspection/debian/rules

Modified: desktop/unstable/gobject-introspection/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/changelog?rev=31987&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/changelog [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/changelog [utf-8] Thu Dec  8 12:28:20 2011
@@ -14,6 +14,9 @@
   * Add 00git_link_order.patch: scanner: Put the -l library names after the
     .o, to fix FTBFS with cmake projects. Patch backported from upstream git
     head. (LP: #897816)
+
+  [ Thorsten Glaser ]
+  * Fix invalid alignment assumptions. (Closes: #604603)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sun, 20 Nov 2011 15:54:11 +0000
 

Added: desktop/unstable/gobject-introspection/debian/patches/fix-alignment
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/fix-alignment?rev=31987&op=file
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/fix-alignment (added)
+++ desktop/unstable/gobject-introspection/debian/patches/fix-alignment [utf-8] Thu Dec  8 12:28:20 2011
@@ -1,0 +1,41 @@
+Description: Fix invalid alignment assumptions
+ The current source has invalid assumptions about structure alignment
+ that break on m68k because 32-bit quantities require only 16-bit
+ alignment there. Fix this by introducing explicit structure padding
+ to make the binary representation generated by the compiler match
+ the text of the specification exactly.
+Author: Thorsten Glaser <tg at mirbsd.de>
+Bug-Debian: http://bugs.debian.org/604603
+Origin: Andreas Schwab <schwab at linux-m68k.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=661839
+
+--- gobject-introspection-0.10.8.orig/girepository/gitypelib-internal.h
++++ gobject-introspection-0.10.8/girepository/gitypelib-internal.h
+@@ -282,7 +282,7 @@ typedef struct {
+   guint32 sections;
+ 
+   /* <private> */
+-  guint16 padding[5];
++  guint16 padding[6];
+ } Header;
+ 
+ typedef enum {
+@@ -431,6 +431,9 @@ typedef struct {
+   /* <public> */
+   gint8        closure;
+   gint8        destroy;
++  /* <private> */
++  guint16      padding;
++  /* <public> */
+ 
+   SimpleTypeBlob arg_type;
+ } ArgBlob;
+@@ -1061,6 +1064,8 @@ typedef struct {
+   guint16 n_vfuncs;
+   guint16 n_constants;
+ 
++  guint16 padding;
++
+   guint32 reserved2;
+   guint32 reserved3;
+ 

Modified: desktop/unstable/gobject-introspection/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/patches/series?rev=31987&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/patches/series [utf-8] Thu Dec  8 12:28:20 2011
@@ -1,1 +1,2 @@
 00git_link_order.patch
+fix-alignment

Modified: desktop/unstable/gobject-introspection/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gobject-introspection/debian/rules?rev=31987&op=diff
==============================================================================
--- desktop/unstable/gobject-introspection/debian/rules [utf-8] (original)
+++ desktop/unstable/gobject-introspection/debian/rules [utf-8] Thu Dec  8 12:28:20 2011
@@ -31,3 +31,5 @@
 	rm -rf $(CURDIR)/.cache
 	rm -f debian/dh_girepository.1
 	find . -name '*.pyc' -delete
+	# generated file not removed by make clean
+	rm -f giscanner/scannerlexer.c