Add patches to fix bug #148131

Package-Manager: portage-2.1.2_pre3-r1

5 files changed, 106 insertions, 10 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/Manifest b/media-video/totem/Manifest
index 33ddf5ba6d85..b474fe087790 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,3 +1,11 @@
+AUX 01_build_mozilla_plugin_with_firefox_xpcom.patch 1994 RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 SHA1 a637293d27af9c3a1c7044aa15813b1637c1e269 SHA256 d198c31c00563798468abfa7d6de8329d208bb71c830599176ba355649a9c24b
+MD5 6c254a486d447e680d77048262dfe78d files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
+RMD160 a77cbdf94118eea56a9fdec60470d816da621b50 files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
+SHA256 d198c31c00563798468abfa7d6de8329d208bb71c830599176ba355649a9c24b files/01_build_mozilla_plugin_with_firefox_xpcom.patch 1994
+AUX 01_build_mozilla_plugin_with_seamonkey_xpcom.patch 2002 RMD160 26b4163c2dd33b54b058a7db74bd5725a8b37f6f SHA1 32916329fd6fb13ef0d2f612718ecf2d729f5bc8 SHA256 e6cf8c885e4d1cfaeb85881e775fe6a0bba2215b41f9803fc6351ef93d7020ac
+MD5 e50c45e65bf340c6b5c1d33603973e26 files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch 2002
+RMD160 26b4163c2dd33b54b058a7db74bd5725a8b37f6f files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch 2002
+SHA256 e6cf8c885e4d1cfaeb85881e775fe6a0bba2215b41f9803fc6351ef93d7020ac files/01_build_mozilla_plugin_with_seamonkey_xpcom.patch 2002
 AUX totem-1.4.0-autoconf.patch 2036 RMD160 f03f4e9d8735d2eb523c25cc10b723e7e1e2a7ae SHA1 319a87988a5207f0629451cabb93819ae02e73fb SHA256 0ada884643736d1d8a879c73e543b35b11a43fcf96dadf182ab1091f3b5fa553
 MD5 d0d8862e549632d8d96cc4de0e6bd952 files/totem-1.4.0-autoconf.patch 2036
 RMD160 f03f4e9d8735d2eb523c25cc10b723e7e1e2a7ae files/totem-1.4.0-autoconf.patch 2036
@@ -30,18 +38,18 @@ EBUILD totem-2.16.1.ebuild 4180 RMD160 1000e8d93994f1db360602846c359fcb5ffef76a
 MD5 ed1fe3ef47a55b7543722c6f39c2fdf4 totem-2.16.1.ebuild 4180
 RMD160 1000e8d93994f1db360602846c359fcb5ffef76a totem-2.16.1.ebuild 4180
 SHA256 a0d0de36fe5ab2d7244b025601240d788bede07d3b2721acdc284e959cc28bac totem-2.16.1.ebuild 4180
-EBUILD totem-2.16.2-r1.ebuild 4249 RMD160 2e2aa9d0223fa62093e01fc39b1b8e56b9be2950 SHA1 0641484e25ffa6087045ca130aedc4a54319c7c8 SHA256 4a0ee688d3e8f794d2e828b08787b7cd469113badfef4f549354f79ad33e14a1
-MD5 86228b19dc4b6bacbc8b015ad5f56545 totem-2.16.2-r1.ebuild 4249
-RMD160 2e2aa9d0223fa62093e01fc39b1b8e56b9be2950 totem-2.16.2-r1.ebuild 4249
-SHA256 4a0ee688d3e8f794d2e828b08787b7cd469113badfef4f549354f79ad33e14a1 totem-2.16.2-r1.ebuild 4249
+EBUILD totem-2.16.2-r1.ebuild 4506 RMD160 5ee8382058bb2edb336452888daf7f4baabebb38 SHA1 781272a4afff31d5e9be62e36e8fe0b22bde707c SHA256 c469d47bc064a3e92ef191a922ee042350d9bc4f1da9e6336270e005e58ace97
+MD5 74b3fa4149f1c88b9019565c01d07920 totem-2.16.2-r1.ebuild 4506
+RMD160 5ee8382058bb2edb336452888daf7f4baabebb38 totem-2.16.2-r1.ebuild 4506
+SHA256 c469d47bc064a3e92ef191a922ee042350d9bc4f1da9e6336270e005e58ace97 totem-2.16.2-r1.ebuild 4506
 EBUILD totem-2.16.2.ebuild 4226 RMD160 c42477b1ec7d52b2bd40232332f41fed9b29f0f9 SHA1 15207e7d164c87672b5cda05519087395e8be14d SHA256 9b66cc31b87ec97370be4505df9cb9673d068396889b12e8d178495017b413f3
 MD5 1dd07330704b36dcc24fc6168d860425 totem-2.16.2.ebuild 4226
 RMD160 c42477b1ec7d52b2bd40232332f41fed9b29f0f9 totem-2.16.2.ebuild 4226
 SHA256 9b66cc31b87ec97370be4505df9cb9673d068396889b12e8d178495017b413f3 totem-2.16.2.ebuild 4226
-MISC ChangeLog 18793 RMD160 abef403d6ae1e5ac4e6fe66d91adb6fffd3dbdcd SHA1 0f488eb4b9d1020f58be0abba0b9539fd3430a3a SHA256 df52699587e33ff9b8db69952a2bdb8b2937e3e9178e024250698d019a1113d4
-MD5 4ee111c06e07a533557b482ea476c540 ChangeLog 18793
-RMD160 abef403d6ae1e5ac4e6fe66d91adb6fffd3dbdcd ChangeLog 18793
-SHA256 df52699587e33ff9b8db69952a2bdb8b2937e3e9178e024250698d019a1113d4 ChangeLog 18793
+MISC ChangeLog 19019 RMD160 2b96b1fc08f4cafdd10e9f0313d537f23859cf5a SHA1 943305430d61adc213bb4f8818dc25439e770cf3 SHA256 0fa8e6803f31bf58b28e242830087646bf39508c7b9e10dc1daa4d2405944541
+MD5 38022f3fef754b52d4729cd943f5beb8 ChangeLog 19019
+RMD160 2b96b1fc08f4cafdd10e9f0313d537f23859cf5a ChangeLog 19019
+SHA256 0fa8e6803f31bf58b28e242830087646bf39508c7b9e10dc1daa4d2405944541 ChangeLog 19019
 MISC metadata.xml 521 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c SHA1 cbf35cd1be8178679cc8dc62463fedb4a11042f9 SHA256 67adda7ef1db1c932df3f4a03186d86119e9c26c96f2c17d554150dc133f6197
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 RMD160 d715631cdb935e3f1cfc70e88d8dfbd10ae3159c metadata.xml 521
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
 }