From 28132e774478bb632672ff04958b1cfc1a464da8 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 3 Jul 2022 09:04:13 -0400 Subject: v102.0 rc1 --- mozilla_dirs.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 mozilla_dirs.patch (limited to 'mozilla_dirs.patch') diff --git a/mozilla_dirs.patch b/mozilla_dirs.patch new file mode 100644 index 0000000..e854faa --- /dev/null +++ b/mozilla_dirs.patch @@ -0,0 +1,76 @@ +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 50a64a2..79d7d9c 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -303,16 +303,16 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { + rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, + getter_AddRefs(localDir)); + if (NS_SUCCEEDED(rv)) { +- rv = localDir->AppendNative("Mozilla"_ns); ++ rv = localDir->AppendNative("LibreWolf"_ns); + } + # else + constexpr auto dirname = + # ifdef HAVE_USR_LIB64_DIR +- "/usr/lib64/mozilla"_ns ++ "/usr/lib64/librewolf"_ns + # elif defined(__OpenBSD__) || defined(__FreeBSD__) +- "/usr/local/lib/mozilla"_ns ++ "/usr/local/lib/librewolf"_ns + # else +- "/usr/lib/mozilla"_ns ++ "/usr/lib/librewolf"_ns + # endif + ; + rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); +@@ -413,9 +413,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, + rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false); + if (NS_SUCCEEDED(rv)) { + # if defined(XP_MACOSX) +- rv = localDir->AppendNative("Mozilla"_ns); ++ rv = localDir->AppendNative("LibreWolf"_ns); + # else +- rv = localDir->AppendNative(".mozilla"_ns); ++ rv = localDir->AppendNative(".librewolf"_ns); + # endif + } + if (NS_SUCCEEDED(rv)) { +@@ -465,9 +465,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, + else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) { + # ifdef ENABLE_SYSTEM_EXTENSION_DIRS + # if defined(__OpenBSD__) || defined(__FreeBSD__) +- static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions"; ++ static const char* const sysLExtDir = "/usr/local/share/librewolf/extensions"; + # else +- static const char* const sysLExtDir = "/usr/share/mozilla/extensions"; ++ static const char* const sysLExtDir = "/usr/share/librewolf/extensions"; + # endif + return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false, aFile); + # else +@@ -1276,7 +1276,7 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, + nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) { + return NS_ERROR_FAILURE; + } +- } else if (NS_FAILED(localDir->AppendNative("Mozilla"_ns))) { ++ } else if (NS_FAILED(localDir->AppendNative("LibreWolf"_ns))) { + return NS_ERROR_FAILURE; + } + +@@ -1559,7 +1559,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { + + #if defined(XP_MACOSX) || defined(XP_WIN) + +- static const char* const sXR = "Mozilla"; ++ static const char* const sXR = "LibreWolf"; + rv = aFile->AppendNative(nsDependentCString(sXR)); + NS_ENSURE_SUCCESS(rv, rv); + +@@ -1569,7 +1569,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { + + #elif defined(XP_UNIX) + +- static const char* const sXR = ".mozilla"; ++ static const char* const sXR = ".librewolf"; + rv = aFile->AppendNative(nsDependentCString(sXR)); + NS_ENSURE_SUCCESS(rv, rv); + -- cgit