head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2011.09.27.18.44.34;	author beat;	state dead;
branches;
next	1.1;

1.1
date	2011.06.28.16.42.58;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update Firefox to 7.0

Thanks to:	flo@@ for preparing the www/firefox update
@
text
@--- ipc/glue/GeckoChildProcessHost.cpp.orig	2011-06-15 23:57:27.000000000 +0200
+++ ipc/glue/GeckoChildProcessHost.cpp	2011-06-27 23:48:28.799495181 +0200
@@@@ -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
@


1.1
log
@- enable the use of ASM code in libjpeg-turbo [1]
- make plugin-container work with custom LD_LIBRARY_PATH [2]

Do not bump PORTREVISION as firefox package was not buildable due to size
constraints before my last bsd.gecko.mk commit.

PR:		ports/158371 [1]
Submitted by:	Pan Tsu <inyaoo@@gmail.com> [1]
		kmoore [2]
Obtained from:	mozilla bugtracker [2]
@
text
@@

