rpms/epiphany/F-8 epiphany-2.20.1-wrapped-plugins.patch, 1.1, 1.2 epiphany.spec, 1.166, 1.167

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	epiphany-2.20.1-wrapped-plugins.patch epiphany.spec 
Log Message:
* Mon Nov 19 2007 Martin Stransky <stransky at redhat.com> - 2.20.1-5
- Updated wrapper patch



epiphany-2.20.1-wrapped-plugins.patch:

Index: epiphany-2.20.1-wrapped-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-8/epiphany-2.20.1-wrapped-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epiphany-2.20.1-wrapped-plugins.patch	16 Oct 2007 17:11:25 -0000	1.1
+++ epiphany-2.20.1-wrapped-plugins.patch	19 Nov 2007 12:03:22 -0000	1.2
@@ -1,20 +1,53 @@
-Index: embed/mozilla/mozilla-embed-single.cpp
-===================================================================
---- embed/mozilla/mozilla-embed-single.cpp	(revision 7534)
-+++ embed/mozilla/mozilla-embed-single.cpp	(working copy)
-@@ -309,6 +309,16 @@
- 						    MOZILLA_HOME "/plugins");
+diff -up epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp.wrapped epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp
+--- epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp.wrapped	2007-08-27 22:19:02.000000000 +0200
++++ epiphany-2.20.1/embed/mozilla/mozilla-embed-single.cpp	2007-11-19 12:49:51.000000000 +0100
+@@ -294,6 +294,30 @@ mozilla_init_plugin_add_unique_paths (GL
+ 	return list;
+ }
+ 
++static int
++mozilla_setup_wrapped_plugin (void)
++{
++        char *p_viewer = "/usr/bin/mozilla-plugin-config";
++
++        if(access(p_viewer, X_OK) != 0)
++                return(FALSE);
++
++        int pid = fork ();
++        if (pid < 0) {
++                return(FALSE);
++        }
++        else if (pid == 0) {
++                execlp(p_viewer,p_viewer,NULL);
++                exit(1);
++        }
++        else {
++                int status;
++                while (waitpid(pid, &status, 0) != pid)
++                        ;
++                return(TRUE);
++        }
++}
++
+ static void
+ mozilla_init_plugin_path ()
+ {
+@@ -307,8 +331,17 @@ mozilla_init_plugin_path ()
+ 						    MOZILLA_PREFIX "/lib/mozilla/plugins");
  	list = mozilla_init_plugin_add_unique_path (list,
- 						    MOZILLA_NATIVE_PLUGINSDIR);
-+	/* Add -wrapped directories as used by nspluginwrapper */
-+	list = mozilla_init_plugin_add_unique_path (list,
-+						    MOZILLA_PREFIX "/lib/mozilla/plugins-wrapped");
-+	list = mozilla_init_plugin_add_unique_path (list,
-+						    MOZILLA_HOME "/plugins-wrapped");
-+	/* Note this only works if MOZILLA_NATIVE_PLUGINSDIR doesn't
-+	 * finish with a '/' */
-+	list = mozilla_init_plugin_add_unique_path (list,
+ 						    MOZILLA_HOME "/plugins");
+-	list = mozilla_init_plugin_add_unique_path (list,
+-						    MOZILLA_NATIVE_PLUGINSDIR);
++        /* Note this only works if MOZILLA_NATIVE_PLUGINSDIR doesn't
++ 	 * finish with a '/' */
++	if(mozilla_setup_wrapped_plugin()) {
++		list = mozilla_init_plugin_add_unique_path (list,
 +						    MOZILLA_NATIVE_PLUGINSDIR"-wrapped");
++	}
++	else {
++        	list = mozilla_init_plugin_add_unique_path (list,
++                                                    MOZILLA_NATIVE_PLUGINSDIR);
++	}
 +	
  #ifdef HAVE_PRIVATE_PLUGINS
  	list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR);


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/F-8/epiphany.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- epiphany.spec	6 Nov 2007 11:23:21 -0000	1.166
+++ epiphany.spec	19 Nov 2007 12:03:22 -0000	1.167
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.20.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -89,7 +89,7 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .new-nm
-%patch4 -p0 -b .wrapped-plugins
+%patch4 -p1 -b .wrapped-plugins
 
 %build
 %ifnarch s390 s390x
@@ -196,6 +196,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Nov 19 2007 Martin Stransky <stransky at redhat.com> - 2.20.1-5
+- Updated wrapper patch
+
 * Mon Nov 5 2007 Martin Stransky <stransky at redhat.com> - 2.20.1-4
 - Rebuild against new firefox