[gtk-osx] Patch GLib so that on x86_64 builds gint64 and int64_t are the same type.

[John Ralls <jralls src gnome org>]

commit a7be162645f1a0a30bce707c5dbfedad010aa569
Author: John Ralls <jralls ceridwen us>
Date:   Fri Oct 21 15:57:07 2016 -0700

    Patch GLib so that on x86_64 builds gint64 and int64_t are the same type.

 modulesets-stable/gtk-osx.modules   |    1 +
 patches/glib-gint64-long-long.patch |   84 +++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 0 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index d28b487..1c1615e 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -83,6 +83,7 @@
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-724590-GSlice-slab_stack-corruption.patch"; 
strip="1"/>
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gio-in-reserved-in-gcc-48.patch"; 
strip="1"/>
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch";
 strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/glib-gint64-long-long.patch"; 
strip="1"/>
     </branch>
     <dependencies>
         <dep package="libffi"/>
diff --git a/patches/glib-gint64-long-long.patch b/patches/glib-gint64-long-long.patch
new file mode 100644
index 0000000..2443e58
--- /dev/null
+++ b/patches/glib-gint64-long-long.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.ac~ b/configure.ac
+index 05057e9..6ae550b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2954,13 +2954,26 @@ $ac_cv_sizeof_int)
+   guint64_constant='(val)'
+   ;;
+ $ac_cv_sizeof_long)
+-  gint64=long
+-  gint64_modifier='"l"'
+-  gint64_format='"li"'
+-  guint64_format='"lu"'
+-  glib_extension=
+-  gint64_constant='(val##L)'
+-  guint64_constant='(val##UL)'
++  case $host in
++  *-*-darwin*)
++    gint64='long long'
++    gint64_modifier='"ll"'
++    gint64_format='"lli"'
++    guint64_format='"llu"'
++    glib_extension=
++    gint64_constant='(val##LL)'
++    guint64_constant='(val##ULL)'
++    ;;
++  *)
++    gint64=long
++    gint64_modifier='"l"'
++    gint64_format='"li"'
++    guint64_format='"lu"'
++    glib_extension=
++    gint64_constant='(val##L)'
++    guint64_constant='(val##UL)'
++    ;;
++  esac
+   ;;
+ $ac_cv_sizeof_long_long)
+   gint64='long long'
+@@ -3053,12 +3066,23 @@ $ac_cv_sizeof_int)
+   glib_gpui_cast='(guint)'
+   ;;
+ $ac_cv_sizeof_long)
+-  glib_intptr_type_define=long
+-  gintptr_modifier='"l"'
+-  gintptr_format='"li"'
+-  guintptr_format='"lu"'
+-  glib_gpi_cast='(glong)'
+-  glib_gpui_cast='(gulong)'
++  case $host in *-*-darwin*)
++    glib_intptr_type_define='long long'
++    gintptr_modifier='"I64"'
++    gintptr_format='"I64i"'
++    guintptr_format='"I64u"'
++    glib_gpi_cast='(gint64)'
++    glib_gpui_cast='(guint64)'
++    ;;
++  *)
++    glib_intptr_type_define=long
++    gintptr_modifier='"l"'
++    gintptr_format='"li"'
++    guintptr_format='"lu"'
++    glib_gpi_cast='(glong)'
++    glib_gpui_cast='(gulong)'
++    ;;
++  esac
+   ;;
+ $ac_cv_sizeof_long_long)
+   glib_intptr_type_define='long long'
+@@ -3193,7 +3217,14 @@ $ac_cv_sizeof_int)
+   gint64=int
+   ;;
+ $ac_cv_sizeof_long)
+-  gint64=long
++  case $host in
++  *-*-darwin*)
++    gint64='long long'
++    ;;
++  *)
++    gint64=long
++    ;;
++  esac
+   ;;
+ $ac_cv_sizeof_long_long)
+   gint64='long long'