Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 13:43:04 -05:00
Code Issues Activity

fix mozilla_dirs.patch

Browse source
This commit is contained in:
Malte Jürgens 2023-03-15 12:05:25 +01:00
parent 5ce599ab1b
commit 9e4e08f863
No known key found for this signature in database
GPG key ID: D29FBD5F93C0CFC3
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
patches/mozilla_dirs.patch
View file

@ -1,8 +1,6 @@
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 50a64a2..79d7d9c 100644
--- a/toolkit/xre/nsXREDirProvider.cpp --- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -303,16 +303,16 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) { @@ -300,16 +300,16 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType,
getter_AddRefs(localDir)); getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
@ -23,19 +21,19 @@ index 50a64a2..79d7d9c 100644
# endif # endif
; ;
rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
@@ -413,9 +413,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, @@ -371,9 +371,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false); rv = GetUserDataDirectoryHome(getter_AddRefs(file), false);
if (NS_SUCCEEDED(rv)) { NS_ENSURE_SUCCESS(rv, rv);
# if defined(XP_MACOSX) # if defined(XP_MACOSX)
- rv = localDir->AppendNative("Mozilla"_ns); - rv = file->AppendNative("Mozilla"_ns);
+ rv = localDir->AppendNative("LibreWolf"_ns); + rv = file->AppendNative("LibreWolf"_ns);
# else # else // defined(XP_MACOSX)
- rv = localDir->AppendNative(".mozilla"_ns); - rv = file->AppendNative(".mozilla"_ns);
+ rv = localDir->AppendNative(".librewolf"_ns); + rv = file->AppendNative(".librewolf"_ns);
# endif # endif // defined(XP_MACOSX)
} }
if (NS_SUCCEEDED(rv)) { #endif // defined(XP_UNIX) || defined(XP_MACOSX)
@@ -465,9 +465,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, @@ -411,9 +411,9 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) { else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) {
# ifdef ENABLE_SYSTEM_EXTENSION_DIRS # ifdef ENABLE_SYSTEM_EXTENSION_DIRS
# if defined(__OpenBSD__) || defined(__FreeBSD__) # if defined(__OpenBSD__) || defined(__FreeBSD__)
@ -45,9 +43,9 @@ index 50a64a2..79d7d9c 100644
- static const char* const sysLExtDir = "/usr/share/mozilla/extensions"; - static const char* const sysLExtDir = "/usr/share/mozilla/extensions";
+ static const char* const sysLExtDir = "/usr/share/librewolf/extensions"; + static const char* const sysLExtDir = "/usr/share/librewolf/extensions";
# endif # endif
return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false, aFile); rv = NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false,
# else getter_AddRefs(file));
@@ -1276,7 +1276,7 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, @@ -1114,7 +1114,7 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult,
nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) { nsDependentCString(hasVendor ? GetAppVendor() : GetAppName())))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@ -56,7 +54,7 @@ index 50a64a2..79d7d9c 100644
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
@@ -1559,7 +1559,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { @@ -1363,7 +1363,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
#if defined(XP_MACOSX) || defined(XP_WIN) #if defined(XP_MACOSX) || defined(XP_WIN)
@ -65,7 +63,7 @@ index 50a64a2..79d7d9c 100644
rv = aFile->AppendNative(nsDependentCString(sXR)); rv = aFile->AppendNative(nsDependentCString(sXR));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@@ -1569,7 +1569,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) { @@ -1373,7 +1373,7 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
#elif defined(XP_UNIX) #elif defined(XP_UNIX)