Fix Bug #13599 (mplayerplug-in unable to find firefox-xpcom)

(cherry picked from commit bc56ccecaffc05f73b0c12765cf4074afc81f438)

4 files changed, 68 insertions, 1 deletions

diff --git a/video/mplayerplug-in/BUILD b/video/mplayerplug-in/BUILD
index d885d7762c..3bd6762b31 100755
--- a/video/mplayerplug-in/BUILD
+++ b/video/mplayerplug-in/BUILD
@@ -1,5 +1,4 @@
 if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
-  sedit  's/mozilla-plugin/firefox-plugin/'  configure  &&
   if  ! ldd $INSTALL_ROOT/usr/lib/firefox/firefox-bin |
       grep -q libgtk-x11-2.0.so; then
     OPTS="--disable-gtk2 --enable-gtk1 $OPTS"
diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index 0d439c058c..7a571e8135 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,3 +1,10 @@
+2008-03-18 Eric Sandall <sandalle@sourcemage.org>
+	* BUILD: Don't fix the firefox.pc in configure, let the patch do it
+	* PRE_BUILD: Apply mplayerplug-in-3.35-firefox.patch
+	* mplayerplug-in-3.35-firefox.patch: Patch pointed out by George
+	  Sherwood and obtained from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-www/mplayerplug-in/files/mplayerplug-in-3.35-firefox.patch?rev=1.1
+	  Fixes Bug #13599
+
 2007-02-17 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
 	* DETAILS: updated spell to 3.35
 
diff --git a/video/mplayerplug-in/PRE_BUILD b/video/mplayerplug-in/PRE_BUILD
new file mode 100755
index 0000000000..c98435a33f
--- /dev/null
+++ b/video/mplayerplug-in/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd  $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/mplayerplug-in-3.35-firefox.patch
diff --git a/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch b/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
new file mode 100644
index 0000000000..5fa85b06d6
--- /dev/null
+++ b/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
@@ -0,0 +1,58 @@
+--- configure.in	2007/01/28 14:24:25	1.75
++++ configure.in	2007/02/26 18:28:41	1.76
+@@ -59,7 +59,7 @@
+ ],[AC_MSG_WARN([mozilla-plugin not found])])
+ 
+ 	if test "$MOZPLUG_CFLAGS" = ""; then
+-		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
++		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
+ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
+ ],[AC_MSG_WARN([firefox-plugin not found])])
+ 	fi
+--- configure	2007/01/28 14:24:24	1.76
++++ configure	2007/02/26 18:28:37	1.77
+@@ -3128,12 +3128,12 @@
+         pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
++  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
++  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -3146,12 +3146,12 @@
+         pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
++  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
++  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -3170,9 +3170,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"`
++	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
+         else
+-	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
++	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MOZPLUG_PKG_ERRORS" >&5
+