28bb810af5
Merge patches for 1.9.2 mozilla branch from firefox 3.6.x port. While here, build lightning as a subpackage using --enable-calendar. Add @pkgpath/@conflict markers for seamless upgrades.
19 lines
887 B
Plaintext
19 lines
887 B
Plaintext
$OpenBSD: patch-mozilla_xpcom_io_nsAppFileLocationProvider_cpp,v 1.2 2010/07/27 17:01:16 landry Exp $
|
|
Standardize path for nsapi plugins
|
|
--- mozilla/xpcom/io/nsAppFileLocationProvider.cpp.orig Wed Jun 23 19:47:15 2010
|
|
+++ mozilla/xpcom/io/nsAppFileLocationProvider.cpp Wed Jul 7 08:43:19 2010
|
|
@@ -231,12 +231,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
|
|
}
|
|
#ifdef XP_UNIX
|
|
else if (nsCRT::strcmp(prop, NS_SYSTEM_PLUGINS_DIR) == 0) {
|
|
- static const char *const sysLPlgDir =
|
|
-#if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
|
|
- "/usr/lib64/mozilla/plugins";
|
|
-#else
|
|
- "/usr/lib/mozilla/plugins";
|
|
-#endif
|
|
+ static const char *const sysLPlgDir = "${LOCALBASE}/lib/mozilla/plugins";
|
|
rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
|
|
PR_FALSE, getter_AddRefs(localFile));
|
|
}
|