[gtk-osx] Fix pango introspection failure: can't find ApplicationServices.h

[John Ralls <jralls src gnome org>]

commit e110eebca255702c36b49946363236c0095e5d8a
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 18 14:09:53 2014 -0800

    Fix pango introspection failure: can't find ApplicationServices.h

 modulesets-stable/gtk-osx.modules |    3 +-
 patches/pango_gir_cflags.patch    |   39 +++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index bca6431..807fed4 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -114,9 +114,10 @@
     </after>
   </autotools>
 
- <autotools id="pango"  autogen-sh="configure">
+ <autotools id="pango"  autogen-sh="autoreconf">
     <branch version="1.36.0" module="pango/1.36/pango-1.36.0.tar.xz"
             hash="sha256:bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pango_gir_cflags.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="cairo"/>
diff --git a/patches/pango_gir_cflags.patch b/patches/pango_gir_cflags.patch
new file mode 100644
index 0000000..37a990d
--- /dev/null
+++ b/patches/pango_gir_cflags.patch
@@ -0,0 +1,39 @@
+--- pango/Makefile.am  2013-03-04 17:24:38.000000000 -0800
++++ /Users/john/Development/gtk-sources/pango-1.36.0/pango/Makefile.am 2013-10-30 14:16:44.000000000 -0700
+@@ -159,7 +159,8 @@
+ Pango_1_0_gir_EXPORT_PACKAGES = pango
+ Pango_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
+ Pango_1_0_gir_LIBS = libpango-1.0.la
+-Pango_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS)
++Pango_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) ${CPPFLAGS}
++
+ Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(pango_introspection_files))
+ Pango_1_0_gir_SCANNERFLAGS = --c-include "pango/pango.h"
+ 
+@@ -229,7 +230,7 @@
+ PangoFT2_1_0_gir_EXPORT_PACKAGES = pangoft2
+ PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 freetype2-2.0 fontconfig-2.0
+ PangoFT2_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangoft2-1.0.la
+-PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir)
++PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) ${CPPFLAGS}
+ PangoFT2_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include 
"pango/pangoft2.h"
+ PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files)))
+ 
+@@ -280,7 +281,7 @@
+ PangoXft_1_0_gir_EXPORT_PACKAGES = pangoxft
+ PangoXft_1_0_gir_INCLUDES = GObject-2.0 xft-2.0 xlib-2.0
+ PangoXft_1_0_gir_LIBS = $(PangoFT2_1_0_gir_LIBS) libpangoxft-1.0.la
+-PangoXft_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS)
++PangoXft_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) ${CPPFLAGS}
+ PangoXft_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir 
--include-uninstalled=$(builddir)/PangoFT2-1.0.gir --c-include "pango/pangoxft.h"
+ PangoXft_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files)))
+ 
+@@ -370,7 +371,7 @@
+ PangoCairo_1_0_gir_EXPORT_PACKAGES = pangocairo
+ PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
+ PangoCairo_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangocairo-1.0.la
+-PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS)
++PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) ${CPPFLAGS} ${CFLAGS}
+ PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include 
"pango/pangocairo.h"
+ if HAVE_CAIRO_FREETYPE
+ PangoCairo_1_0_gir_SCANNERFLAGS += --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE)