package icudtl.dat

[packages/chromium-browser.git] / plugin-searchdirs.patch

diff --git a/plugin-searchdirs.patch b/plugin-searchdirs.patch
index 808cefd95e25b88b13316cc317a6708958946087..b0c3ba5ea2b9cd3bc010e1a0d8686033d470c1f9 100644 (file)
--- a/plugin-searchdirs.patch
+++ b/plugin-searchdirs.patch
@@ -1,15 +1,20 @@
---- chromium-browser-7.0.509.0~svn20100830r57827/src/webkit/glue/plugins/plugin_list_posix.cc~ 2010-08-30 13:11:06.000000000 +0300
-+++ chromium-browser-7.0.509.0~svn20100830r57827/src/webkit/glue/plugins/plugin_list_posix.cc  2010-08-30 14:34:22.711621299 +0300
-@@ -90,6 +86,8 @@
-   if (home)
-     plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
+- 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
+
+--- chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc~ 2010-12-22 04:02:37.000000000 +0100
++++ chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc  2011-01-07 17:41:38.193692743 +0100
+@@ -146,6 +146,8 @@
+   if (!home.empty())
+     plugin_dirs->push_back(home.Append(".mozilla/plugins"));
  
 +  // in PLD Linux we want to search only Chrome specific dirs.
 +#if 0
    // 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"));
-@@ -161,6 +161,7 @@
+@@ -161,6 +163,7 @@
    plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
    plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
  #endif  // defined(ARCH_CPU_64_BITS)