[gtk-osx] Add patch to fix building Guile 2.0 for i386 with Xcode 5.1 and later.

[John Ralls <jralls src gnome org>]

commit aff694a12d386a24b3733ecbf2f337506905f339
Author: John Ralls <jralls ceridwen us>
Date:   Fri Sep 19 16:03:55 2014 -0700

    Add patch to fix building Guile 2.0 for i386 with Xcode 5.1 and later.

 modulesets-stable/gtk-osx-random.modules |    8 +++--
 patches/guile20-align-fix.patch          |   44 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 33dcfd1..3611f03 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -270,9 +270,9 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="shared-mime-info"  autogen-sh="configure"
              supports-non-srcdir-builds="no" >
-    <branch module="shared-mime-info-1.2.tar.xz" version="1.2"
+    <branch module="shared-mime-info-1.3.tar.xz" version="1.3"
             repo="hadess">
-      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-70255-Build-fails-with-glib-2.38.patch"; 
strip="1"/>
+      <!--patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-70255-Build-fails-with-glib-2.38.patch"; 
strip="1"/-->
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -416,7 +416,9 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="guile2" autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="guile/guile-2.0.11.tar.gz"
-           version="2.0.11"/>
+           version="2.0.11">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/guile20-align-fix.patch"; strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="gmp"/>
diff --git a/patches/guile20-align-fix.patch b/patches/guile20-align-fix.patch
new file mode 100644
index 0000000..6cc1e17
--- /dev/null
+++ b/patches/guile20-align-fix.patch
@@ -0,0 +1,44 @@
+diff --git a/libguile/foreign.c b/libguile/foreign.c
+index 01af900..59f5e72 100644
+--- a/libguile/foreign.c
++++ b/libguile/foreign.c
+@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "pointer->procedure", 3, 0, 0,
+ 
+ static const struct
+ {
+-  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
++  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
+   const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8
+                                 + sizeof (struct scm_objcode) + 32)];
+ } raw_bytecode = {
+@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int nargs)
+ 
+ static const struct
+ {
+-  scm_t_uint64 dummy; /* alignment */
++  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
+   scm_t_cell cells[10 * 2]; /* 10 double cells */
+ } objcode_cells = {
+   0,
+diff --git a/libguile/gsubr.c b/libguile/gsubr.c
+index b6f261f..38b7ce1 100644
+--- a/libguile/gsubr.c
++++ b/libguile/gsubr.c
+@@ -213,7 +213,7 @@
+ */
+ static const struct
+ {
+-  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
++  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
+   const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16
+                                  + sizeof (struct scm_objcode) + 32)];
+ } raw_bytecode = {
+@@ -317,7 +317,7 @@ static const struct
+ 
+ static const struct
+ {
+-  scm_t_uint64 dummy; /* alignment */
++  SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
+   scm_t_cell cells[121 * 2]; /* 11*11 double cells */
+ } objcode_cells = {
+   0,