summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-13 14:05:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-13 14:05:38 +0000
commit37be55aca6388c04bcd86ab091340b7a9598c402 (patch)
tree223d7f4e5809fb6b9457d4617e82674b754e97a5 /www-plugins
parentFixing python dependencies and use git-2.eclass (Bug 382767) (diff)
downloadgentoo-2-37be55aca6388c04bcd86ab091340b7a9598c402.tar.gz
gentoo-2-37be55aca6388c04bcd86ab091340b7a9598c402.tar.bz2
gentoo-2-37be55aca6388c04bcd86ab091340b7a9598c402.zip
Ship a copy of custom libxul.pc in order to use Firefox 6.0 headers.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/gecko-mediaplayer/ChangeLog6
-rw-r--r--www-plugins/gecko-mediaplayer/files/libxul.pc5
-rw-r--r--www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild8
3 files changed, 16 insertions, 3 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index b9902f2da498..3beb6827783c 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-plugins/gecko-mediaplayer
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.51 2011/07/12 15:02:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.52 2011/09/13 14:05:38 ssuominen Exp $
+
+ 13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+ gecko-mediaplayer-1.0.4.ebuild, +files/libxul.pc:
+ Ship a copy of custom libxul.pc in order to use Firefox 6.0 headers.
12 Jul 2011; Thomas Kahle <tomka@gentoo.org>
gecko-mediaplayer-1.0.3-r1.ebuild:
diff --git a/www-plugins/gecko-mediaplayer/files/libxul.pc b/www-plugins/gecko-mediaplayer/files/libxul.pc
new file mode 100644
index 000000000000..bca5b6384d51
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/files/libxul.pc
@@ -0,0 +1,5 @@
+Name: libxul
+Description: The Mozilla Runtime and Embedding Engine
+Requires: nspr
+Version: 6.0
+Cflags: -I/usr/include/firefox -fshort-wchar
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
index 36bb318217e1..c79690f4581b 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild,v 1.1 2011/07/04 14:15:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-1.0.4.ebuild,v 1.2 2011/09/13 14:05:38 ssuominen Exp $
EAPI=4
inherit multilib nsplugins
+_fxver=6.0
+
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"
@@ -18,7 +20,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.92
>=dev-libs/glib-2.26:2
dev-libs/nspr
>=media-video/gnome-mplayer-1.0.4[dbus]
- >=net-libs/xulrunner-1.9.2:1.9
+ || ( >=www-client/firefox-${_fxver} >=net-libs/xulrunner-1.9.2:1.9 )
curl? ( net-misc/curl )
!www-client/chromium"
DEPEND="${RDEPEND}
@@ -28,6 +30,8 @@ DEPEND="${RDEPEND}
DOCS="ChangeLog DOCS/tech/javascript.txt"
src_configure() {
+ has_version ">=www-client/firefox-${_fxver}" && export PKG_CONFIG_PATH="${FILESDIR}"
+
econf \
--without-gconf \
--with-gio \