rpms/nspluginwrapper/F-8 nspluginwrapper-0.9.91.5-npviewer-gthread.patch, NONE, 1.1 nspluginwrapper-0.9.91.5-rh.patch, 1.2, 1.3 nspluginwrapper.spec, 1.32, 1.33 nspluginwrapper-0.9.91.5-npviewer-flash-crash-cpu-affinity-workaround.patch, 1.1, NONE

Warren Togami 砥上勇 (wtogami) fedora-extras-commits at redhat.com
Tue Dec 25 18:21:56 UTC 2007


Author: wtogami

Update of /cvs/pkgs/rpms/nspluginwrapper/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7254

Modified Files:
	nspluginwrapper-0.9.91.5-rh.patch nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-npviewer-gthread.patch 
Removed Files:
	nspluginwrapper-0.9.91.5-npviewer-flash-crash-cpu-affinity-workaround.patch 
Log Message:
- Make nsviewer.bin initialized for multithreading, fixes #360891
  Removing previous workaround.

NOTE:
-lgthread-2.0 was added to npviewer_LDFLAGS.  Perhaps there is a cleaner way to do this?


nspluginwrapper-0.9.91.5-npviewer-gthread.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-npviewer-gthread.patch ---
diff -urN nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c nspluginwrapper-0.9.91.5/src/npw-viewer.c
--- nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c	2007-12-24 16:02:34.000000000 -0500
+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2007-12-24 16:03:03.000000000 -0500
@@ -3144,6 +3144,7 @@
   XtToolkitInitialize();
   x_app_context = XtCreateApplicationContext();
   x_display = XtOpenDisplay(x_app_context, NULL, "npw-viewer", "npw-viewer", NULL, 0, &argc, argv);
+  g_thread_init(NULL);
   gtk_init(&argc, &argv);
 
   // Initialize RPC communication channel

nspluginwrapper-0.9.91.5-rh.patch:

Index: nspluginwrapper-0.9.91.5-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-8/nspluginwrapper-0.9.91.5-rh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspluginwrapper-0.9.91.5-rh.patch	10 Sep 2007 08:44:43 -0000	1.2
+++ nspluginwrapper-0.9.91.5-rh.patch	25 Dec 2007 18:21:48 -0000	1.3
@@ -60,7 +60,7 @@
 -npviewer_CFLAGS  += $(MOZILLA_CFLAGS)
 -npviewer_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS)
 +npviewer_CFLAGS  = $(CFLAGS) $(GTK_CFLAGS) $(MOZILLA_CFLAGS)
-+npviewer_LDFLAGS = $(LDFLAGS) $(GTK_LDFLAGS) $(X_LDFLAGS) $(libdl_LDFLAGS) $(libpthread_LDFLAGS) $(MOZILLA_LDFLAGS)
++npviewer_LDFLAGS = $(LDFLAGS) $(GTK_LDFLAGS) $(X_LDFLAGS) $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0 $(MOZILLA_LDFLAGS)
  ifeq ($(TARGET_ARCH),i386)
  npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
  endif


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-8/nspluginwrapper.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nspluginwrapper.spec	18 Dec 2007 07:23:44 -0000	1.32
+++ nspluginwrapper.spec	25 Dec 2007 18:21:48 -0000	1.33
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	14%{?dist}
+Release:	15%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -81,7 +81,7 @@
 Patch4:         nspluginwrapper-0.9.91.5-runtime-restart.patch
 Patch5:         nspluginwrapper-0.9.91.5-fork.patch
 Patch6:         plugin-config-setuid.patch
-Patch7:         nspluginwrapper-0.9.91.5-npviewer-flash-crash-cpu-affinity-workaround.patch
+Patch7:         nspluginwrapper-0.9.91.5-npviewer-gthread.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -236,6 +236,10 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Dec 24 2007 Warren Togami <wtogami at redhat.com> 0.9.91.5-15
+- Make nsviewer.bin initialized for multithreading, fixes #360891
+  Removing previous workaround.
+
 * Tue Dec 18 2007 Warren Togami <wtogami at redhat.com> 0.9.91.5-14
 - Painfully ugly temporary workaround for flash-plugin-9.0.115.0 crash (#360891)
   Force npviewer.bin CPU affinity, seems to avoid a race condition and crash


--- nspluginwrapper-0.9.91.5-npviewer-flash-crash-cpu-affinity-workaround.patch DELETED ---




More information about the fedora-extras-commits mailing list