firefox: patch external links for addons & update gnuzilla addon url
This commit is contained in:
parent
98fa1b2279
commit
1e6aa228d5
3 changed files with 105 additions and 7 deletions
|
|
@ -0,0 +1,98 @@
|
|||
diff --git a/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs b/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs
|
||||
index ba47adb6..c4b29ec4 100644
|
||||
--- a/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs
|
||||
+++ b/browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs
|
||||
@@ -704,7 +704,7 @@ const MR_ABOUT_WELCOME_DEFAULT = {
|
||||
action: {
|
||||
type: "OPEN_URL",
|
||||
data: {
|
||||
- args: "https://addons.mozilla.org/en-US/firefox/collections/4757633/b4d5649fb087446aa05add5f0258c3/?page=1&collection_sort=-popularity",
|
||||
+ args: "https://gnuzilla.gnu.org/",
|
||||
where: "tabshifted",
|
||||
},
|
||||
navigate: true,
|
||||
@@ -750,49 +750,6 @@ const MR_ABOUT_WELCOME_DEFAULT = {
|
||||
},
|
||||
targeting: "isFxASignedIn",
|
||||
},
|
||||
- {
|
||||
- id: "AW_ACCOUNT_LOGIN",
|
||||
- content: {
|
||||
- fullscreen: true,
|
||||
- position: "split",
|
||||
- split_narrow_bkg_position: "-228px",
|
||||
- image_alt_text: {
|
||||
- string_id: "mr2022-onboarding-gratitude-image-alt",
|
||||
- },
|
||||
- background:
|
||||
- "url('chrome://activity-stream/content/data/content/assets/fox-doodle-waving-laptop.svg') center center / 80% no-repeat var(--mr-screen-background-color)",
|
||||
- progress_bar: true,
|
||||
- logo: {},
|
||||
- title: {
|
||||
- string_id: "onboarding-sign-up-title",
|
||||
- },
|
||||
- subtitle: {
|
||||
- string_id: "onboarding-sign-up-description",
|
||||
- },
|
||||
- secondary_button: {
|
||||
- label: {
|
||||
- string_id: "mr2-onboarding-start-browsing-button-label",
|
||||
- },
|
||||
- style: "secondary",
|
||||
- action: {
|
||||
- navigate: true,
|
||||
- },
|
||||
- },
|
||||
- primary_button: {
|
||||
- label: {
|
||||
- string_id: "onboarding-sign-up-button",
|
||||
- },
|
||||
- action: {
|
||||
- data: {
|
||||
- entrypoint: "newuser-onboarding-desktop",
|
||||
- },
|
||||
- type: "FXA_SIGNIN_FLOW",
|
||||
- navigate: true,
|
||||
- },
|
||||
- },
|
||||
- },
|
||||
- targeting: "!isFxASignedIn",
|
||||
- },
|
||||
],
|
||||
};
|
||||
|
||||
diff --git a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
|
||||
index 29d2ca46..41b65ac4 100644
|
||||
--- a/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
|
||||
+++ b/browser/components/asrouter/modules/FeatureCalloutMessages.sys.mjs
|
||||
@@ -885,7 +885,7 @@ const MESSAGES = () => {
|
||||
dismiss: true,
|
||||
type: "OPEN_URL",
|
||||
data: {
|
||||
- args: "https://addons.mozilla.org/en-US/firefox/collections/4757633/36d285535db74c6986abbeeed3e214/?page=1&collection_sort=added",
|
||||
+ args: "https://gnuzilla.gnu.org/",
|
||||
where: "tabshifted",
|
||||
},
|
||||
},
|
||||
diff --git a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
||||
index abc6db68..0c86955f 100644
|
||||
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
||||
+++ b/browser/components/asrouter/modules/OnboardingMessageProvider.sys.mjs
|
||||
@@ -1226,7 +1226,7 @@ const BASE_MESSAGES = () => [
|
||||
{
|
||||
type: "OPEN_URL",
|
||||
data: {
|
||||
- args: "https://addons.mozilla.org/en-US/firefox/collections/4757633/b4d5649fb087446aa05add5f0258c3/?page=1&collection_sort=-popularity",
|
||||
+ args: "https://gnuzilla.gnu.org/",
|
||||
where: "current",
|
||||
},
|
||||
},
|
||||
@@ -1430,7 +1430,7 @@ const BASE_MESSAGES = () => [
|
||||
{
|
||||
type: "OPEN_URL",
|
||||
data: {
|
||||
- args: "https://addons.mozilla.org/en-US/firefox/collections/4757633/b4d5649fb087446aa05add5f0258c3/?page=1&collection_sort=-popularity",
|
||||
+ args: "https://gnuzilla.gnu.org/",
|
||||
where: "current",
|
||||
},
|
||||
},
|
||||
|
|
@ -62,7 +62,7 @@ pref("general.useragent.compatMode.abrowser",true);
|
|||
pref ("browser.startup.homepage_override.mstone", "ignore");
|
||||
|
||||
// Preferences for the Get Add-ons panel
|
||||
pref ("extensions.webservice.discoverURL", "https://gnuzilla.gnu.org/mozzarella/");
|
||||
pref ("extensions.webservice.discoverURL", "https://gnuzilla.gnu.org/");
|
||||
pref ("extensions.getAddons.search.url", "https://trisquel.info");
|
||||
|
||||
// Help URL
|
||||
|
|
@ -278,11 +278,11 @@ pref("extensions.htmlaboutaddons.discover.enabled", false);
|
|||
pref("extensions.htmlaboutaddons.recommendations.enabled", false);
|
||||
pref("extensions.getAddons.cache.enabled", false);
|
||||
pref("extensions.getAddons.get.url", "");
|
||||
pref("extensions.getAddons.link.url", "https://gnuzilla.gnu.org/mozzarella/");
|
||||
pref("extensions.getAddons.link.url", "https://gnuzilla.gnu.org/");
|
||||
pref("extensions.getAddons.langpacks.url", "");
|
||||
pref("extensions.getAddons.discovery.api_url", "");
|
||||
pref("extensions.recommendations.privacyPolicyUrl", "https://trisquel.info/legal");
|
||||
pref("extensions.getAddons.search.browseURL", "https://gnuzilla.gnu.org/mozzarella/search.php?q=%TERMS%");
|
||||
pref("extensions.getAddons.search.browseURL", "https://gnuzilla.gnu.org/search.php?q=%TERMS%");
|
||||
|
||||
// Disable pingback on first run
|
||||
pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=123
|
||||
VERSION=124
|
||||
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
||||
REPOKEY=9BDB3D89CE49EC21
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ REPOKEY=9BDB3D89CE49EC21
|
|||
GLEAN_CONF_RS_INITIAL=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}')
|
||||
# GNUZILLA ADDON REPLACEMENT
|
||||
OLD_WEB_DEV_URL="https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/"
|
||||
WEB_DEV_URL="https://gnuzilla.gnu.org/mozzarella/category.php?id=web-development"
|
||||
WEB_DEV_URL="https://gnuzilla.gnu.org/category.php?id=web-development"
|
||||
|
||||
rm debian/control
|
||||
sed "s|Safe and easy web browser from Mozilla|Safe and easy web browser from Mozilla by Trisquel|" \
|
||||
|
|
@ -136,7 +136,7 @@ sed -i 's|\(pref("media\.gmp-widevinecdm-l1\.chromium-guid", \)"[^"]*"|\1""|' $B
|
|||
sed -i 's|\(pref("media\.gmp-widevinecdm\.chromium-guid", \)"[^"]*"|\1""|' $BAP_FirefoxJs
|
||||
|
||||
# Replace mozilla url addons button
|
||||
sed -i '/extensions.getAddons.link.url/s|https://addons.mozilla.org/%LOCALE%/firefox/|https://gnuzilla.gnu.org/mozzarella/|' $BAP_FirefoxJs
|
||||
sed -i '/extensions.getAddons.link.url/s|https://addons.mozilla.org/%LOCALE%/firefox/|https://gnuzilla.gnu.org/|' $BAP_FirefoxJs
|
||||
|
||||
# Update third_party/rust/glean/src/configuration.rs sha256sum at third_party/rust/glean/.cargo-checksum.json
|
||||
GLEAN_CONF_RS_MODIFIED=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}')
|
||||
|
|
@ -425,7 +425,7 @@ grep -lr addons-help toolkit/mozapps/extensions/ | xargs -r sed -i 's|addons-hel
|
|||
sed -i "/browser.discovery.sites/s|addons.mozilla.org|gnuzilla.gnu.org|" $BAP_FirefoxJs
|
||||
sed -i "/lightweightThemes.getMoreURL/s|https://addons.mozilla.org/.*themes||" $BAP_FirefoxJs
|
||||
|
||||
#Fixes by patch on source, see DATA/firefox/patches for more info.
|
||||
# Fixes by patch on source, see DATA/firefox/patch_changes for more info.
|
||||
apply_patch_changes
|
||||
|
||||
# Postinst script to manage profile migration and system links
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue