rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-visual-id.patch, 1.1, 1.2 nspluginwrapper.spec, 1.54, 1.55
Martin Stransky
stransky at fedoraproject.org
Tue Sep 30 07:33:34 UTC 2008
- Previous message (by thread): rpms/rubber/F-9 import.log, NONE, 1.1 rubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/rubber/F-8 import.log, NONE, 1.1 rubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2632
Modified Files:
nspluginwrapper-1.1.0-visual-id.patch nspluginwrapper.spec
Log Message:
Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
nspluginwrapper-1.1.0-visual-id.patch:
Index: nspluginwrapper-1.1.0-visual-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-visual-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-visual-id.patch 4 Aug 2008 07:46:25 -0000 1.1
+++ nspluginwrapper-1.1.0-visual-id.patch 30 Sep 2008 07:33:03 -0000 1.2
@@ -1,13 +1,37 @@
-diff -up nspluginwrapper-1.1.0/src/npw-rpc.c.old nspluginwrapper-1.1.0/src/npw-rpc.c
---- nspluginwrapper-1.1.0/src/npw-rpc.c.old 2008-07-06 17:33:14.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-rpc.c 2008-08-01 20:45:33.000000000 +0200
-@@ -381,7 +381,8 @@ static int do_send_NPSetWindowCallbackSt
+2008-09-30 Gwenole Beauchesne <gb.public at 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)
-+ uint32_t visual_id = ws_info->visual != NULL ? XVisualIDFromVisual(ws_info->visual) : 0;
-+ if ((error = rpc_message_send_uint32(message, visual_id)) < 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;
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- nspluginwrapper.spec 17 Sep 2008 07:53:54 -0000 1.54
+++ nspluginwrapper.spec 30 Sep 2008 07:33:03 -0000 1.55
@@ -70,7 +70,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 1.1.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
@@ -110,7 +110,7 @@
%patch3 -p1 -b .fork
%patch4 -p1 -b .shutdown
%patch5 -p1 -b .sleep
-%patch6 -p1 -b .visual_id
+%patch6 -p0 -b .visual_id
pushd %plugin_config_name
%patch100 -p2
@@ -241,6 +241,9 @@
%config %{_sysconfdir}/sysconfig/%{name}
%changelog
+* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-7
+- Updated fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3
+
* Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-6
- Added libcurl to requires (#460988)
- Previous message (by thread): rpms/rubber/F-9 import.log, NONE, 1.1 rubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/rubber/F-8 import.log, NONE, 1.1 rubber.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list