r14337 - /desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jan 27 23:05:54 2008
New Revision: 14337

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14337
Log:
Fix the patch so that it actually builds on arm/

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

Modified: 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=14337&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch (original)
+++ desktop/unstable/gnome-games/debian/patches/06_arm_attribute-packed.patch Sun Jan 27 23:05:54 2008
@@ -1,13 +1,13 @@
 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
+--- gnome-games-2.20.3.orig/libgames-support/games-card-common.h	2008-01-08 18:01:17.000000000 +0100
++++ gnome-games-2.20.3/libgames-support/games-card-common.h	2008-01-28 00:05:29.145457717 +0100
 @@ -23,6 +23,12 @@
  #ifndef GAMES_CARD_COMMON
  #define GAMES_CARD_COMMON
  
 +#ifdef __GNUC__
-+#define PACKED __attribute ((packed))
++#define PACKED __attribute__ ((packed))
 +#else
 +#define PACKED
 +#endif
@@ -15,12 +15,14 @@
  /* A card */
  
  /* Black Joker: value = 0, suit = spade or club
-@@ -34,7 +40,7 @@ typedef union {
+@@ -34,8 +40,8 @@
      guint8 face_down : 1;
      guint8 suit : 2;
      guint8 rank : 4;
 -  } attr;
+-} Card;
 +  } PACKED attr;
- } Card;
++} PACKED Card;
  
  typedef int _games_card_size_assert[sizeof (Card) == sizeof (guint8) ? 1 : -1]; /* static assertion */
+