- search plugins from ~/.mozilla plugins and $MOZ_PLUGIN_PATH, so in short, plugins...

  1. %{_libdir}/%{name}/plugins
  2. $MOZ_PLUGIN_PATH (colon separated)
  3. ~/.mozilla/plugins

Changed files:
    chromium-browser.spec -> 1.18
    plugin-searchdirs.patch -> 1.2

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 89221230bb627cf276c4741ce21215c04870a0aa..68418394b18a1854144513c86cc925316c20ead5 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -21,7 +21,7 @@
 
 %define                svndate 20100202
 %define                svnver  37790
-%define                rel             0.17
+%define                rel             0.18
 
 Summary:       A WebKit powered web browser
 Name:          chromium-browser

diff --git a/plugin-searchdirs.patch b/plugin-searchdirs.patch
index 01b5f2d9c0830048a6470282df873ec1829978fa..28f19889261f0d86256d9cbb49faa33e8a6b973e 100644 (file)
--- a/plugin-searchdirs.patch
+++ b/plugin-searchdirs.patch
@@ -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"));