* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper: nspluginwrapper-1.4.4-r3.ebuild ChangeLog
@ 2012-04-19 1:22 Patrick McLean (chutzpah)
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean (chutzpah) @ 2012-04-19 1:22 UTC (permalink / raw
To: gentoo-commits
chutzpah 12/04/19 01:22:37
Modified: ChangeLog
Added: nspluginwrapper-1.4.4-r3.ebuild
Log:
Pull patch from upstream to link against gthread (bug #412337). Use upstream patch for removing gthread.h. Link against libdl when building the player (upstream patch).
(Portage version: 2.1.10.56/cvs/Linux x86_64)
Revision Changes Path
1.26 www-plugins/nspluginwrapper/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 16 Apr 2012 04:08:38 -0000 1.25
+++ ChangeLog 19 Apr 2012 01:22:37 -0000 1.26
@@ -1,6 +1,17 @@
# ChangeLog for www-plugins/nspluginwrapper
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.25 2012/04/16 04:08:38 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.26 2012/04/19 01:22:37 chutzpah Exp $
+
+*nspluginwrapper-1.4.4-r3 (19 Apr 2012)
+
+ 19 Apr 2012; Patrick McLean <chutzpah@gentoo.org>
+ +nspluginwrapper-1.4.4-r3.ebuild,
+ files/nspluginwrapper-1.4.4-dont-include-gthread.patch,
+ +files/nspluginwrapper-1.4.4-link-to-libdl.patch,
+ +files/nspluginwrapper-1.4.4-link-to-libgthread.patch:
+ Pull patch from upstream to link against gthread (bug #412337). Use upstream
+ patch for removing gthread.h. Link against libdl when building the player
+ (upstream patch).
*nspluginwrapper-1.4.4-r2 (16 Apr 2012)
1.1 www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.1&content-type=text/plain
Index: nspluginwrapper-1.4.4-r3.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.1 2012/04/19 01:22:37 chutzpah Exp $
EAPI=2
inherit eutils multilib nsplugins flag-o-matic toolchain-funcs
DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
HOMEPAGE="http://nspluginwrapper.org/"
SRC_URI="http://web.mit.edu/davidben/Public/nspluginwrapper/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND=">=x11-libs/gtk+-2:2
net-misc/curl
app-emulation/emul-linux-x86-xlibs
app-emulation/emul-linux-x86-gtklibs
>=sys-apps/util-linux-2.13"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
autoinstall() {
if [[ -x /usr/bin/${PN} ]]; then
einfo "Auto installing 32bit plugins..."
${PN} -a -i
ls /usr/$(get_libdir)/nsbrowser/plugins
# Remove wrappers if equivalent 64-bit plugins exist
# TODO: May be better to patch nspluginwrapper so it doesn't create
# duplicate wrappers in the first place...
local DIR64="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/"
for f in "${DIR64}"/npwrapper.*.so; do
local PLUGIN=${f##*/npwrapper.}
if [[ -f ${DIR64}/${PLUGIN} ]]; then
einfo " Removing duplicate wrapper for native 64-bit ${PLUGIN}"
${PN} -r "${f}"
fi
done
fi
}
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
epatch "${FILESDIR}/${P}-parallel-make.patch"
epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
epatch "${FILESDIR}/${P}-dont-unload-libraries.patch"
epatch "${FILESDIR}/${P}-dont-include-gthread.patch"
epatch "${FILESDIR}/${P}-link-to-libdl.patch"
epatch "${FILESDIR}/${P}-link-to-libgthread.patch"
sed -i -r "s:^libnoxshm_LDFLAGS = :libnoxshm_LDFLAGS = -L/usr/$(ABI=x86 get_libdir)/ :" \
Makefile || die "sed failed"
}
src_configure() {
replace-flags -O3 -O2
./configure \
--with-cc="$(tc-getCC)" \
--with-cxx="$(tc-getCXX)" \
--enable-biarch \
--target-cpu=i386 \
--with-lib32=$(ABI=x86 get_libdir) \
--with-lib64=$(get_libdir) \
--pkglibdir=/usr/$(get_libdir)/${PN} \
|| die "configure failed"
}
src_compile() {
emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" \
|| die "dosym failed"
keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}" || die "keepdir failed"
dodoc NEWS README TODO
}
pkg_postinst() {
autoinstall
elog "Any 32bit plugins you currently have installed have now been"
elog "configured to work in a 64bit browser. Any plugins you install in"
elog "the future will first need to be setup with:"
elog " \"nspluginwrapper -i <path-to-32bit-plugin>\""
elog "before they will function in a 64bit browser"
elog
}
# this is terribly ugly, but without a way to query portage as to whether
# we are upgrading/reinstalling a package versus unmerging, I can't think of
# a better way
pkg_prerm() {
einfo "Removing wrapper plugins..."
${PN} --auto --remove
}
pkg_postrm() {
autoinstall
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper: nspluginwrapper-1.4.4-r3.ebuild ChangeLog
@ 2012-08-04 9:44 Agostino Sarubbo (ago)
0 siblings, 0 replies; 3+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-08-04 9:44 UTC (permalink / raw
To: gentoo-commits
ago 12/08/04 09:44:23
Modified: nspluginwrapper-1.4.4-r3.ebuild ChangeLog
Log:
Stable for amd64, wrt bug #425826
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.3 www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?r1=1.2&r2=1.3
Index: nspluginwrapper-1.4.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspluginwrapper-1.4.4-r3.ebuild 3 May 2012 06:08:02 -0000 1.2
+++ nspluginwrapper-1.4.4-r3.ebuild 4 Aug 2012 09:44:23 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.2 2012/05/03 06:08:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.3 2012/08/04 09:44:23 ago Exp $
EAPI=2
@@ -12,7 +12,7 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
RDEPEND=">=x11-libs/gtk+-2:2
1.28 www-plugins/nspluginwrapper/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 3 May 2012 06:08:02 -0000 1.27
+++ ChangeLog 4 Aug 2012 09:44:23 -0000 1.28
@@ -1,6 +1,10 @@
# ChangeLog for www-plugins/nspluginwrapper
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.27 2012/05/03 06:08:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.28 2012/08/04 09:44:23 ago Exp $
+
+ 04 Aug 2012; Agostino Sarubbo <ago@gentoo.org>
+ nspluginwrapper-1.4.4-r3.ebuild:
+ Stable for amd64, wrt bug #425826
03 May 2012; Jeff Horelick <jdhore@gentoo.org> nspluginwrapper-1.4.4.ebuild,
nspluginwrapper-1.4.4-r1.ebuild, nspluginwrapper-1.4.4-r2.ebuild,
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper: nspluginwrapper-1.4.4-r3.ebuild ChangeLog
@ 2014-10-15 15:09 Pacho Ramos (pacho)
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos (pacho) @ 2014-10-15 15:09 UTC (permalink / raw
To: gentoo-commits
pacho 14/10/15 15:09:20
Modified: nspluginwrapper-1.4.4-r3.ebuild ChangeLog
Log:
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path
1.4 www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild?r1=1.3&r2=1.4
Index: nspluginwrapper-1.4.4-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nspluginwrapper-1.4.4-r3.ebuild 4 Aug 2012 09:44:23 -0000 1.3
+++ nspluginwrapper-1.4.4-r3.ebuild 15 Oct 2014 15:09:20 -0000 1.4
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.3 2012/08/04 09:44:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild,v 1.4 2014/10/15 15:09:20 pacho Exp $
-EAPI=2
+EAPI=5
inherit eutils multilib nsplugins flag-o-matic toolchain-funcs
@@ -17,9 +17,19 @@
RDEPEND=">=x11-libs/gtk+-2:2
net-misc/curl
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-gtklibs
- >=sys-apps/util-linux-2.13"
+ >=sys-apps/util-linux-2.13
+ || (
+ (
+ >=dev-libs/glib-2.34.3[abi_x86_32(-)]
+ >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+ >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+ >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+ )
+ (
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -72,16 +82,15 @@
}
src_compile() {
- emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed"
+ emake LDFLAGS_32="$(get_abi_CFLAGS x86) ${LDFLAGS}"
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
- dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}" \
- || die "dosym failed"
+ dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
- keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}" || die "keepdir failed"
+ keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}"
dodoc NEWS README TODO
}
1.29 www-plugins/nspluginwrapper/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 4 Aug 2012 09:44:23 -0000 1.28
+++ ChangeLog 15 Oct 2014 15:09:20 -0000 1.29
@@ -1,6 +1,9 @@
# ChangeLog for www-plugins/nspluginwrapper
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.28 2012/08/04 09:44:23 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.29 2014/10/15 15:09:20 pacho Exp $
+
+ 15 Oct 2014; Pacho Ramos <pacho@gentoo.org> nspluginwrapper-1.4.4-r3.ebuild:
+ Support multilib providers for deps. Bump to EAPI=5.
04 Aug 2012; Agostino Sarubbo <ago@gentoo.org>
nspluginwrapper-1.4.4-r3.ebuild:
@@ -330,4 +333,3 @@
<herbs@gentoo.org>, also had contributions from Ahmed Ammar
<b33fc0d3@gmail.com> and Matsuu Takuto matsuu@gentoo.org. Closes bug
#138454.
-
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-15 15:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-04 9:44 [gentoo-commits] gentoo-x86 commit in www-plugins/nspluginwrapper: nspluginwrapper-1.4.4-r3.ebuild ChangeLog Agostino Sarubbo (ago)
-- strict thread matches above, loose matches on Subject: below --
2014-10-15 15:09 Pacho Ramos (pacho)
2012-04-19 1:22 Patrick McLean (chutzpah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox