From a5c981a7c2b31e43be74deaabfa73278e6ae05cf Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 1 Oct 2018 15:19:20 -0400 Subject: import updates from chinforpms --- waterfox/waterfox-mozconfig | 1 - waterfox/waterfox-waterfoxdir-1.patch | 168 ++++++++++++++++++++++++++++++++++ waterfox/waterfox-waterfoxdir-2.patch | 12 +++ waterfox/waterfox-waterfoxdir.patch | 12 --- waterfox/waterfox.spec | 27 +++--- waterfox/wf-pull-547.patch | 168 ---------------------------------- 6 files changed, 195 insertions(+), 193 deletions(-) create mode 100644 waterfox/waterfox-waterfoxdir-1.patch create mode 100644 waterfox/waterfox-waterfoxdir-2.patch delete mode 100644 waterfox/waterfox-waterfoxdir.patch delete mode 100644 waterfox/wf-pull-547.patch diff --git a/waterfox/waterfox-mozconfig b/waterfox/waterfox-mozconfig index c400b21..648aed1 100644 --- a/waterfox/waterfox-mozconfig +++ b/waterfox/waterfox-mozconfig @@ -6,7 +6,6 @@ ac_add_options --prefix="$PREFIX" ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-zlib ac_add_options --with-system-bz2 -ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests #ac_add_options --enable-libnotify diff --git a/waterfox/waterfox-waterfoxdir-1.patch b/waterfox/waterfox-waterfoxdir-1.patch new file mode 100644 index 0000000..04650df --- /dev/null +++ b/waterfox/waterfox-waterfoxdir-1.patch @@ -0,0 +1,168 @@ +From 74d572e611b12650b55d400fe2bbf350d392f26c Mon Sep 17 00:00:00 2001 +From: Toromino +Date: Fri, 11 May 2018 12:58:25 +0200 +Subject: [PATCH 1/3] Update GeckoProfileDirectories.java + +--- + .../src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java +index 2afb54bc4dd2..d7b2aaec7fa2 100644 +--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java ++++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java +@@ -53,7 +53,7 @@ public NoSuchProfileException(String detailMessage) { + public boolean matches(INISection section); + } + +- private static final String MOZILLA_DIR_NAME = "mozilla"; ++ private static final String WATERFOX_DIR_NAME = "waterfox"; + + /** + * Returns true if the supplied profile entry represents the default profile. +@@ -116,14 +116,14 @@ public static String saltProfileName(final String name) { + */ + @RobocopTarget + public static File getMozillaDirectory(Context context) throws NoMozillaDirectoryException { +- final File mozillaDir = new File(context.getFilesDir(), MOZILLA_DIR_NAME); ++ final File mozillaDir = new File(context.getFilesDir(), WATERFOX_DIR_NAME); + if (mozillaDir.mkdirs() || mozillaDir.isDirectory()) { + return mozillaDir; + } + + // Although this leaks a path to the system log, the path is + // predictable (unlike a profile directory), so this is fine. +- throw new NoMozillaDirectoryException("Unable to create mozilla directory at " + mozillaDir.getAbsolutePath()); ++ throw new NoMozillaDirectoryException("Unable to create waterfox directory at " + mozillaDir.getAbsolutePath()); + } + + /** + +From 896a0eab58368c0862ef8c06224a287a8694d77a Mon Sep 17 00:00:00 2001 +From: Toromino +Date: Fri, 11 May 2018 13:31:20 +0200 +Subject: [PATCH 2/3] Update mozcrash.py + +--- + testing/mozbase/mozcrash/mozcrash/mozcrash.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/testing/mozbase/mozcrash/mozcrash/mozcrash.py b/testing/mozbase/mozcrash/mozcrash/mozcrash.py +index 2d778175bc43..8d2a4c4196fb 100644 +--- a/testing/mozbase/mozcrash/mozcrash/mozcrash.py ++++ b/testing/mozbase/mozcrash/mozcrash/mozcrash.py +@@ -521,18 +521,18 @@ def cleanup_pending_crash_reports(): + affecting test results; it is best to ensure that these are removed + before starting any browser tests. + +- Firefox stores pending crash reports in "/Crash Reports". ++ Waterfox stores pending crash reports in "/Crash Reports". + If the browser is not running, it cannot provide , so this + code tries to anticipate its value. + + See dom/system/OSFileConstants.cpp for platform variations of . + """ + if mozinfo.isWin: +- location = os.path.expanduser("~\\AppData\\Roaming\\Mozilla\\Firefox\\Crash Reports") ++ location = os.path.expanduser("~\\AppData\\Roaming\\Waterfox\\Crash Reports") + elif mozinfo.isMac: +- location = os.path.expanduser("~/Library/Application Support/firefox/Crash Reports") ++ location = os.path.expanduser("~/Library/Application Support/waterfox/Crash Reports") + else: +- location = os.path.expanduser("~/.mozilla/firefox/Crash Reports") ++ location = os.path.expanduser("~/.waterfox/Crash Reports") + logger = get_logger() + if os.path.exists(location): + try: + +From 17abfbf2f3fdab752dd0a4da125b227fbea6ed43 Mon Sep 17 00:00:00 2001 +From: Toromino +Date: Fri, 11 May 2018 13:53:08 +0200 +Subject: [PATCH 3/3] Update nsXREDirProvider.cpp + +--- + toolkit/xre/nsXREDirProvider.cpp | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index d17632c375f0..282ff041b6b7 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -294,16 +294,16 @@ GetSystemParentDirectory(nsIFile** aFile) + #if defined(XP_MACOSX) + rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, getter_AddRefs(localDir)); + if (NS_SUCCEEDED(rv)) { +- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")); ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")); + } + #else + NS_NAMED_LITERAL_CSTRING(dirname, + #ifdef HAVE_USR_LIB64_DIR +- "/usr/lib64/mozilla" ++ "/usr/lib64/waterfox" + #elif defined(__OpenBSD__) || defined(__FreeBSD__) +- "/usr/local/lib/mozilla" ++ "/usr/local/lib/waterfox" + #else +- "/usr/lib/mozilla" ++ "/usr/lib/waterfox" + #endif + ); + rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); +@@ -415,7 +415,7 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, + rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false); + if (NS_SUCCEEDED(rv)) { + #if defined(XP_MACOSX) +- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")); ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")); + if (NS_SUCCEEDED(rv)) { + rv = localDir->AppendNative(NS_LITERAL_CSTRING("NativeMessagingHosts")); + } +@@ -479,9 +479,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/waterfox/extensions"; + #else +- static const char *const sysLExtDir = "/usr/share/mozilla/extensions"; ++ static const char *const sysLExtDir = "/usr/share/waterfox/extensions"; + #endif + return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), + false, aFile); +@@ -1289,7 +1289,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) + gAppData->name)))) { + return NS_ERROR_FAILURE; + } +- } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) { ++ } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")))) { + return NS_ERROR_FAILURE; + } + +@@ -1314,7 +1314,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) + // under SOFTWARE\Mozilla. + wchar_t regPath[1024] = { L'\0' }; + swprintf_s(regPath, mozilla::ArrayLength(regPath), L"SOFTWARE\\%S\\%S\\TaskBarIDs", +- (hasVendor ? gAppData->vendor : "Mozilla"), MOZ_APP_BASENAME); ++ (hasVendor ? gAppData->vendor : "Waterfox"), MOZ_APP_BASENAME); + + // If we pre-computed the hash, grab it from the registry. + pathHashResult = GetCachedHash(HKEY_LOCAL_MACHINE, +@@ -1640,7 +1640,7 @@ nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) + + #if defined (XP_MACOSX) || defined(XP_WIN) + +- static const char* const sXR = "Mozilla"; ++ static const char* const sXR = "Waterfox"; + rv = aFile->AppendNative(nsDependentCString(sXR)); + NS_ENSURE_SUCCESS(rv, rv); + +@@ -1729,7 +1729,7 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, + // XXXsmaug ...and the rest of the profile creation! + MOZ_ASSERT(!aAppName, + "Profile creation for external applications is not implemented!"); +- rv = aFile->AppendNative(nsDependentCString("mozilla")); ++ rv = aFile->AppendNative(nsDependentCString("waterfox")); + NS_ENSURE_SUCCESS(rv, rv); + #elif defined(XP_UNIX) + nsAutoCString folder; diff --git a/waterfox/waterfox-waterfoxdir-2.patch b/waterfox/waterfox-waterfoxdir-2.patch new file mode 100644 index 0000000..cfcbecc --- /dev/null +++ b/waterfox/waterfox-waterfoxdir-2.patch @@ -0,0 +1,12 @@ +diff -up Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp.waterfoxdir Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp +--- Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp.waterfoxdir 2017-12-27 16:08:15.089424561 -0200 ++++ Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp 2017-12-27 16:08:15.119424503 -0200 +@@ -284,7 +284,7 @@ nsXREDirProvider::GetUserProfilesLocalDi + * for extensions and native-messaing manifests. + * + * On OSX this is /Library/Application Support/Mozilla +- * On Linux this is /usr/{lib,lib64}/mozilla ++ * On Linux this is /usr/{lib,lib64}/waterfox + * (for 32- and 64-bit systems respsectively) + */ + static nsresult diff --git a/waterfox/waterfox-waterfoxdir.patch b/waterfox/waterfox-waterfoxdir.patch deleted file mode 100644 index cfcbecc..0000000 --- a/waterfox/waterfox-waterfoxdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp.waterfoxdir Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp ---- Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp.waterfoxdir 2017-12-27 16:08:15.089424561 -0200 -+++ Waterfox-388770ff37846abbe9f2eebbd6d71014523bb047/toolkit/xre/nsXREDirProvider.cpp 2017-12-27 16:08:15.119424503 -0200 -@@ -284,7 +284,7 @@ nsXREDirProvider::GetUserProfilesLocalDi - * for extensions and native-messaing manifests. - * - * On OSX this is /Library/Application Support/Mozilla -- * On Linux this is /usr/{lib,lib64}/mozilla -+ * On Linux this is /usr/{lib,lib64}/waterfox - * (for 32- and 64-bit systems respsectively) - */ - static nsresult diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 1ad1cda..b1a026d 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,16 +1,16 @@ -%global commit 2294d4556bf76a6293275a17dbf9ef5fd187459e +%global commit 432b42717b0678a933f9d0731f02f9d1d32bdec2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20180908 +%global date 20180911 %global with_snapshot 1 -%global freebsd_rev 478244 +%global freebsd_rev 480450 %global freebsd_root %{name}-FreeBSD-patches-r%{freebsd_rev} %if 0%{?with_snapshot} %global gver .%{date}git%{shortcommit} %endif -# Build with only clang? +# Build with clang only? %global with_clang 0 # Use ALSA backend? @@ -118,8 +118,8 @@ Summary: Waterfox Web browser Name: waterfox -Version: 56.2.2 -Release: 4%{?gver}%{?dist} +Version: 56.2.3 +Release: 2%{?gver}%{?dist} URL: https://www.waterfoxproject.org License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?with_snapshot} @@ -183,14 +183,15 @@ Patch417: mozilla-1436242.patch %global wf_url https://github.com/MrAlex94/Waterfox #Patch???: %%{wf_url}/commit/commit.patch#/wf-commit.patch -Patch490: %{wf_url}/pull/547.patch#/wf-pull-547.patch # Debian patches Patch500: mozilla-440908.patch # Chinforinfula patches Patch700: %{name}-nolangpacks.patch -Patch701: %{name}-waterfoxdir.patch +# https://github.com/MrAlex94/Waterfox/pull/547.patch, down +Patch701: %{name}-waterfoxdir-1.patch +Patch702: %{name}-waterfoxdir-2.patch %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -364,8 +365,6 @@ This package contains results of tests executed during build. %patch416 -p1 -b .bug1375074-save-restore-x28 %patch417 -p1 -b .mozilla-1436242 -%patch490 -p1 - # Debian extension patch %patch500 -p1 -b .440908 @@ -389,7 +388,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1452576 1425930 1469914 1469309 1470260 1472925 \ + 702179 991253 1021761 1144632 1288587 1452576 \ 1388744 1413143 \ 1447519 do @@ -408,7 +407,8 @@ done # Install langpacks other way %patch700 -p1 -b .nolangpacks -%patch701 -p1 -b .waterfoxdir +%patch701 -p1 -b .waterfoxdir-1 +%patch702 -p1 -b .waterfoxdir-2 # Patch for big endian platforms only %if 0%{?big_endian} @@ -893,6 +893,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Sep 14 2018 Phantom X - 56.2.3-1.20180911git432b427 +- New release/snapshot + * Sun Sep 09 2018 Phantom X - 56.2.2-4.20180908git2294d45 - New snapshot - clang only build switch diff --git a/waterfox/wf-pull-547.patch b/waterfox/wf-pull-547.patch deleted file mode 100644 index 04650df..0000000 --- a/waterfox/wf-pull-547.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 74d572e611b12650b55d400fe2bbf350d392f26c Mon Sep 17 00:00:00 2001 -From: Toromino -Date: Fri, 11 May 2018 12:58:25 +0200 -Subject: [PATCH 1/3] Update GeckoProfileDirectories.java - ---- - .../src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java -index 2afb54bc4dd2..d7b2aaec7fa2 100644 ---- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java -+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfileDirectories.java -@@ -53,7 +53,7 @@ public NoSuchProfileException(String detailMessage) { - public boolean matches(INISection section); - } - -- private static final String MOZILLA_DIR_NAME = "mozilla"; -+ private static final String WATERFOX_DIR_NAME = "waterfox"; - - /** - * Returns true if the supplied profile entry represents the default profile. -@@ -116,14 +116,14 @@ public static String saltProfileName(final String name) { - */ - @RobocopTarget - public static File getMozillaDirectory(Context context) throws NoMozillaDirectoryException { -- final File mozillaDir = new File(context.getFilesDir(), MOZILLA_DIR_NAME); -+ final File mozillaDir = new File(context.getFilesDir(), WATERFOX_DIR_NAME); - if (mozillaDir.mkdirs() || mozillaDir.isDirectory()) { - return mozillaDir; - } - - // Although this leaks a path to the system log, the path is - // predictable (unlike a profile directory), so this is fine. -- throw new NoMozillaDirectoryException("Unable to create mozilla directory at " + mozillaDir.getAbsolutePath()); -+ throw new NoMozillaDirectoryException("Unable to create waterfox directory at " + mozillaDir.getAbsolutePath()); - } - - /** - -From 896a0eab58368c0862ef8c06224a287a8694d77a Mon Sep 17 00:00:00 2001 -From: Toromino -Date: Fri, 11 May 2018 13:31:20 +0200 -Subject: [PATCH 2/3] Update mozcrash.py - ---- - testing/mozbase/mozcrash/mozcrash/mozcrash.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/testing/mozbase/mozcrash/mozcrash/mozcrash.py b/testing/mozbase/mozcrash/mozcrash/mozcrash.py -index 2d778175bc43..8d2a4c4196fb 100644 ---- a/testing/mozbase/mozcrash/mozcrash/mozcrash.py -+++ b/testing/mozbase/mozcrash/mozcrash/mozcrash.py -@@ -521,18 +521,18 @@ def cleanup_pending_crash_reports(): - affecting test results; it is best to ensure that these are removed - before starting any browser tests. - -- Firefox stores pending crash reports in "/Crash Reports". -+ Waterfox stores pending crash reports in "/Crash Reports". - If the browser is not running, it cannot provide , so this - code tries to anticipate its value. - - See dom/system/OSFileConstants.cpp for platform variations of . - """ - if mozinfo.isWin: -- location = os.path.expanduser("~\\AppData\\Roaming\\Mozilla\\Firefox\\Crash Reports") -+ location = os.path.expanduser("~\\AppData\\Roaming\\Waterfox\\Crash Reports") - elif mozinfo.isMac: -- location = os.path.expanduser("~/Library/Application Support/firefox/Crash Reports") -+ location = os.path.expanduser("~/Library/Application Support/waterfox/Crash Reports") - else: -- location = os.path.expanduser("~/.mozilla/firefox/Crash Reports") -+ location = os.path.expanduser("~/.waterfox/Crash Reports") - logger = get_logger() - if os.path.exists(location): - try: - -From 17abfbf2f3fdab752dd0a4da125b227fbea6ed43 Mon Sep 17 00:00:00 2001 -From: Toromino -Date: Fri, 11 May 2018 13:53:08 +0200 -Subject: [PATCH 3/3] Update nsXREDirProvider.cpp - ---- - toolkit/xre/nsXREDirProvider.cpp | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index d17632c375f0..282ff041b6b7 100644 ---- a/toolkit/xre/nsXREDirProvider.cpp -+++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -294,16 +294,16 @@ GetSystemParentDirectory(nsIFile** aFile) - #if defined(XP_MACOSX) - rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, getter_AddRefs(localDir)); - if (NS_SUCCEEDED(rv)) { -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")); - } - #else - NS_NAMED_LITERAL_CSTRING(dirname, - #ifdef HAVE_USR_LIB64_DIR -- "/usr/lib64/mozilla" -+ "/usr/lib64/waterfox" - #elif defined(__OpenBSD__) || defined(__FreeBSD__) -- "/usr/local/lib/mozilla" -+ "/usr/local/lib/waterfox" - #else -- "/usr/lib/mozilla" -+ "/usr/lib/waterfox" - #endif - ); - rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); -@@ -415,7 +415,7 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, - rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false); - if (NS_SUCCEEDED(rv)) { - #if defined(XP_MACOSX) -- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")); -+ rv = localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")); - if (NS_SUCCEEDED(rv)) { - rv = localDir->AppendNative(NS_LITERAL_CSTRING("NativeMessagingHosts")); - } -@@ -479,9 +479,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/waterfox/extensions"; - #else -- static const char *const sysLExtDir = "/usr/share/mozilla/extensions"; -+ static const char *const sysLExtDir = "/usr/share/waterfox/extensions"; - #endif - return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), - false, aFile); -@@ -1289,7 +1289,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) - gAppData->name)))) { - return NS_ERROR_FAILURE; - } -- } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Mozilla")))) { -+ } else if (NS_FAILED(localDir->AppendNative(NS_LITERAL_CSTRING("Waterfox")))) { - return NS_ERROR_FAILURE; - } - -@@ -1314,7 +1314,7 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult) - // under SOFTWARE\Mozilla. - wchar_t regPath[1024] = { L'\0' }; - swprintf_s(regPath, mozilla::ArrayLength(regPath), L"SOFTWARE\\%S\\%S\\TaskBarIDs", -- (hasVendor ? gAppData->vendor : "Mozilla"), MOZ_APP_BASENAME); -+ (hasVendor ? gAppData->vendor : "Waterfox"), MOZ_APP_BASENAME); - - // If we pre-computed the hash, grab it from the registry. - pathHashResult = GetCachedHash(HKEY_LOCAL_MACHINE, -@@ -1640,7 +1640,7 @@ nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) - - #if defined (XP_MACOSX) || defined(XP_WIN) - -- static const char* const sXR = "Mozilla"; -+ static const char* const sXR = "Waterfox"; - rv = aFile->AppendNative(nsDependentCString(sXR)); - NS_ENSURE_SUCCESS(rv, rv); - -@@ -1729,7 +1729,7 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, - // XXXsmaug ...and the rest of the profile creation! - MOZ_ASSERT(!aAppName, - "Profile creation for external applications is not implemented!"); -- rv = aFile->AppendNative(nsDependentCString("mozilla")); -+ rv = aFile->AppendNative(nsDependentCString("waterfox")); - NS_ENSURE_SUCCESS(rv, rv); - #elif defined(XP_UNIX) - nsAutoCString folder; -- cgit