rpms/epiphany/devel epiphany-2.20.1-wrapped-plugins.patch, NONE, 1.1 epiphany.spec, 1.163, 1.164

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9134

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.20.1-wrapped-plugins.patch 
Log Message:
* Tue Oct 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-2
- Add patch to allow epiphany to use the plugins wrapped by
  nspluginwrapper (#334751)


epiphany-2.20.1-wrapped-plugins.patch:

--- NEW FILE epiphany-2.20.1-wrapped-plugins.patch ---
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");
 	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_NATIVE_PLUGINSDIR"-wrapped");
+	
 #ifdef HAVE_PRIVATE_PLUGINS
 	list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR);
 #endif


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- epiphany.spec	16 Oct 2007 04:05:52 -0000	1.163
+++ epiphany.spec	16 Oct 2007 17:11:25 -0000	1.164
@@ -8,7 +8,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.20.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -49,6 +49,8 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486881 
 Patch3: new-nm.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=334751
+Patch4: epiphany-2.20.1-wrapped-plugins.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -87,6 +89,7 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .new-nm
+%patch4 -p0 -b .wrapped-plugins
 
 %build
 %ifnarch s390 s390x
@@ -193,6 +196,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Oct 16 2007 - Bastien Nocera <bnocera at redhat.com> - 2.20.1-2
+- Add patch to allow epiphany to use the plugins wrapped by
+  nspluginwrapper (#334751)
+
 * Tue Oct 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.1-1
 - Update to 2.20.1