diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2009-09-29 16:39:27 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2009-09-29 16:39:27 +0000 |
| commit | 05ad2621d1ba6b1a74f210b0f952e3c503a64787 (patch) | |
| tree | 382b7cec56b3e03a73d7db0d397e3878672b6d88 /www-plugins | |
| parent | version bump per bug 285434 (security) (diff) | |
| download | gentoo-2-05ad2621d1ba6b1a74f210b0f952e3c503a64787.tar.gz gentoo-2-05ad2621d1ba6b1a74f210b0f952e3c503a64787.tar.bz2 gentoo-2-05ad2621d1ba6b1a74f210b0f952e3c503a64787.zip | |
Fix bug 286795.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins')
3 files changed, 14 insertions, 61 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog index cb85bc1857ee..e9d7aafb3d7a 100644 --- a/www-plugins/gecko-mediaplayer/ChangeLog +++ b/www-plugins/gecko-mediaplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-plugins/gecko-mediaplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.15 2009/09/27 20:41:07 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.16 2009/09/29 16:39:26 idl0r Exp $ + + 29 Sep 2009; Christian Ruppert <idl0r@gentoo.org> + gecko-mediaplayer-0.9.7-r1.ebuild, + -files/gecko-mediaplayer-as-needed.patch: + Fix bug 286795. *gecko-mediaplayer-0.9.7-r1 (27 Sep 2009) diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch deleted file mode 100644 index b9b0a9eaf7c6..000000000000 --- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-as-needed.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- src/Makefile.am.old 2009-09-27 21:32:26.566057010 +0200 -+++ src/Makefile.am 2009-09-27 21:33:33.564053846 +0200 -@@ -39,6 +39,8 @@ COMMONCODE = \ - npp_gate.cpp \ - npupp.h - -+LIBS = $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -+ - install_libexecdir = $(libdir)/mozilla/plugins - install_libexec_PROGRAMS = \ - gecko-mediaplayer.so \ -@@ -52,7 +54,7 @@ gecko_mediaplayer_so_SOURCES = \ - $(COMMONCODE) - - gecko_mediaplayer_so_CFLAGS = -fPIC --gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC -+gecko_mediaplayer_so_LDFLAGS = -shared -fPIC - gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a - - gecko_mediaplayer_qt_so_SOURCES = \ -@@ -60,7 +62,7 @@ gecko_mediaplayer_qt_so_SOURCES = \ - $(COMMONCODE) - - gecko_mediaplayer_qt_so_CFLAGS = -fPIC --gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC -+gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC - gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a - - gecko_mediaplayer_wmp_so_SOURCES = \ -@@ -68,7 +70,7 @@ gecko_mediaplayer_wmp_so_SOURCES = \ - $(COMMONCODE) - - gecko_mediaplayer_wmp_so_CFLAGS = -fPIC --gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC -+gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC - gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a - - gecko_mediaplayer_dvx_so_SOURCES = \ -@@ -76,7 +78,7 @@ gecko_mediaplayer_dvx_so_SOURCES = \ - $(COMMONCODE) - - gecko_mediaplayer_dvx_so_CFLAGS = -fPIC --gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC -+gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC - gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a - - gecko_mediaplayer_rm_so_SOURCES = \ -@@ -84,7 +86,7 @@ gecko_mediaplayer_rm_so_SOURCES = \ - $(COMMONCODE) - - gecko_mediaplayer_rm_so_CFLAGS = -fPIC --gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC -+gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC - gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a - - indent: diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild index a6af7f9aae53..fabf0040fcb9 100644 --- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild +++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 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.7-r1.ebuild,v 1.1 2009/09/27 20:41:07 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.7-r1.ebuild,v 1.2 2009/09/29 16:39:26 idl0r Exp $ EAPI=2 GCONF_DEBUG=no -inherit gnome2 multilib autotools eutils +inherit gnome2 multilib DESCRIPTION="A browser multimedia plugin using gnome-mplayer" HOMEPAGE="http://code.google.com/p/gecko-mediaplayer" @@ -33,8 +33,12 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/${PN}-as-needed.patch" - eautoreconf + # Fix as-needed, bug 279419 and bug 286795. + # bug 279419 has been fixed by upstream in 0.9.8. + sed -i -r \ + -e 's:(gecko_mediaplayer(_.+)?_so_LDFLAGS) = .*:\1 = -shared -fPIC:' \ + -e 's:(gecko_mediaplayer(_.+)?_so_LDADD = .*):\1 $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS):' \ + src/Makefile.in || die } src_install() { |