Add patches to fix bug #148131

(Portage version: 2.1.2_pre3-r1)

4 files changed, 90 insertions, 2 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 21370fdb8399..d8a080a9c7a7 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.134 2006/10/16 00:01:22 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.135 2006/10/16 06:41:54 compnerd Exp $
+
+  16 Oct 2006; <compnerd@gentoo.org>
+  +files/01_build_mozilla_plugin_with_firefox_xpcom.patch,
+  +files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch,
+  totem-2.16.2-r1.ebuild:
+  Add patches from ubuntu for bug #148131
 
 *totem-2.16.2-r1 (16 Oct 2006)
 
diff --git a/media-video/totem/files/01_build_mozilla_plugin_with_firefox_xpcom.patch b/media-video/totem/files/01_build_mozilla_plugin_with_firefox_xpcom.patch
new file mode 100644
index 000000000000..5094ac3bd717
--- /dev/null
+++ b/media-video/totem/files/01_build_mozilla_plugin_with_firefox_xpcom.patch
@@ -0,0 +1,38 @@
+--- totem-1.5.91/browser-plugin/Makefile.in	2006-08-13 00:33:17.000000000 +0200
++++ totem-1.5.91/browser-plugin/Makefile.in	2006-08-14 23:09:53.000000000 +0200
+@@ -434,7 +434,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs firefox-xpcom`
+ 
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LDFLAGS = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	-avoid-version	\
+@@ -483,7 +483,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs firefox-xpcom`
+ 
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LDFLAGS = \
+ @ENABLE_GMP_PLUGIN_TRUE@	-avoid-version	\
+@@ -532,7 +532,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs firefox-xpcom`
+ 
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LDFLAGS = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	-avoid-version	\
+@@ -581,7 +581,7 @@
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs firefox-xpcom`
+ 
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LDFLAGS = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	-avoid-version	\
diff --git a/media-video/totem/files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch b/media-video/totem/files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch
new file mode 100644
index 000000000000..1ba9d24f4689
--- /dev/null
+++ b/media-video/totem/files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch
@@ -0,0 +1,38 @@
+--- totem-1.5.91/browser-plugin/Makefile.in	2006-08-13 00:33:17.000000000 +0200
++++ totem-1.5.91/browser-plugin/Makefile.in	2006-08-14 23:09:53.000000000 +0200
+@@ -434,7 +434,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs seamonkey-xpcom`
+ 
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LDFLAGS = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	-avoid-version	\
+@@ -483,7 +483,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs seamonkey-xpcom`
+ 
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LDFLAGS = \
+ @ENABLE_GMP_PLUGIN_TRUE@	-avoid-version	\
+@@ -532,7 +532,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs seamonkey-xpcom`
+ 
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LDFLAGS = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	-avoid-version	\
+@@ -581,7 +581,7 @@
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la	\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS) `pkg-config --libs seamonkey-xpcom`
+ 
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LDFLAGS = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	-avoid-version	\
diff --git a/media-video/totem/totem-2.16.2-r1.ebuild b/media-video/totem/totem-2.16.2-r1.ebuild
index 82dca42e3a37..fe524565f374 100644
--- a/media-video/totem/totem-2.16.2-r1.ebuild
+++ b/media-video/totem/totem-2.16.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.16.2-r1.ebuild,v 1.1 2006/10/16 00:01:22 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.16.2-r1.ebuild,v 1.2 2006/10/16 06:41:54 compnerd Exp $
 
 inherit autotools eutils multilib gnome2
 
@@ -129,6 +129,12 @@ src_unpack() {
 	# fixes for ff compiles.
 	if use nsplugin && ( use firefox || use sparc ); then
 		epatch ${FILESDIR}/${PN}-1.5.91-mozilla-firefox-include-fix.patch
+
+		# Patch borrowed from ubuntu (link xpcom)
+		epatch ${FILESDIR}/01_build_mozilla_plugin_with_firefox_xpcom.patch
+	elif use nsplugin ; then
+		# Patch borrowed from ubuntu (link xpcom)
+		epatch ${FILESDIR}/01_build_mozilla_plugin_with_seamonkey_xpcom.patch
 	fi
 }