Gentoo Archives: gentoo-commits

From: "Patrick McLean (chutzpah)" <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-www/nspluginwrapper/files: nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch nspluginwrapper-1.1.0-windowless-crash.patch
Date: Thu, 02 Oct 2008 03:17:00
Message-Id: E1KlEgU-00066k-02@stork.gentoo.org
1 chutzpah 08/10/02 03:16:57
2
3 Added:
4 nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch
5 nspluginwrapper-1.1.0-windowless-crash.patch
6 Log:
7 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.
8 (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)
9
10 Revision Changes Path
11 1.1 net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch?rev=1.1&content-type=text/plain
15
16 Index: nspluginwrapper-1.1.0-quiet-64bit-plugin-warnings.patch
17 ===================================================================
18 This patch suppresses error messages when trying to wrap native plugin:
19 *** NSPlugin Viewer *** ERROR: /usr/lib64/browser-plugins/opensc-signer.so: wrong ELF class: ELFCLASS64
20 https://bugzilla.novell.com/show_bug.cgi?id=400194
21 ================================================================================
22 --- src/npw-config.c
23 +++ src/npw-config.c
24 @@ -538,6 +538,10 @@
25 if (pid < 0)
26 continue;
27 else if (pid == 0) {
28 + if (!g_verbose)
29 + {
30 + fclose(stderr);
31 + }
32 execl(viewer_path, NPW_VIEWER, "--test", "--plugin", filename, NULL);
33 exit(1);
34 }
35
36
37
38 1.1 net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch?rev=1.1&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/nspluginwrapper/files/nspluginwrapper-1.1.0-windowless-crash.patch?rev=1.1&content-type=text/plain
42
43 Index: nspluginwrapper-1.1.0-windowless-crash.patch
44 ===================================================================
45 2008-09-30 Gwenole Beauchesne <gb.public@××××.fr>
46
47 * src/npw-rpc (do_send_NPSetWindowCallbackStruct): Check for
48 NULL visual.
49 * src/npw-viewer.c (create_window_attributes): Get system
50 visual when we are passed a 0 visual ID.
51
52 Index: src/npw-viewer.c
53 ===================================================================
54 --- src/npw-viewer.c (revision 645)
55 +++ src/npw-viewer.c (revision 646)
56 @@ -358,7 +358,11 @@
57 {
58 if (ws_info == NULL)
59 return -1;
60 - GdkVisual *gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
61 + GdkVisual *gdk_visual;
62 + if (ws_info->visual)
63 + gdk_visual = gdkx_visual_get((uintptr_t)ws_info->visual);
64 + else
65 + gdk_visual = gdk_visual_get_system();
66 if (gdk_visual == NULL) {
67 npw_printf("ERROR: could not reconstruct XVisual from visualID\n");
68 return -2;
69 Index: src/npw-rpc.c
70 ===================================================================
71 --- src/npw-rpc.c (revision 645)
72 +++ src/npw-rpc.c (revision 646)
73 @@ -381,7 +381,7 @@
74 return error;
75 if ((error = rpc_message_send_int32(message, ws_info->type)) < 0)
76 return error;
77 - if ((error = rpc_message_send_uint32(message, XVisualIDFromVisual(ws_info->visual))) < 0)
78 + if ((error = rpc_message_send_uint32(message, ws_info->visual ? XVisualIDFromVisual(ws_info->visual) : 0)) < 0)
79 return error;
80 if ((error = rpc_message_send_uint32(message, ws_info->colormap)) < 0)
81 return error;