[gtk-osx] Fix configure and compilation errors when building liboil

[John Ralls <jralls src gnome org>]

commit b1e17a4e91dadc687f67a8749bc4cecdf0f3c92f
Author: Mario Sanchez Prada <mario mariospr org>
Date:   Fri May 30 23:12:28 2014 +0100

    Fix configure and compilation errors when building liboil
    
    Use AC_CONFIG_HEADERS macro (instead of AM_CONFIG_HEADER) to allow
    configuring, and add -fheinous-gnu-extensions to CFLAGS to avoid
    getting a compilation error in amd64/wavelet.c when using Xcode 5.

 jhbuildrc-gtk-osx                                |    1 +
 modulesets-stable/gtk-osx-gstreamer.modules      |    4 +++-
 modulesets-unstable/gtk-osx-gstreamer.modules    |    4 +++-
 modulesets/gtk-osx-gstreamer.modules             |    4 +++-
 patches/liboil-use-ac-config-headers-macro.patch |   11 +++++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 00c5767..52cbd3f 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -382,6 +382,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
     if xcodeversion >= 5.0:
         module_extra_env["pkg-config"] = {'CFLAGS': os.environ['CFLAGS'] + ' -std=gnu89'}
         append_autogenargs('libgcrypt', 'CFLAGS="$CFLAGS -fheinous-gnu-extensions"')
+        module_makeargs['liboil'] = 'CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE -fheinous-gnu-extensions"'
         module_extra_env["WebKit"] = {'CXXFLAGS':os.environ['CXXFLAGS'] +
                                   ' -stdlib=libstdc++'}
         append_autogenargs('babl', '--disable-sse')
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 9e4ba08..2bf643e 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -13,7 +13,9 @@
 
   <autotools id="liboil" autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix 
%(prefix)s --libdir %(libdir)s %(autogenargs)s"
             makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
-    <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17" />
+    <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="liborc" autogen-sh="configure">
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 4868a96..41969e1 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -17,7 +17,9 @@
        are unversioned and haven't been tested for gtk-osx
        compatibility, but there are more of them. -->
   <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
-    <branch repo="liboil"  />
+    <branch repo="liboil">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="faad2" autogen-sh="autoreconf"
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index d35a678..142773e 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -17,7 +17,9 @@
        are unversioned and haven't been tested for gtk-osx
        compatibility. -->
   <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
-    <branch repo="liboil" tag="liboil-0.3.17" />
+    <branch repo="liboil" tag="liboil-0.3.17">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="faad2" autogen-sh="autoreconf"
diff --git a/patches/liboil-use-ac-config-headers-macro.patch 
b/patches/liboil-use-ac-config-headers-macro.patch
new file mode 100644
index 0000000..2eaceac
--- /dev/null
+++ b/patches/liboil-use-ac-config-headers-macro.patch
@@ -0,0 +1,11 @@
+--- liboil-0.3.17/configure.ac 2014-05-30 22:45:18.000000000 +0100
++++ liboil-0.3.17/configure.ac 2014-05-30 22:45:33.000000000 +0100
+@@ -11,7 +11,7 @@
+ #LIBOIL_MAJORMINOR=0.3
+ #AC_SUBST(LIBOIL_MAJORMINOR)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl CURRENT, REVISION, AGE
+ dnl - library source changed -> increment REVISION