add 94.0 patches that should be included

10 files changed, 261 insertions, 1 deletions

diff --git a/add-language-warning.patch b/add-language-warning.patch
new file mode 100644
index 0000000..fad50f7
--- /dev/null
+++ b/add-language-warning.patch
@@ -0,0 +1,8 @@
+--- a/browser/locales/en-US/browser/preferences/languages.ftl
++++ b/browser/locales/en-US/browser/preferences/languages.ftl
+@@ -70,4 +70,4 @@
+ browser-languages-installed-label = Installed languages
+ browser-languages-available-label = Available languages
+ 
+-browser-languages-error = { -brand-short-name } can’t update your languages right now. Check that you are connected to the internet or try again.
++browser-languages-error = { -brand-short-name } forces your language to en-US in order to protect your privacy. If you still want to make this change, check our FAQ.
diff --git a/allow-ubo-private-mode.patch b/allow-ubo-private-mode.patch
new file mode 100644
index 0000000..ef08f46
--- /dev/null
+++ b/allow-ubo-private-mode.patch
@@ -0,0 +1,18 @@
+--- a/toolkit/components/extensions/Extension.jsm
++++ b/toolkit/components/extensions/Extension.jsm
+@@ -2658,6 +2658,15 @@
+         this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
+       }
+ 
++      if (this.id === "uBlock0@raymondhill.net") {
++        ExtensionPermissions.add(this.id, {
++          permissions: [PRIVATE_ALLOWED_PERMISSION],
++          origins: [],
++        });
++        this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
++      }
++
++
+       // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during install and
+       // upgrade/downgrade startups.
+       if (INSTALL_AND_UPDATE_STARTUP_REASONS.has(this.startupReason)) {
diff --git a/librewolf.spec b/librewolf.spec
index 26d98f5..7d4ae44 100644
--- a/librewolf.spec
+++ b/librewolf.spec
@@ -412,6 +412,15 @@ Patch905: megabar.patch
 Patch906: reduce-rust-debuginfo.patch
 Patch907: mozilla-vpn-ad.patch
 Patch908: context-menu.patch
+Patch909: mozilla_dirs.patch
+Patch910: allow-ubo-private-mode.patch
+Patch911: add-language-warning.patch
+Patch912: pref-naming.patch
+Patch913: remove-branding-urlbar.patch
+Patch914: remove-cfrprefs.patch
+Patch915: remove-organization-policy-banner.patch
+Patch916: remove-snippets-from-home.patch
+Patch917: sanitizing-description.patch
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
@@ -515,6 +524,15 @@ This package contains results of tests executed during build.
 %patch906 -p1
 %patch907 -p1
 %patch908 -p1
+%patch909 -p1
+%patch910 -p1
+%patch911 -p1
+%patch912 -p1
+%patch913 -p1
+%patch914 -p1
+%patch915 -p1
+%patch916 -p1
+%patch917 -p1
 sed -i '/"pocket"/d' browser/components/moz.build
 sed -i "/SaveToPocket\.init/d" browser/components/BrowserGlue.jsm
 sed -i -r -e '/organizationalUnit.{0,5}=.{0,5}Mozilla/{N;N;N;d}' toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -1119,7 +1137,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Nov 16 2021 B. Stack <bgstack15@gmail.com> - 94.0-1
+* Wed Nov 17 2021 B. Stack <bgstack15@gmail.com> - 94.0-1
 - Fork to librewolf release.
 
 * Mon Nov 1 2021 Martin Stransky <stransky@redhat.com> - 94.0-1
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);
+ 
diff --git a/pref-naming.patch b/pref-naming.patch
new file mode 100644
index 0000000..6b462af
--- /dev/null
+++ b/pref-naming.patch
@@ -0,0 +1,66 @@
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
+@@ -140,7 +140,7 @@
+     .accesskey = D
+ 
+ startup-restore-windows-and-tabs =
+-    .label = Open previous windows and tabs
++    .label = Open previous windows and tabs (requires enabling browsing history)
+     .accesskey = s
+ 
+ startup-restore-warn-on-quit =
+@@ -252,7 +252,7 @@
+     .label = Choose…
+     .accesskey = o
+ 
+-choose-browser-language-description = Choose the languages used to display menus, messages, and notifications from { -brand-short-name }.
++choose-browser-language-description = Choose the languages used to display menus, messages, and notifications from { -brand-short-name }. Please notice that, to preserve your privacy, { -brand-short-name } forces en-US as the default language.
+ manage-browser-languages-button =
+   .label = Set Alternatives…
+   .accesskey = l
+@@ -409,13 +409,13 @@
+     .label = Play DRM-controlled content
+     .accesskey = P
+ 
+-play-drm-content-learn-more = Learn more
++play-drm-content-learn-more = Why we disable it
+ 
+ update-application-title = { -brand-short-name } Updates
+ 
+ update-application-description = Keep { -brand-short-name } up to date for the best performance, stability, and security.
+ 
+-update-application-version = Version { $version } <a data-l10n-name="learn-more">What’s new</a>
++update-application-version = Version { $version } <a data-l10n-name="learn-more">Visit the repositories</a>
+ 
+ update-history =
+     .label = Show Update History…
+@@ -568,7 +568,7 @@
+ # "Firefox" should be treated as a brand and kept in English,
+ # while "Home" and "(Default)" can be localized.
+ home-mode-choice-default =
+-    .label = Firefox Home (Default)
++    .label = Homepage (Default)
+ 
+ home-mode-choice-custom =
+     .label = Custom URLs…
+@@ -597,8 +597,8 @@
+ 
+ ## Home Section - Firefox Home Content Customization
+ 
+-home-prefs-content-header = Firefox Home Content
+-home-prefs-content-description = Choose what content you want on your Firefox Home screen.
++home-prefs-content-header = Homepage Content
++home-prefs-content-description = Choose what content you want on your Homepage screen.
+ 
+ home-prefs-search-header =
+     .label = Web Search
+@@ -650,7 +650,7 @@
+ home-prefs-snippets-header =
+     .label = Snippets
+ 
+-home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name }
++home-prefs-snippets-description-new = Tips and news from { -vendor-short-name }
+ 
+ home-prefs-sections-rows-option =
+     .label =
+
diff --git a/remove-branding-urlbar.patch b/remove-branding-urlbar.patch
new file mode 100644
index 0000000..e005458
--- /dev/null
+++ b/remove-branding-urlbar.patch
@@ -0,0 +1,11 @@
+--- a/browser/locales/en-US/browser/browser.ftl
++++ b/browser/locales/en-US/browser/browser.ftl
+@@ -543,7 +543,7 @@
+ # A label shown above the "Firefox Suggest" (bookmarks/history) group in the
+ # urlbar results.
+ urlbar-group-firefox-suggest =
+-  .label = { -firefox-suggest-brand-name }
++  .label = Suggestions
+ 
+ # A label shown above the search suggestions group in the urlbar results. It
+ # should use title case.
diff --git a/remove-cfrprefs.patch b/remove-cfrprefs.patch
new file mode 100644
index 0000000..f01d860
--- /dev/null
+++ b/remove-cfrprefs.patch
@@ -0,0 +1,19 @@
+--- a/browser/components/preferences/main.inc.xhtml
++++ b/browser/components/preferences/main.inc.xhtml
+@@ -665,14 +665,14 @@
+             preference="media.hardwaremediakeys.enabled"/>
+     <label id="mediaControlLearnMore" class="learnMore" data-l10n-id="browsing-media-control-learn-more" is="text-link"/>
+   </hbox>
+-  <hbox align="center" data-subcategory="cfraddons">
++  <hbox align="center" data-subcategory="cfraddons" hidden="true">
+     <checkbox id="cfrRecommendations"
+             class="tail-with-learn-more"
+             data-l10n-id="browsing-cfr-recommendations"
+             preference="browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons"/>
+     <label id="cfrLearnMore" class="learnMore" data-l10n-id="browsing-cfr-recommendations-learn-more" is="text-link"/>
+   </hbox>
+-  <hbox align="center" data-subcategory="cfrfeatures">
++  <hbox align="center" data-subcategory="cfrfeatures" hidden="true">
+     <checkbox id="cfrRecommendations-features"
+             class="tail-with-learn-more"
+             data-l10n-id="browsing-cfr-features"
diff --git a/remove-organization-policy-banner.patch b/remove-organization-policy-banner.patch
new file mode 100644
index 0000000..688c17c
--- /dev/null
+++ b/remove-organization-policy-banner.patch
@@ -0,0 +1,11 @@
+--- a/browser/components/preferences/preferences.js
++++ b/browser/components/preferences/preferences.js
+@@ -161,8 +161,6 @@
+     this.removeAttribute("keyboard-navigation");
+   });
+ 
+-  maybeDisplayPoliciesNotice();
+-
+   window.addEventListener("hashchange", onHashChange);
+ 
+   gotoPref().then(() => {
diff --git a/remove-snippets-from-home.patch b/remove-snippets-from-home.patch
new file mode 100644
index 0000000..4bd88ca
--- /dev/null
+++ b/remove-snippets-from-home.patch
@@ -0,0 +1,22 @@
+--- a/browser/components/newtab/lib/AboutPreferences.jsm
++++ b/browser/components/newtab/lib/AboutPreferences.jsm
+@@ -54,18 +54,7 @@
+   },
+ ];
+ 
+-const PREFS_AFTER_SECTIONS = () => [
+-  {
+-    id: "snippets",
+-    pref: {
+-      feed: "feeds.snippets",
+-      titleString: "home-prefs-snippets-header",
+-      descString: "home-prefs-snippets-description-new",
+-    },
+-    icon: "chrome://global/skin/icons/info.svg",
+-    eventSource: "SNIPPETS",
+-  },
+-];
++const PREFS_AFTER_SECTIONS = () => [];
+ 
+ this.AboutPreferences = class AboutPreferences {
+   init() {
diff --git a/sanitizing-description.patch b/sanitizing-description.patch
new file mode 100644
index 0000000..0909d54
--- /dev/null
+++ b/sanitizing-description.patch
@@ -0,0 +1,11 @@
+--- a/browser/locales/en-US/browser/sanitize.ftl
++++ b/browser/locales/en-US/browser/sanitize.ftl
+@@ -19,7 +19,7 @@
+     .title = Clear All History
+     .style = width: 34em
+ 
+-clear-data-settings-label = When closed, { -brand-short-name } should automatically clear all
++clear-data-settings-label = When closed, { -brand-short-name } should automatically clear all (this will bypass your cookie exceptions)
+ 
+ ## clear-time-duration-prefix is followed by a dropdown list, with
+ ## values localized using clear-time-duration-value-* messages.