rpms/webkitgtk/devel webkit-1.1.14-nspluginwrapper.patch, NONE, 1.1 webkitgtk.spec, 1.20, 1.21

[Bastien Nocera]

Author: hadess

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

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.14-nspluginwrapper.patch 
Log Message:
* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3
- Add support for nspluginwrapper plugins


webkit-1.1.14-nspluginwrapper.patch:
 PluginDatabase.cpp |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE webkit-1.1.14-nspluginwrapper.patch ---
--- webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp.orig	2009-09-14 17:48:44.000000000 +0100
+++ webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp	2009-09-14 17:50:28.000000000 +0100
@@ -355,6 +355,9 @@ Vector<String> PluginDatabase::defaultPl
     paths.append("/usr/lib/netscape/plugins-libc6");
     paths.append("/usr/lib64/netscape/plugins");
     paths.append("/usr/lib64/mozilla/plugins");
+    /* And for nspluginwrapper */
+    paths.append("/usr/lib64/mozilla/plugins-wrapped");
+    paths.append("/usr/lib/mozilla/plugins-wrapped");
 
     String mozHome(getenv("MOZILLA_HOME"));
     mozHome.append("/plugins");


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- webkitgtk.spec	8 Sep 2009 19:02:17 -0000	1.20
+++ webkitgtk.spec	14 Sep 2009 17:56:12 -0000	1.21
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -49,6 +49,7 @@ Source0:	http://www.webkitgtk.org/webkit
 
 Patch0: 	webkit-1.1.14-atomic-word.patch
 Patch1: 	webkit-1.1.13-no-execmem.patch
+Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -112,6 +113,7 @@ LICENSE, README, and AUTHORS files.
 %setup -qn "webkit-%{version}"
 %patch0 -p1 -b .atomic-word
 %patch1 -p1 -b .no-execmem
+%patch2 -p1 -b .nspluginwrapper
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
@@ -188,6 +190,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3
+- Add support for nspluginwrapper plugins
+
 * Tue Sep 08 2009 Karsten Hopp <karsten at redhat.com> 1.1.14-2
 - bump release and rebuild as the package was linked with an old libicu
   during the mass rebuild on s390x