summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2007-10-30 06:20:01 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2007-10-30 06:20:01 +0000
commite4fcd88013f3c6f2f0491a5c0c9f933f63324e41 (patch)
tree9806bde36198a17254d8d518b19f50658d6d8a2b /media-video
parentRestricted the dependencies to specific versions as only those are known to w... (diff)
downloadgentoo-2-e4fcd88013f3c6f2f0491a5c0c9f933f63324e41.tar.gz
gentoo-2-e4fcd88013f3c6f2f0491a5c0c9f933f63324e41.tar.bz2
gentoo-2-e4fcd88013f3c6f2f0491a5c0c9f933f63324e41.zip
add a hack to fix firefox runtime
(Portage version: 2.1.3.12)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/totem/ChangeLog6
-rw-r--r--media-video/totem/files/totem-2.20.1-browser-plugins.patch51
-rw-r--r--media-video/totem/totem-2.20.1.ebuild4
3 files changed, 58 insertions, 3 deletions
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 5a6bf88f4787..1e2f777f9808 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/totem
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.187 2007/10/23 21:19:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.188 2007/10/30 06:20:01 compnerd Exp $
+
+ 30 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+ +files/totem-2.20.1-browser-plugins.patch, totem-2.20.1.ebuild:
+ Fix runtime errors with nsplugins by linking against xpcom
23 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> totem-2.16.5.ebuild,
totem-2.18.2.ebuild, totem-2.18.3.ebuild:
diff --git a/media-video/totem/files/totem-2.20.1-browser-plugins.patch b/media-video/totem/files/totem-2.20.1-browser-plugins.patch
new file mode 100644
index 000000000000..bb2cb013c6ba
--- /dev/null
+++ b/media-video/totem/files/totem-2.20.1-browser-plugins.patch
@@ -0,0 +1,51 @@
+Index: browser-plugin/Makefile.am
+===================================================================
+--- browser-plugin/Makefile.am (revision 4827)
++++ browser-plugin/Makefile.am (working copy)
+@@ -109,6 +109,7 @@
+ $(WARN_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(NVTV_CFLAGS) \
++ $(SN_CFLAGS) \
+ $(AM_CFLAGS)
+
+ totem_plugin_viewer_LDADD = \
+@@ -122,6 +123,7 @@
+ $(DBUS_LIBS) \
+ $(NVTV_LIBS) \
+ $(XTEST_LIBS) \
++ $(SN_LIBS) \
+ $(X_LIBS)
+
+ BUILT_SOURCES += \
+Index: configure.in
+===================================================================
+--- configure.in (revision 4827)
++++ configure.in (working copy)
+@@ -585,6 +585,7 @@
+ if test "$have_libxpcomglue_s" = "yes"; then
+ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
+ else
++ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcom"
+ AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable])
+ fi
+ fi
+@@ -685,6 +686,18 @@
+ AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
+ AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])
+
++if test "$enable_basic_plugin" = "yes" ||
++ test "$enable_gmp_plugin" = "yes" ||
++ test "$enable_complex_plugin" = "yes" ||
++ test "$enable_narrowspace_plugin" = "yes" ||
++ test "$enable_mully_plugin" = "yes" ||
++ test "$enable_cone_plugin" = "yes" ; then
++
++ PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ])
++ AC_SUBST([SN_CFLAGS])
++ AC_SUBST([SN_LIBS])
++fi
++
+ dnl ********
+ dnl Nautilus
+ dnl ********
diff --git a/media-video/totem/totem-2.20.1.ebuild b/media-video/totem/totem-2.20.1.ebuild
index fa007f6edc0c..b018e1f32569 100644
--- a/media-video/totem/totem-2.20.1.ebuild
+++ b/media-video/totem/totem-2.20.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.1.ebuild,v 1.1 2007/10/23 21:19:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.20.1.ebuild,v 1.2 2007/10/30 06:20:01 compnerd Exp $
inherit autotools eutils gnome2 multilib
@@ -152,7 +152,7 @@ src_unpack() {
gnome2_src_unpack
if use nsplugin ; then
- epatch "${FILESDIR}"/${PN}-2.18.1-browser-plugins.patch
+ epatch "${FILESDIR}"/${PN}-2.20.1-browser-plugins.patch
eautoreconf
fi