summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2012-04-16 04:08:38 +0000
committerPatrick McLean <chutzpah@gentoo.org>2012-04-16 04:08:38 +0000
commit5626918e7698660046e544a662c81f204ccb2117 (patch)
tree1cfc8202c3ff0f0ca8d5d67825959394e204f699 /www-plugins/nspluginwrapper
parentStable for HPPA (bug #412113). (diff)
downloadhistorical-5626918e7698660046e544a662c81f204ccb2117.tar.gz
historical-5626918e7698660046e544a662c81f204ccb2117.tar.bz2
historical-5626918e7698660046e544a662c81f204ccb2117.zip
Revision bump, add patches for bugs 412053 and 381873. Also don't use gcc directly (bug #380747), and add die functions.
Package-Manager: portage-2.1.10.56/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/nspluginwrapper')
-rw-r--r--www-plugins/nspluginwrapper/ChangeLog13
-rw-r--r--www-plugins/nspluginwrapper/Manifest25
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-include-gthread.patch11
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-unload-libraries.patch14
-rw-r--r--www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r2.ebuild108
5 files changed, 163 insertions, 8 deletions
diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index c0c9c4d72961..426b32185b35 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for www-plugins/nspluginwrapper
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.24 2011/08/31 08:26:44 chainsaw Exp $
+# 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 $
+
+*nspluginwrapper-1.4.4-r2 (16 Apr 2012)
+
+ 16 Apr 2012; Patrick McLean <chutzpah@gentoo.org>
+ +nspluginwrapper-1.4.4-r2.ebuild,
+ +files/nspluginwrapper-1.4.4-dont-include-gthread.patch,
+ +files/nspluginwrapper-1.4.4-dont-unload-libraries.patch:
+ Revision bump, add patches for bugs 412053 and 381873. Also don't use gcc
+ directly (bug #380747), and add die functions.
31 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
nspluginwrapper-1.4.4-r1.ebuild:
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index 083388c2d894..32525ff0bf3a 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -1,18 +1,31 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX nspluginwrapper-1.3.0-gdk-native-windows.patch 526 RMD160 e254dfc264828d6b1cc11adc73fe5666fbf27072 SHA1 ebe6ce5fa8cd8df4d98bbd5ec298500141f0fda0 SHA256 b616b16549fb1c61a43504da4b81b14ea2649239ff9ef5e7bfb3c58471f6fd1a
AUX nspluginwrapper-1.4.4-compile-on-hardened.patch 604 RMD160 1cea85a86efc84e606f99e4b81391776d933719c SHA1 e12b9e5fc728638d1b87c4294637bc87b429d8ec SHA256 614e9a0f9f3c6632192c08ccd138c6d97b50cc85b48a6b2017e97595faf56534
+AUX nspluginwrapper-1.4.4-dont-include-gthread.patch 440 RMD160 d656eb6b7a548618ab322ae81ef3de331fc4241a SHA1 ebdf7cf5d6dacca61742b4a88682246879efd53a SHA256 caf75617a85a9deedafd0c707f9c6a8f3365414e74594db81117d7ee97c1263b
+AUX nspluginwrapper-1.4.4-dont-unload-libraries.patch 451 RMD160 45227db2a914185d81d724441acd14e2f52442f5 SHA1 c0c5145f1c97ebe48b24cdc42081dde57b066fcb SHA256 bbf838cc0fdbb54fbec2a0acfff3591542e4212c7afd24a68d798f6a71bb93b0
AUX nspluginwrapper-1.4.4-parallel-make.patch 4018 RMD160 28b84f168a55e3eb01491085103ff9467a480e55 SHA1 ef2961249835018bb338d07ded3b8225f872deae SHA256 f071aafad78e919133e56877efe47c43c049e534123cb3a1ec3512205c90ec74
DIST nspluginwrapper-1.4.4.tar.gz 412513 RMD160 6acd93653aa8466e1e3703c2b794f32691c10d12 SHA1 ffb271a741215874808d4a77d0a0dd65588a8440 SHA256 f2ed94d42dbbb5370b000a3f30d2b601eb2b09d5742b2842cd0d70e862fab2bb
EBUILD nspluginwrapper-1.4.4-r1.ebuild 2741 RMD160 63e875d846e823c6e4046f1bc5fad95481f10aaf SHA1 71adc561508498f0d38c38f4f2c7428171a123a2 SHA256 67e83dab25595a12e8c865f7c227306acf738d6e5320ba920da254002efe7128
+EBUILD nspluginwrapper-1.4.4-r2.ebuild 3036 RMD160 73872d60b6044ebab9a95096a892986f743f2572 SHA1 b5aa65283deb4bb87967be61b94f92fe1afc68f4 SHA256 ab5285da710a1b3854f41c292fe8bd1eca70467a97c1e88e803f33dc326f68e1
EBUILD nspluginwrapper-1.4.4.ebuild 2640 RMD160 0ab6a1b0042683f425a5749d42d834e092c06344 SHA1 12be162c0ef233d5b73a3560822377674fe229ab SHA256 a461a2e1b530b63f0fadbcc5d9009065238bab7e91a1957f65d09a8984616e1b
-MISC ChangeLog 12026 RMD160 c0d9aa7a1ce9e699ee49c3cb14c33ac7439cc530 SHA1 1534e8e53a6d1bfde5d8ceb9419799ef56e7c33d SHA256 b52f8e2066272f071598879423de6ebf234262a658131c604f6450d5f5698193
+MISC ChangeLog 12400 RMD160 b8628dcea43075a2d181125b0ffe61d04aac4605 SHA1 535f7a3eafd420ab22c2eb14c40d7ae6f62602f4 SHA256 0b3f098261f5ca8e62aaf2a14139e5446a8be3bc0ec6a3143fac2d003548b1e1
MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk5d8E0ACgkQp5vW4rUFj5qR+QCfdGkEXPIFGP6xdDqnjximV7ZK
-DIAAn2MhuFo8qrUrt3NDiTbRh491lklF
-=gn9z
+iQIcBAEBCAAGBQJPi5tWAAoJEHy/RO9cNQiDAEsQAKVyfKkHLGCDjAhHiRJkTo9d
+Jovz7XS9d6uJnK+AREkN9ViZxWEVdNhNE55ic2386Czpz8IbSXp8ZR8W1PyOBved
+PTe0qh9A79U2eYEMGebch0ypHc8XF3tazpw4keabDaS8QzjAvdJzoat4c6LW/e53
+DJbuh0+CaO7zbYfpnbr+mi1wLbRTvx/Wv3uiOGjpy6TLg2eFhpcylbHbQTvHzoiN
+EYwIa9Eew9K5qPmhmjUvQYdvuVHH9QCoV4lIw+CePS+O/8QiW9uxbQu5HvYqKpAT
+Rx32w/qFM5OiOmVfyKcwIMsV3mO5qQWU7kmV9Al+UtqJnQlNZPzBnFLT6ViddpyT
+iaDVkuTXTAeI09EYHmnhWmuWVK0pM1h5VNtKvIKbGzMt6uolPOWxQXfYJho1Au10
+7bjsOBGCIc5cZGTOzm2AuInRl01NibW6k2MUwaNKS3Hnr9vwwS5vrTYQzIWCjJNb
+GKM34RI5PPpF1yQCSLw690qCcLZlsqDhJrB+J4x2Q/AYCHRUrhXKsCSryV8VdzGd
+B1wAmMJetycB7jlGsNJL0Czfdrnoc8Un7DYwgDTwRWhJA7WJwdm0QEYpkc6v7c/7
+63c8GbT7T0EGAFyPd3t0Yk3AqN7nejfif/+O8FtWzcHaJS149/oj1WqcWTaT4z2I
+ca6+kPg2rblQZuD9xby6
+=UPq0
-----END PGP SIGNATURE-----
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-include-gthread.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-include-gthread.patch
new file mode 100644
index 000000000000..b42e28873b1a
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-include-gthread.patch
@@ -0,0 +1,11 @@
+diff -ur nspluginwrapper-1.4.4.orig/src/npw-player.c nspluginwrapper-1.4.4/src/npw-player.c
+--- nspluginwrapper-1.4.4.orig/src/npw-player.c 2011-06-30 20:18:57.000000000 -0700
++++ nspluginwrapper-1.4.4/src/npw-player.c 2012-04-15 21:03:05.351084354 -0700
+@@ -25,7 +25,6 @@
+ #include <unistd.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/gthread.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-unload-libraries.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-unload-libraries.patch
new file mode 100644
index 000000000000..70793f9e7626
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-dont-unload-libraries.patch
@@ -0,0 +1,14 @@
+diff --git a/src/npw-config.c b/src/npw-config.c
+index e9e8007..4ad4bc1 100644
+--- a/src/npw-config.c
++++ b/src/npw-config.c
+@@ -534,7 +534,8 @@ static bool is_wrapper_plugin(const char *plugin_path, NPW_PluginInfo *out_plugi
+ return false;
+
+ bool ret = is_wrapper_plugin_handle(handle, out_plugin_info);
+- dlclose(handle);
++ /* Intentionally leak the handle; many libraries crash when unloaded. */
++ /* dlclose(handle); */
+ return ret;
+ }
+
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r2.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..e8755dad255d
--- /dev/null
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r2.ebuild
@@ -0,0 +1,108 @@
+# 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-r2.ebuild,v 1.1 2012/04/16 04:08:38 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"
+
+ 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
+}