rpms/nspluginwrapper/devel nspluginwrapper-1.1.0-visual-id.patch, 1.2, 1.3 nspluginwrapper.spec, 1.57, 1.58

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11107

Modified Files:
	nspluginwrapper-1.1.0-visual-id.patch nspluginwrapper.spec 
Log Message:
- Revert libcurl requires because it was done in an incorrect way
- Revert patch from -7 because it made things worse


nspluginwrapper-1.1.0-visual-id.patch:

Index: nspluginwrapper-1.1.0-visual-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-visual-id.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspluginwrapper-1.1.0-visual-id.patch	30 Sep 2008 08:02:19 -0000	1.2
+++ nspluginwrapper-1.1.0-visual-id.patch	3 Oct 2008 22:23:55 -0000	1.3
@@ -1,37 +1,13 @@
-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 @@
+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
  	  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)
++	uint32_t visual_id = ws_info->visual != NULL ? XVisualIDFromVisual(ws_info->visual) : 0;
++	if ((error = rpc_message_send_uint32(message, visual_id)) < 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/devel/nspluginwrapper.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- nspluginwrapper.spec	30 Sep 2008 08:11:08 -0000	1.57
+++ nspluginwrapper.spec	3 Oct 2008 22:23:55 -0000	1.58
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -82,12 +82,12 @@
 Patch5:         nspluginwrapper-0.9.91.5-sleep.patch
 Patch6:         nspluginwrapper-1.1.0-visual-id.patch
 Patch100:       plugin-config-setuid.patch
-License:	GPLv2+
+License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Provides:	%{name} = %{version}-%{release}
-Requires:	mozilla-filesystem libcurl
+Requires:	mozilla-filesystem
 BuildRequires:	pkgconfig gtk2-devel glib2-devel nspr-devel
 BuildRequires:	libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel
 BuildRequires:	gecko-devel >= %{gecko_ver}
@@ -241,15 +241,16 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Tue Sep 30 2008 Martin Stransky <stransky at redhat.com> 1.1.0-9
+* Fri Oct 03 2008 Warren Togami <wtogami at redhat.com> 1.1.0-10
+- Revert libcurl requires because it was done in an incorrect way
+- Revert patch from -7 because it made things worse
+
+* 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-7
+* Wed Sep 17 2008 Martin Stransky <stransky at redhat.com> 1.1.0-6
 - Added libcurl to requires (#460988)
 
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.0-6
-- fix license tag
-
 * Mon Aug 04 2008 Martin Stransky <stransky at redhat.com> 1.1.0-5
 - Added fix for #456432 -(Windowless Crash) Flash 10 w/ Firefox 3