From 57692cf11e748f511305199cdfffa6412effd214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 14 Jun 2022 08:01:03 +0000
Subject: [PATCH] firefox: update patch to remove campaign.
---
...emove_moreFromMozilla_Focus_and_Klar.patch | 23 +++++++++----------
helpers/make-firefox | 3 ++-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
index 7a9eb21c..9bb7f028 100644
--- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
@@ -61,13 +61,14 @@ diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referen
// layout/mathml/nsMathMLChar.cpp
diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm source/browser/components/newtab/lib/OnboardingMessageProvider.jsm
---- source_orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-05-22 09:35:55.448674482 +0000
-+++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-05-22 21:37:23.090968112 +0000
-@@ -96,221 +96,6 @@
+--- source_orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-06-08 17:44:48.000000000 -0500
++++ source/browser/components/newtab/lib/OnboardingMessageProvider.jsm 2022-06-13 23:03:00.516557944 -0500
+@@ -96,220 +96,6 @@
},
},
{
- id: "PB_NEWTAB_FOCUS_PROMO",
+- type: "default",
- template: "pb_newtab",
- groups: ["pbNewtab"],
- content: {
@@ -94,12 +95,10 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js
- id: "FOCUS_PROMO",
- template: "multistage",
- modal: "tab",
-- metrics: "block",
- backdrop: "transparent",
- screens: [
- {
- id: "DEFAULT_MODAL_UI",
-- order: 0,
- content: {
- logo: {
- imageURL:
@@ -168,16 +167,17 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js
- frequency: {
- custom: [
- {
-- cap: 1,
-- period: 604800000, // Max 1 per week
+- cap: 3,
+- period: 604800000, // Max 3 per week
- },
- ],
-- lifetime: 3,
+- lifetime: 12,
- },
- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",
- },
- {
- id: "PB_NEWTAB_KLAR_PROMO",
+- type: "default",
- template: "pb_newtab",
- groups: ["pbNewtab"],
- content: {
@@ -205,7 +205,6 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js
- id: "KLAR_PROMO",
- template: "multistage",
- modal: "tab",
-- metrics: "block",
- backdrop: "transparent",
- screens: [
- {
@@ -273,11 +272,11 @@ diff -Nru source_orig/browser/components/newtab/lib/OnboardingMessageProvider.js
- frequency: {
- custom: [
- {
-- cap: 1,
-- period: 604800000, // Max 1 per week
+- cap: 3,
+- period: 604800000, // Max 3 per week
- },
- ],
-- lifetime: 3,
+- lifetime: 12,
- },
- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",
- },
diff --git a/helpers/make-firefox b/helpers/make-firefox
index 9dfb9268..2935ea49 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -2,6 +2,7 @@
#
# Copyright (C) 2008-2021 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
+# Copyright (C) 2022 Luis Guzman <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=89
+VERSION=90
EXTERNAL='deb-src https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
REPOKEY=9BDB3D89CE49EC21
--
GitLab