Revbump 1.1.0, add patch that should fix crash bug and patch to quiet warnings about 64 bit plugins. Drop original revision of 1.1.0. Stabilize 1.0.0.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64

6 files changed, 86 insertions, 7 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index 7af4b9c69178..efeb4bb228a2 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/nspluginwrapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.18 2008/07/30 19:46:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.19 2008/10/02 03:16:56 chutzpah Exp $
+
+*nspluginwrapper-1.1.0-r1 (02 Oct 2008)
+
+  02 Oct 2008; Patrick McLean <chutz@gentoo.org>
+  +files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch,
+  +files/nspluginwrapper-1.1.0-windowless-crash.patch,
+  nspluginwrapper-1.0.0.ebuild, -nspluginwrapper-1.1.0.ebuild,
+  +nspluginwrapper-1.1.0-r1.ebuild:
+  Revbump 1.1.0, add patch that should fix crash bug and patch to quiet
+  warnings about 64 bit plugins. Drop original revision of 1.1.0. Stabilize
+  1.0.0.
 
 *nspluginwrapper-1.1.0 (30 Jul 2008)
 
diff --git a/net-www/nspluginwrapper/Manifest b/net-www/nspluginwrapper/Manifest
index 9718c1e68e17..9a307fc522ca 100644
--- a/net-www/nspluginwrapper/Manifest
+++ b/net-www/nspluginwrapper/Manifest
@@ -1,9 +1,11 @@
 AUX nspluginwrapper-0.9.91.5-g_thread_init.patch 1294 RMD160 7dd5ddc17d09752d9f6cf3c1291e656ba774ee54 SHA1 b1bc0bd1f4fd1f147cbe7ebe1007f4b6843515db SHA256 541fdbfbfa69060f2fb7dbc2320a696f615dea6aa3a5aa7f74ebfa3d4252aa1c
+AUX nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch 567 RMD160 5bb8443a462de16ece2d94bc4b2f0b0ad06c97fe SHA1 dae3cadf82aa577080a0e680ec005086632c0d61 SHA256 62901e936c70567237422c2293c4ed4fc83f4b6189c310a380cb228e9bb38e63
+AUX nspluginwrapper-1.1.0-windowless-crash.patch 1392 RMD160 d853f820ef5b3d3b0d76b5cd7821e6499a24d438 SHA1 7bed1cce6907efb46cf51bec8d288103de09b918 SHA256 9dbd9b9f6d3722c5c589ea0588d5b9ce401c916fab092bc2995f842ba6eb0b94
 DIST nspluginwrapper-0.9.91.5.tar.bz2 273331 RMD160 8f88f3f3e5703f02130c1c3bb3627e07eb7eb7ca SHA1 f5f0126741fec8db2340e6f58d7390cd8c9ca862 SHA256 c1262aff6b223e3d92d422cb814106a07eafbad3f5df645c27af7988e93e6b60
 DIST nspluginwrapper-1.0.0.tar.bz2 271028 RMD160 d3b5a5d1dd314e5331ffc877fb9621d6566087c6 SHA1 ef551fb508835b3358355477be794a34e9f64135 SHA256 e5c4661eb91d05fc3da2f4ccf6e0769e8cd097ac232ffc6afe16e645729a02d5
 DIST nspluginwrapper-1.1.0.tar.bz2 304485 RMD160 70fb7ba9425eff569e5b8b17d0f817b91883e26a SHA1 48e548ac7ef7e12ffb2784752bb321141921cda6 SHA256 ec660115a5ab30003d35ef3df301aca167d0212aaf1921bd52c9cda900446177
 EBUILD nspluginwrapper-0.9.91.5-r1.ebuild 2077 RMD160 1dce1a7999c2c48021533d544dfaf12df5b1a9d8 SHA1 0d60f11f40aab11b273e1355b60fdf0c62e26f2e SHA256 bec5accc7bdca0402a5c9e12a4ce1f0e2d6521e895636733e10f59df4f2c2e90
-EBUILD nspluginwrapper-1.0.0.ebuild 1957 RMD160 e89e9e920dfb0d503c561bf91b0c6e3a78c34479 SHA1 bf389531f5a722c750f021ab73d576d06794765c SHA256 81b61e29dbd159c73157152fee43c8fc101d7f27397668069d50729c0fbe82d8
-EBUILD nspluginwrapper-1.1.0.ebuild 1911 RMD160 fdb551511a09c3677d6eb584a902ad4f3faa1b88 SHA1 2de54e9bd1da887a8d4d1c31b15f4e4526cfcdff SHA256 1e0d685fc3ffa668834c9f6e1273ec2832d240394be78e32b6ca9caa9e6bf278
-MISC ChangeLog 4327 RMD160 b9e9b7870172a9f83b78caa1aa79cc43cc3ab72e SHA1 422104d720f201b9a1eb15054cef4eafe9ce28e6 SHA256 5444280b0c056e58994ea1ec214368c0fe287f334afbfcdb287f7ea2d36d8120
+EBUILD nspluginwrapper-1.0.0.ebuild 1959 RMD160 349baa0220bf9fed5553fe22c005ffece334459d SHA1 ed4194b5cbb674d9a14f8cea911a476411f450d7 SHA256 cca609775cf6b28bb8ea5be214ee367dddcbd90687880ce86cc492c1e04c39d7
+EBUILD nspluginwrapper-1.1.0-r1.ebuild 2113 RMD160 91d4acefea6084750f7f2f390172a925c8876057 SHA1 3906dd16e756fdfa125d49e38733b1a2ff990ee9 SHA256 c98bf53e1f315c70ad07c740d7b83c866993bd9236f9f1b25c171ffa9b8842e1
+MISC ChangeLog 4795 RMD160 f3f693638d114332323738fc3d516002c01dd825 SHA1 773ac48ed79e81a08c01dfcabba6bec0216c36dc SHA256 95a61fadf4def5fc23290e571ec812dcf958f0f5ce1bc833a1dfe0752561d001
 MISC metadata.xml 253 RMD160 37a89adccd0388cf014f6768a21b1ec09252d21c SHA1 fa43576fb2327afb837b5b2ea57dc6ab8525494b SHA256 0b0d878d1f93316b2966ec90c1f80c46fe67fb3f5647b28f7c30d9647dbb1854
