[gtk-osx] Bug 700181 - jhbuild failure building gtkspell3

[John Ralls <jralls src gnome org>]

commit 796ec9534114f386924e7aa1fba07308d8563c0d
Author: John Ralls <jralls ceridwen us>
Date:   Mon May 13 15:16:32 2013 -0700

    Bug 700181 - jhbuild failure building gtkspell3
    
    Patch defective Makefile.am.
    Upstream is http://sourceforge.net/p/gtkspell/bugs/18/

 jhbuildrc-gtk-osx                          |    3 ++-
 modulesets-stable/gtk-osx-random.modules   |    6 ++++--
 modulesets-unstable/gtk-osx-random.modules |    4 +++-
 modulesets/gtk-osx-random.modules          |    4 +++-
 patches/gtkspell-bug-18-Makefile.am.patch  |   25 +++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 7bd3a5e..fee47e6 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -634,7 +634,8 @@ if not os.path.exists(_pfx_cat_file):
     os.makedirs(os.path.dirname(_pfx_cat_file))
     open(_pfx_cat_file, "w").close()
 if 'XML_CATALOG_FILES' in os.environ:
-    os.environ['XML_CATALOG_FILES'] += ':' + _pfx_cat_file
+#    os.environ['XML_CATALOG_FILES'] += ':' + _pfx_cat_file
+    pass
 else:
     os.environ['XML_CATALOG_FILES'] = _pfx_cat_file
 
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index c60142d..e0de13e 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -353,9 +353,11 @@ Libglade itself is deprecated. This is the last release. -->
     </dependencies>
   </autotools>
 
-  <autotools id="gtkspell3" autogen-sh="configure">
+  <autotools id="gtkspell3" autogen-sh="autoreconf">
     <branch module="gtkspell/gtkspell3-3.0.0.tar.gz" repo="sourceforge"
-           version="3.0.0"/>
+           version="3.0.0">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtkspell-bug-18-Makefile.am.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="enchant"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index c51d190..a9e73c2 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -256,7 +256,9 @@
      tarball to avoid the dependency. -->
   <autotools id="gtkspell3" autogen-sh="configure">
     <branch module="gtkspell/gtkspell3-3.0.0.tar.gz" repo="sourceforge"
-           version="3.0.0"/>
+           version="3.0.0">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtkspell-bug-18-Makefile.am.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="enchant"/>
     </dependencies>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 9cf936c..fcb0a72 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -299,7 +299,9 @@
      tarball to avoid the dependency. -->
   <autotools id="gtkspell3" autogen-sh="configure">
     <branch module="gtkspell/gtkspell3-3.0.0.tar.gz" repo="sourceforge"
-           version="3.0.0"/>
+           version="3.0.0">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtkspell-bug-18-Makefile.am.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="enchant"/>
     </dependencies>
diff --git a/patches/gtkspell-bug-18-Makefile.am.patch b/patches/gtkspell-bug-18-Makefile.am.patch
new file mode 100644
index 0000000..04dfaad
--- /dev/null
+++ b/patches/gtkspell-bug-18-Makefile.am.patch
@@ -0,0 +1,25 @@
+*** a/gtkspell/Makefile.am     Wed Oct 31 15:23:44 2012
+--- b/gtkspell/Makefile.am     Mon May 13 14:51:15 2013
+***************
+*** 6,29 ****
+  
+  if ENABLE_GTK3
+  lib_LTLIBRARIES += libgtkspell3-3.la
+! libgtkspell3_3_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL3_CFLAGS@
+  libgtkspell3_3_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+  libgtkspell3_3_la_include_HEADERS = gtkspell.h
+  
+  libgtkspell3_3_la_SOURCES = gtkspell.c gtkspell.h
+! libgtkspell3_3_la_LIBADD = @GTK_SPELL3_LIBS@
+  
+  pkgconfig_DATA += gtkspell3-3.0.pc
+  endif
+  
+  if ENABLE_GTK2
+  lib_LTLIBRARIES += libgtkspell3-2.la
+! libgtkspell3_2_la_CPPFLAGS = -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" @GTK_SPELL2_CFLAGS@
+  libgtkspell3_2_la_includedir=$(includedir)/gtkspell-3.0/gtkspell
+  libgtkspell3_2_la_include_HEADERS = gtkspell.h
+  
+  libgtkspell3_2_la_SOURCES = gtkspell.c gtkspell.h
+! libgtkspell3_2_la_LIBADD = @GTK_SPELL2_LIBS@