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).

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

6 files changed, 172 insertions, 19 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 426b32185b35..37b38b36a272 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -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)
 
diff --git a/www-plugins/nspluginwrapper/Manifest b/www-plugins/nspluginwrapper/Manifest
index 32525ff0bf3a..3a0b7b5e318d 100644
--- a/www-plugins/nspluginwrapper/Manifest
+++ b/www-plugins/nspluginwrapper/Manifest
@@ -3,29 +3,32 @@ 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-include-gthread.patch 310 RMD160 902ddfcaae2815415f9c01b6a205401021af6d57 SHA1 21f81f1fd2b8d2fff1de2f63f65913957c7bfa11 SHA256 027192d2564db93f02db30f799a4dbd8d780d50cc9a52e3030667c12f942396b
 AUX nspluginwrapper-1.4.4-dont-unload-libraries.patch 451 RMD160 45227db2a914185d81d724441acd14e2f52442f5 SHA1 c0c5145f1c97ebe48b24cdc42081dde57b066fcb SHA256 bbf838cc0fdbb54fbec2a0acfff3591542e4212c7afd24a68d798f6a71bb93b0
+AUX nspluginwrapper-1.4.4-link-to-libdl.patch 537 RMD160 50abe4c568189147505dfde992df1daf94bc0e93 SHA1 1b9d2b8a617b4040753959ca97c121e6a412e8e8 SHA256 63854f9b6d87fd83b22a3f9a49242ad4082a1a8935828a146694f943466a4dad
+AUX nspluginwrapper-1.4.4-link-to-libgthread.patch 508 RMD160 cacbe4f57ca83ead57900696035bda008ff0ed52 SHA1 de860b9f66c4f628c5fca2d35f529b703e7a5e68 SHA256 5d7b31c5ea5ddf6ea80c3d221a6a3c18bd6862f967c7664be5f92504f28699da
 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-r3.ebuild 3135 RMD160 8be7eb7c269b5dda14c209283a206af2025956be SHA1 86420a241df9c579ddc75b8422b438d2a759bb19 SHA256 b0ff1ee9f62ca9f2375db9c1e3a0ab55bb10e427b97ab9c91c4f5c8c47326962
 EBUILD nspluginwrapper-1.4.4.ebuild 2640 RMD160 0ab6a1b0042683f425a5749d42d834e092c06344 SHA1 12be162c0ef233d5b73a3560822377674fe229ab SHA256 a461a2e1b530b63f0fadbcc5d9009065238bab7e91a1957f65d09a8984616e1b
-MISC ChangeLog 12400 RMD160 b8628dcea43075a2d181125b0ffe61d04aac4605 SHA1 535f7a3eafd420ab22c2eb14c40d7ae6f62602f4 SHA256 0b3f098261f5ca8e62aaf2a14139e5446a8be3bc0ec6a3143fac2d003548b1e1
+MISC ChangeLog 12872 RMD160 0ceb8dd41ed28203f18b65f62d4f27b5573c5338 SHA1 cc8db1cba8d3a0f89a0ba4fa10da4d1562f05696 SHA256 e0b4b6188064667823f8204fc3d782811115dea347b7083d47d93323b7da1437
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBCAAGBQJPj2jsAAoJEHy/RO9cNQiDv5IQAK7cwYKJqfISxIjl5R7V0cLo
+mCh1B+EGcM1XhjIzH3FNkgbY0NoKxFDuDpYyzpbCuJvN380tAIyzwkumpxtNihjd
+aBdiUVnqMF4x2XWTcRJZTwiKtdLJT0ewE8Nrb4A0scK4FwdFWxAJJ0/3vZ3N+EgN
+9nUI2xtu8ki5PRSvV2Y6KWD+7zz5uLAfmAxFoVpiFY2vcUieuJGE+vmF8MP1LLlE
+qCp+dttsB+NNhD9LDL3wEyIXfJtpZKCLh9WHtnKf5Bn+DLTqc9p3z+zRe8w7n5D2
+P90hslK6uZjvvf7sOI0Uh0gekw/Iojk/oE2oBCCVWuVgCefYJOsEr5M9xzn96bqy
+JzwOxmdKn/W/Goc1Xal3kQCg8Dqn5lBmtynZuXWhIazMAISZ65rAo9318EhidXtW
+/tpKkO1ssOAYAJI+WoS2hY/vPsz2rY8+9Owqt9L8T0FEdDRrkpVThN2XIzUMf3vV
+lGK5vxGS7qPrH0PhabCZL0TxiLKaVacAfeI1Uq64a+h6OSOCsn2fQwNQWl+uFyL/
+9rSA3bPEVenI9t8FlOLCs3NRjfzD5/OSUxdIo1XrIpQddUk+cIMCZpJDBTspFcDX
+4uIsMJSaWBTdQDHwCaCpTWTDAdsFqmDL8H7XZgUZyfs6KJiLyabeallWoR7S3Qe8
+Jsq6iN5Jgb0jTYn7f7tP
+=YhG8
 -----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
index b42e28873b1a..c1d404ab75d2 100644
--- 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
@@ -1,6 +1,7 @@
-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
+diff --git a/src/npw-player.c b/src/npw-player.c
+index a99b8f7..217b5ba 100644
+--- a/src/npw-player.c
++++ b/src/npw-player.c
 @@ -25,7 +25,6 @@
  #include <unistd.h>
  #include <glib.h>
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libdl.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libdl.patch
new file mode 100644
index 000000000000..28e8f65cf745
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libdl.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index e36a991..2a40671 100644
+--- a/Makefile
++++ b/Makefile
+@@ -142,7 +142,7 @@ npplayer_CFLAGS  += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS
+ npplayer_LDFLAGS  = $(LDFLAGS)
+ npplayer_LDFLAGS += $(libpthread_LDFLAGS)
+ npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
+-npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS)
++npplayer_LIBS    += $(libdl_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
+ 
+ libnoxshm_LIBRARY = libnoxshm.so
+ libnoxshm_RAWSRCS = libnoxshm.c
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libgthread.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libgthread.patch
new file mode 100644
index 000000000000..56030c473c42
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-link-to-libgthread.patch
@@ -0,0 +1,15 @@
+diff --git a/configure b/configure
+index 5f3dd86..09c400a 100755
+--- a/configure
++++ b/configure
+@@ -499,8 +499,8 @@ fi
+ 
+ # check for Glib 2.0 compile CFLAGS
+ if $pkgconfig --exists glib-2.0; then
+-    GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0`
+-    GLIB_LIBS=`$pkgconfig --libs glib-2.0`
++    GLIB_CFLAGS=`$pkgconfig --cflags glib-2.0 gthread-2.0`
++    GLIB_LIBS=`$pkgconfig --libs glib-2.0 gthread-2.0`
+     GLIB_VERSION=`$pkgconfig --modversion glib-2.0`
+ else
+     echo "GLIB 2.0 environment not found"
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
new file mode 100644
index 000000000000..2346e9c5b043
--- /dev/null
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4-r3.ebuild
@@ -0,0 +1,110 @@
+# 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
+}