diff --git a/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch b/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch
new file mode 100644
index 000000000000..f5b1ec51f5a7
--- /dev/null
+++ b/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch
@@ -0,0 +1,17 @@
+This patch suppresses error messages when trying to wrap native plugin:
+*** NSPlugin Viewer  *** ERROR: /usr/lib64/browser-plugins/opensc-signer.so: wrong ELF class: ELFCLASS64
+https://bugzilla.novell.com/show_bug.cgi?id=400194
+================================================================================
+--- src/npw-config.c
++++ src/npw-config.c
+@@ -538,6 +538,10 @@
+ 	  if (pid < 0)
+ 		continue;
+ 	  else if (pid == 0) {
++		if (!g_verbose)
++		{
++			fclose(stderr);
++		}
+ 		execl(viewer_path, NPW_VIEWER, "--test", "--plugin", filename, NULL);
+ 		exit(1);
+ 	  }
diff --git a/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch b/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch
new file mode 100644
index 000000000000..b80538ff4eb9
--- /dev/null
+++ b/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch
@@ -0,0 +1,37 @@
+2008-09-30  Gwenole Beauchesne  <gb.public@free.fr>
+
+	* src/npw-rpc (do_send_NPSetWindowCallbackStruct): Check for
+	NULL visual.
+	* src/npw-viewer.c (create_window_attributes): Get system
+	visual when we are passed a 0 visual ID.
+
+Index: src/npw-viewer.c
+===================================================================
+--- src/npw-viewer.c	(revision 645)
++++ src/npw-viewer.c	(revision 646)
+@@ -358,7 +358,11 @@
+ {
+   if (ws_info == NULL)
+ 	return -1;
+-  GdkVisual *gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  GdkVisual *gdk_visual;
++  if (ws_info->visual)
++	gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
++  else
++	gdk_visual = gdk_visual_get_system();
+   if (gdk_visual == NULL) {
+ 	npw_printf("ERROR: could not reconstruct XVisual from visualID\n");
+ 	return -2;
+Index: src/npw-rpc.c
+===================================================================
+--- src/npw-rpc.c	(revision 645)
++++ src/npw-rpc.c	(revision 646)
+@@ -381,7 +381,7 @@
+ 	  return error;
+ 	if ((error = rpc_message_send_int32(message, ws_info->type)) < 0)
+ 	  return error;
+-	if ((error = rpc_message_send_uint32(message, XVisualIDFromVisual(ws_info->visual))) < 0)
++	if ((error = rpc_message_send_uint32(message, ws_info->visual ? XVisualIDFromVisual(ws_info->visual) : 0)) < 0)
+ 	  return error;
+ 	if ((error = rpc_message_send_uint32(message, ws_info->colormap)) < 0)
+ 	  return error;
diff --git a/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
index 1a69b5208286..21610edc5073 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild,v 1.1 2008/07/05 23:52:53 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.0.0.ebuild,v 1.2 2008/10/02 03:16:56 chutzpah Exp $
 
 inherit eutils nsplugins flag-o-matic multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gibix.net/projects/nspluginwrapper/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
diff --git a/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.1.0-r1.ebuild
index 2e8414030aeb..158d6c84c80a 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild,v 1.1 2008/07/30 19:46:54 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.1.0-r1.ebuild,v 1.1 2008/10/02 03:16:56 chutzpah Exp $
 
 inherit eutils nsplugins multilib
 
@@ -20,6 +20,17 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# should fix some crashing
+	epatch "${FILESDIR}/${P}-windowless-crash.patch"
+
+	# bug #238403
+	epatch "${FILESDIR}/${P}-quiet-64bit-plugin-warnings.patch"
+}
+
 src_compile() {
 	econf --with-biarch \
 		--with-lib32=$(ABI=x86 get_libdir) \
@@ -27,6 +38,7 @@ src_compile() {
 		--pkglibdir=/usr/$(get_libdir)/${PN}
 
 	emake || die "emake failed"
+
 }
 
 src_install() {