packages: chromium-browser/chromium-browser.spec, chromium-browser/plugin-s...

[glen]

Author: glen                         Date: Tue Feb  2 15:28:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- search plugins from ~/.mozilla plugins and $MOZ_PLUGIN_PATH, so in short, plugins are searched from:
  1. %{_libdir}/%{name}/plugins
  2. $MOZ_PLUGIN_PATH (colon separated)
  3. ~/.mozilla/plugins

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.17 -> 1.18) , plugin-searchdirs.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.17 packages/chromium-browser/chromium-browser.spec:1.18
--- packages/chromium-browser/chromium-browser.spec:1.17	Tue Feb  2 15:34:02 2010
+++ packages/chromium-browser/chromium-browser.spec	Tue Feb  2 16:28:12 2010
@@ -22,7 +22,7 @@
 
 %define		svndate 20100202
 %define		svnver  37790
-%define		rel		0.17
+%define		rel		0.18
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
@@ -268,6 +268,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/02/02 15:28:12  glen
+- search plugins from ~/.mozilla plugins and $MOZ_PLUGIN_PATH, so in short, plugins are searched from:
+  1. %{_libdir}/%{name}/plugins
+  2. $MOZ_PLUGIN_PATH (colon separated)
+  3. ~/.mozilla/plugins
+
 Revision 1.17  2010/02/02 14:34:02  sparky
 - BR: perl-modules, python-modules
 - dropped BR: OpenGL, OpenGL-devel

================================================================
Index: packages/chromium-browser/plugin-searchdirs.patch
diff -u packages/chromium-browser/plugin-searchdirs.patch:1.1 packages/chromium-browser/plugin-searchdirs.patch:1.2
--- packages/chromium-browser/plugin-searchdirs.patch:1.1	Tue Feb  2 14:01:26 2010
+++ packages/chromium-browser/plugin-searchdirs.patch	Tue Feb  2 16:28:12 2010
@@ -1,16 +1,14 @@
---- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc~	2010-01-27 05:02:57.000000000 +0200
-+++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_list_linux.cc	2010-02-02 11:11:28.576140937 +0200
-@@ -65,6 +65,10 @@
-   PathService::Get(base::DIR_EXE, &dir);
-   plugin_dirs->push_back(dir.Append("plugins"));
+--- chromium-browser-5.0.313.0~svn20100202r37790/src/webkit/glue/plugins/plugin_list_linux.cc~	2010-02-02 15:14:25.933074719 +0200
++++ chromium-browser-5.0.313.0~svn20100202r37790/src/webkit/glue/plugins/plugin_list_linux.cc	2010-02-02 16:08:06.014003355 +0200
+@@ -90,6 +86,8 @@
+   if (home)
+     plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
  
-+  // on PLD Linux we want to search only Chrome specific dirs, but as there is
-+  // not user specific dir yet, this leaves us with Chrome system dir only.
++  // in PLD Linux we want to search only Chrome specific dirs.
 +#if 0
-+
-   // Mozilla code to reference:
-   // http://mxr.mozilla.org/firefox/ident?i=NS_APP_PLUGINS_DIR_LIST
-   // and tens of accompanying files (mxr is very helpful).
+   // 3) NS_SYSTEM_PLUGINS_DIR:
+   // This varies across different browsers and versions, so check 'em all.
+   plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
 @@ -101,6 +105,7 @@
    plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
    plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/plugin-searchdirs.patch?r1=1.1&r2=1.2&f=u