r14336 - in /desktop/unstable/gnome-games/debian: changelog patches/06_arm_attribute-packed.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jan 27 12:09:33 2008
New Revision: 14336

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14336
Log:
* 06_arm_attribute-packed.patch: use __attribute((packed)) to define 
  the structure, to avoid the FTBFS on arm.

Added:
    desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch
Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/patches/series

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=14336&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog (original)
+++ desktop/unstable/gnome-games/debian/changelog Sun Jan 27 12:09:33 2008
@@ -1,3 +1,10 @@
+gnome-games (1:2.20.3-2) UNRELEASED; urgency=low
+
+  * 06_arm_attribute-packed.patch: use __attribute((packed)) to define 
+    the structure, to avoid the FTBFS on arm.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 27 Jan 2008 12:15:40 +0100
+
 gnome-games (1:2.20.3-1) unstable; urgency=low
 
   * New upstream translation and bugfix release.

Added: desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch?rev=14336&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch (added)
+++ desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch Sun Jan 27 12:09:33 2008
@@ -1,0 +1,26 @@
+Index: gnome-games-2.20.3/libgames-support/games-card-common.h
+===================================================================
+--- gnome-games-2.20.3.orig/libgames-support/games-card-common.h	2008-01-27 12:07:13.077578185 +0100
++++ gnome-games-2.20.3/libgames-support/games-card-common.h	2008-01-27 12:13:03.969574380 +0100
+@@ -23,6 +23,12 @@
+ #ifndef GAMES_CARD_COMMON
+ #define GAMES_CARD_COMMON
+ 
++#ifdef __GNUC__
++#define PACKED __attribute ((packed))
++#else
++#define PACKED
++#endif
++
+ /* A card */
+ 
+ /* Black Joker: value = 0, suit = spade or club
+@@ -34,7 +40,7 @@ typedef union {
+     guint8 face_down : 1;
+     guint8 suit : 2;
+     guint8 rank : 4;
+-  } attr;
++  } PACKED attr;
+ } Card;
+ 
+ typedef int _games_card_size_assert[sizeof (Card) == sizeof (guint8) ? 1 : -1]; /* static assertion */

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=14336&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series (original)
+++ desktop/unstable/gnome-games/debian/patches/series Sun Jan 27 12:09:33 2008
@@ -3,4 +3,5 @@
 03_dont_build_ggz.patch
 04_servers_usr_games.patch
 05_maintainer_mode.patch
+06_arm_attribute-packed.patch
 99_reautoconf.patch