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.
17 lines
706 B
Plaintext
17 lines
706 B
Plaintext
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.3 2010/07/27 17:01:16 landry Exp $
|
|
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Wed Jun 23 19:47:12 2010
|
|
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Wed Jul 7 08:43:19 2010
|
|
@@ -1230,11 +1230,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
#elif defined(XP_UNIX)
|
|
static const char *const sysSExtDir =
|
|
-#ifdef HAVE_USR_LIB64_DIR
|
|
- "/usr/lib64/mozilla/extensions";
|
|
-#else
|
|
- "/usr/lib/mozilla/extensions";
|
|
-#endif
|
|
+ "${LOCALBASE}/lib/mozilla/extensions";
|
|
|
|
rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE,
|
|
getter_AddRefs(localDir));
|