Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Jun 2011 11:54:19 -0400
From:      Kris Moore <kris@pcbsd.org>
To:        gecko@freebsd.org
Subject:   Patch for Firefox port to fix our PBIs
Message-ID:  <4E08A7AB.1000802@pcbsd.org>

next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------030608010003050202090801
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit


Hey, we are running into this bug when trying to use FF 5.0 PBIs:

https://bugzilla.mozilla.org/show_bug.cgi?id=573958

The following patch is from the bug report thread, and should fix the 
issue we are seeing. Could this be committed to the port soon? (I've 
only eyeball compiled, may need tindy run first)

Thanks!



-- 
Kris Moore
PC-BSD Software
iXsystems


--------------030608010003050202090801
Content-Type: text/plain;
 name="patch-ipc-glue-GeckoChildProcessHost.cpp"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="patch-ipc-glue-GeckoChildProcessHost.cpp"

--- ipc/glue/GeckoChildProcessHost.cpp.orig	2011-06-15 17:57:27.000000000 -0400
+++ ipc/glue/GeckoChildProcessHost.cpp	2011-06-27 11:42:52.153911641 -0400
@@ -433,7 +433,16 @@
 #ifdef ANDROID
     path += "/lib";
 #endif
-    newEnvVars["LD_LIBRARY_PATH"] = path.get();
+    const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
+    nsCString new_ld_lib_path;
+    if (ld_library_path && *ld_library_path) {
+        new_ld_lib_path.Assign(ld_library_path);
+        new_ld_lib_path.AppendLiteral(":");
+        new_ld_lib_path.Append(path.get());
+        newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
+    } else {
+        newEnvVars["LD_LIBRARY_PATH"] = path.get();
+    }
 #elif OS_MACOSX
     newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
 #endif

--------------030608010003050202090801--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E08A7AB.1000802>