[SVN-Commit] r257 - branches/experimental/www/firefox3-devel/files trunk/www/firefox3-devel/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Feb  3 22:51:21 2010
New Revision: 257

Log:
- Add patch to fix startup with certain plugins installed (like weave,
  greasemonkey and video downloadhelper)

Submitted by:	nox@ (many thanks for nailing this down and fix the problem!)
Obtained from:	https://bugzilla.mozilla.org/show_bug.cgi?id=530793
Thanks to:	andreast, flo, miwi and nox for working on this problem

Added:
   branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp
   trunk/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp

Added: branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp	Wed Feb  3 22:51:21 2010	(r257)
@@ -0,0 +1,20 @@
+--- xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig
++++ xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+@@ -633,10 +633,17 @@ IndexOfDirectoryOfFile(nsISupportsArray*
+             aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), 
+                                         getter_AddRefs(current));
+             NS_ASSERTION(current, "broken search path! bad element");
++#if 0
++            // XXX #if 0'd because this breaks
++            //   xptiInterfaceInfoManager::DoFullValidationMergeFromFileList()
++            // causing ff failing to start when there are symlinks in .xpt
++            // file paths, like those from addons when /home is a symlink.
++
+             // nsIFile::Equals basically compares path strings so normalize
+             // before the comparison.
+             parent->Normalize();
+             current->Normalize();
++#endif
+             PRBool same;
+             if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+                 return (int) i;

Added: trunk/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp	Wed Feb  3 22:51:21 2010	(r257)
@@ -0,0 +1,20 @@
+--- xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig
++++ xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+@@ -633,10 +633,17 @@ IndexOfDirectoryOfFile(nsISupportsArray*
+             aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), 
+                                         getter_AddRefs(current));
+             NS_ASSERTION(current, "broken search path! bad element");
++#if 0
++            // XXX #if 0'd because this breaks
++            //   xptiInterfaceInfoManager::DoFullValidationMergeFromFileList()
++            // causing ff failing to start when there are symlinks in .xpt
++            // file paths, like those from addons when /home is a symlink.
++
+             // nsIFile::Equals basically compares path strings so normalize
+             // before the comparison.
+             parent->Normalize();
+             current->Normalize();
++#endif
+             PRBool same;
+             if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+                 return (int) i;