[jhbuild] [3.0] Add patch to fix building gssdp



commit d6bab450b226d664699b7a99b9782d09815de9e8
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Oct 12 00:35:09 2010 -0400

    [3.0] Add patch to fix building gssdp

 modulesets/gnome-external-deps-3.0.modules    |   14 ++++++++++----
 modulesets/gnome-suites-core-deps-3.0.modules |   14 ++++++++++----
 patches/gssdp-0.8.0-fixdso.patch              |   11 +++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index ecfe519..0deff6b 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -35,6 +35,8 @@
     href="http://webkitgtk.org/"/>
 <repository type="tarball" name="ftp.musicbrainz.org"
     href="http://ftp.musicbrainz.org/pub/musicbrainz/"/>
+<repository type="tarball" name="gupnp.org"
+    href="http://www.gupnp.org/sites/all/files/sources"/>
 
   <!-- explicit disabling of qt3 and qt4 can be removed once avahi
        correctly detects what is available. -->
@@ -1112,15 +1114,19 @@
     </dependencies>
   </tarball>
 
-  <tarball id="gssdp" version="0.8.0">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gssdp-0.8.0.tar.gz";
+  <autotools id="gssdp" version="0.8.0">
+    <branch module="gssdp-0.8.0.tar.gz" version="0.8.0"
+	    repo="gupnp.org"
             hash="sha256:c6ca4f084109487255aa847b2b1d27cf29b19aafb85f9d67a9a38f36a9b58506"
-            md5sum="a4cf85650decaec7a12382a8a002bc83" size="368212"/>
+            size="368212">
+      <!-- Build fix for explicit linking  -->
+      <patch file="gssdp-0.8.0-fixdso.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
   <tarball id="gupnp" version="0.14.0" autogenargs="--with-context-manager=network-manager">
     <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-0.14.0.tar.gz";
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 71b6a8b..1e82c50 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -18,6 +18,8 @@
 <!-- tarball repos -->
 <repository type="tarball" name="ftp.gnu.org"
     href="ftp://ftp.gnu.org/pub/gnu/"/>
+<repository type="tarball" name="gupnp.org"
+    href="http://www.gupnp.org/sites/all/files/sources"/>
 <repository type="tarball" name="sqlite.org"
     href="http://www.sqlite.org/"/>
 <repository type="tarball" name="gnome.org"
@@ -337,15 +339,19 @@
     </after>
   </tarball>
 
-  <tarball id="gssdp" version="0.8.0">
-    <source href="http://www.gupnp.org/sites/all/files/sources/gssdp-0.8.0.tar.gz";
+  <autotools id="gssdp" version="0.8.0">
+    <branch module="gssdp-0.8.0.tar.gz" version="0.8.0"
+	    repo="gupnp.org"
             hash="sha256:c6ca4f084109487255aa847b2b1d27cf29b19aafb85f9d67a9a38f36a9b58506"
-            md5sum="a4cf85650decaec7a12382a8a002bc83" size="368212"/>
+            size="368212">
+      <!-- Build fix for explicit linking  -->
+      <patch file="gssdp-0.8.0-fixdso.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
       <dep package="libsoup"/>
     </dependencies>
-  </tarball>
+  </autotools>
 
   <autotools id="gstreamer" autogenargs="-- --disable-tests" supports-non-srcdir-builds="no">
     <branch repo="gstreamer.freedesktop.org" module="gstreamer"/>
diff --git a/patches/gssdp-0.8.0-fixdso.patch b/patches/gssdp-0.8.0-fixdso.patch
new file mode 100644
index 0000000..597e41e
--- /dev/null
+++ b/patches/gssdp-0.8.0-fixdso.patch
@@ -0,0 +1,11 @@
+--- gssdp-0.7.2/tests/Makefile.in.orig	2010-04-09 13:55:16.000000000 +0100
++++ gssdp-0.7.2/tests/Makefile.in	2010-04-09 18:07:19.357276589 +0100
+@@ -129,7 +129,7 @@
+ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lgobject-2.0 -lglib-2.0
+ LIBGSSDP_CFLAGS = @LIBGSSDP_CFLAGS@
+ LIBGSSDP_LIBS = @LIBGSSDP_LIBS@
+ LIBGTK_CFLAGS = @LIBGTK_CFLAGS@



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]