[jhbuild] [3.0] Patch gupnp-av-0.7.1 so it builds successfully

[Craig Keogh <cskeogh src gnome org>]

commit 031b08a06dd4412c2e15fb017329919d155d19c7
Author: Craig Keogh <cskeogh adam com au>
Date:   Thu Jan 13 20:51:57 2011 +1030

    [3.0] Patch gupnp-av-0.7.1 so it builds successfully
    
    Build failure was:
    /usr/bin/ld: test-search-criteria-parser.o: undefined reference to
    symbol 'g_signal_connect_data'

 modulesets/gnome-suites-core-deps-3.0.modules |   13 +++++++++----
 patches/gupnp-av-0.7.1-link.patch             |   12 ++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 7a6ebe1..0daf2e8 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -550,10 +550,15 @@
     </suggests>
   </tarball>
 
-  <tarball id="gupnp-av" version="0.7.1">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-av-0.7.1.tar.gz";
+  <autotools id="gupnp-av">
+    <branch module="gupnp-av-0.7.1.tar.gz" version="0.7.1" repo="gupnp.org"
             hash="sha256:70a23a7dd1e33b08e87a2f005bd8e1aa4e231524dd41b6a8eff9dc03112e6f19"
-            size="410605"/>
+            size="410605">
+      <!-- patch fixes following build failure:
+           ld: test-search-criteria-parser.o: undefined reference to symbol 'g_signal_connect_data'
+        -->
+      <patch file="gupnp-av-0.7.1-link.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="gupnp"/>
@@ -561,7 +566,7 @@
     <suggests>
       <dep package="gobject-introspection"/>
     </suggests>
-  </tarball>
+  </autotools>
 
   <tarball id="gupnp-dlna" version="0.4.2">
     <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-dlna-0.4.2.tar.gz";
diff --git a/patches/gupnp-av-0.7.1-link.patch b/patches/gupnp-av-0.7.1-link.patch
new file mode 100644
index 0000000..b710633
--- /dev/null
+++ b/patches/gupnp-av-0.7.1-link.patch
@@ -0,0 +1,12 @@
+# Fixes:
+# /usr/bin/ld: test-search-criteria-parser.o: undefined reference to symbol 'g_signal_connect_data'
+diff -urN gupnp-av-0.7.1.orig/tests/Makefile.am gupnp-av-0.7.1/tests/Makefile.am
+--- gupnp-av-0.7.1.orig/tests/Makefile.am	2010-07-21 00:50:06.000000000 +0930
++++ gupnp-av-0.7.1/tests/Makefile.am	2011-01-13 20:39:13.315829003 +1030
+@@ -1,5 +1,5 @@
+ AM_CFLAGS = $(LIBGUPNP_CFLAGS) -I$(top_srcdir)
+-AM_LDFLAGS = $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la
++AM_LDFLAGS = $(LIBGUPNP_LIBS) $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la
+ 
+ noinst_PROGRAMS = test-search-criteria-parser
+ test_search_criteria_parser_SOURCES = test-search-criteria-parser.c