diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-10 16:37:54 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-10 16:37:54 +0000 |
commit | 0b03b837d4651fbe6f9dd8e4c0a81b25d685f1fe (patch) | |
tree | d1ceb86a5b57063e9445e2b6ffcf19c394f28be8 /www-plugins/gecko-mediaplayer | |
parent | Stable for HPPA (bug #302672). (diff) | |
download | gentoo-2-0b03b837d4651fbe6f9dd8e4c0a81b25d685f1fe.tar.gz gentoo-2-0b03b837d4651fbe6f9dd8e4c0a81b25d685f1fe.tar.bz2 gentoo-2-0b03b837d4651fbe6f9dd8e4c0a81b25d685f1fe.zip |
Version bump.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/gecko-mediaplayer')
-rw-r--r-- | www-plugins/gecko-mediaplayer/ChangeLog | 9 | ||||
-rw-r--r-- | www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch | 16 | ||||
-rw-r--r-- | www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch | 17 | ||||
-rw-r--r-- | www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild (renamed from www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild) | 31 |
4 files changed, 43 insertions, 30 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog index 0bd4b94b56ab..4a14ddbed9c7 100644 --- a/www-plugins/gecko-mediaplayer/ChangeLog +++ b/www-plugins/gecko-mediaplayer/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-plugins/gecko-mediaplayer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.29 2010/01/26 21:55:52 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.30 2010/02/10 16:37:53 ssuominen Exp $ + +*gecko-mediaplayer-0.9.9 (10 Feb 2010) + + 10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + +gecko-mediaplayer-0.9.9.ebuild, + +files/gecko-mediaplayer-0.9.9-without-gconf.patch: + Version bump. 26 Jan 2010; Ben de Groot <yngwin@gentoo.org> gecko-mediaplayer-0.9.8_p347.ebuild, diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch deleted file mode 100644 index 073c611df8a9..000000000000 --- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstreamized patch wrt http://bugs.gentoo.org/attachment.cgi?id=273059 -Fixes race condition where two different xulrunners are installed, and -old headers get picked up by mistake. - ---- src/plugin_setup.cpp-old 2009-06-09 19:48:33.518153163 -0500 -+++ src/plugin_setup.cpp 2009-06-09 19:48:12.522163011 -0500 -@@ -362,7 +362,7 @@ - - } - -- nperror = NPN_GetValue (instance->mInstance, NPNVSupportsWindowless, &supportsWindowless); -+ nperror = NPN_GetValue (instance->mInstance, (NPNVariable) 17 /* NPNVSupportsWindowless */, &supportsWindowless); - supportsWindowless = (nperror == NPERR_NO_ERROR) && supportsWindowless; - if (instance->windowless) { - if (supportsWindowless) { - diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch new file mode 100644 index 000000000000..f1315ac07d4d --- /dev/null +++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch @@ -0,0 +1,17 @@ +diff -ur gecko-mediaplayer-0.9.9.orig/configure.in gecko-mediaplayer-0.9.9/configure.in +--- gecko-mediaplayer-0.9.9.orig/configure.in 2010-02-01 18:00:42.000000000 +0200 ++++ gecko-mediaplayer-0.9.9/configure.in 2010-02-10 18:27:16.000000000 +0200 +@@ -96,11 +96,11 @@ + AC_ARG_WITH([gconf], + [AS_HELP_STRING([--with-gconf], + [Use Gconf to store preferences])], +- [], ++ [AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1])], + [with_gconf=check]) + AS_IF([test "x$with_gconf" != xno], + [PKG_CHECK_MODULES(GCONF, [gconf-2.0],[AM_GCONF_SOURCE_2 +- GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],AC_MSG_NOTICE([Using keystore for preferences])) ++ GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],[AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1]) AC_MSG_NOTICE([Using keystore for preferences])]) + AC_SUBST(GCONF_DEFINES) + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild index 1052387e53a4..6ffbc198e532 100644 --- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild +++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild @@ -1,39 +1,44 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild,v 1.7 2009/07/02 11:56:49 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.9.ebuild,v 1.1 2010/02/10 16:37:53 ssuominen Exp $ EAPI=2 GCONF_DEBUG=no -inherit eutils gnome2 multilib +inherit autotools gnome2 multilib -DESCRIPTION="A browser multimedia plugin using gnome-mplayer" -HOMEPAGE="http://code.google.com/p/gecko-mediaplayer" +DESCRIPTION="A browser plugin that uses GNOME MPlayer" +HOMEPAGE="http://code.google.com/p/gecko-mediaplayer/" SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="gnome" -RDEPEND="dev-libs/glib:2 +RDEPEND=">=dev-libs/glib-2.14:2 net-libs/xulrunner:1.9 dev-libs/nspr - dev-libs/dbus-glib - >=media-video/gnome-mplayer-${PV} + >=dev-libs/dbus-glib-0.70 + >=media-video/gnome-mplayer-0.9.9 gnome? ( gnome-base/gconf:2 )" DEPEND="${RDEPEND} dev-util/pkgconfig sys-devel/gettext" pkg_setup() { - G2CONF+=" $(use_with gnome gconf) - $(use_enable gnome schemas-install)" DOCS="ChangeLog DOCS/tech/javascript.txt" + G2CONF="--disable-dependency-tracking + $(use_enable gnome schemas-install) + $(use_with gnome gconf) + --with-gio" } src_prepare() { + epatch "${FILESDIR}"/${P}-without-gconf.patch \ + "${FILESDIR}"/${PN}-0.9.8_p347-gconf-2.m4.patch \ + "${FILESDIR}"/${PN}-0.9.8_p347-xulrunner-detection.patch + eautoreconf gnome2_src_prepare - epatch "${FILESDIR}"/${P}-xul.patch } src_install() { @@ -43,7 +48,7 @@ src_install() { # move plugins to correct location and clean up empty dirs dodir /usr/$(get_libdir)/nsbrowser/plugins mv "${D}"/usr/$(get_libdir)/nspr/mozilla/plugins/${PN}* \ - "${D}"/usr/$(get_libdir)/nsbrowser/plugins || die "mv plugins failed" + "${D}"/usr/$(get_libdir)/nsbrowser/plugins || die rm -rf "${D}"/usr/$(get_libdir)/nspr rm -rf "${D}"/var } |