libre/iceweasel: Remove promo card for nonfree Firefox mobile in New Tab

Signed-off-by: Andreas Grapentin <andreas@grapentin.org>

2 files changed, 54 insertions, 2 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 21c12c4d1..5c4908dd2 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -86,9 +86,9 @@ sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
             'SKIP'
             '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
             'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
-            '091b32290e1cbb8597bd31c770f3b850d2cecc0e8ca591bb50956fde67c0a449'
+            'b64059188836fbb9522d0d0a0d669dfa77c4f075f350554e414bb023afbaea31'
             'SKIP'
-            'dcc25e04627842bbd160059f1c576397d688418198a225210fae8a5ea6c32a7a'
+            '82b6d93655f5d96d6eac526d83e95bf1620deb4202f7f0cb0ff33807df36773f'
             'd783225c311a4d64a9196d573627aeecaf02365395eea9783b1175b7613bdf6e'
             'f42b329e96cdf15d09844ca2541d096f56a5ca946f3d94d72dd10e3411fd5e85')
 sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 6ac39f8b1..746d098db 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -298,3 +298,55 @@ index edd871b..77870fe 100644
 
  addon-page-options-button =
      .title = Tools for all add-ons
+diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+index 02eb150..20eb672 100644
+--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+@@ -293,30 +293,6 @@ const ONBOARDING_MESSAGES = () => [
+     targeting: "trailheadTriplet == 'payoff' && isChinaRepack == false",
+     trigger: { id: "showOnboarding" },
+   },
+-  {
+-    id: "TRAILHEAD_CARD_6",
+-    template: "onboarding",
+-    bundled: 3,
+-    order: 6,
+-    content: {
+-      title: { string_id: "onboarding-mobile-phone-title" },
+-      text: { string_id: "onboarding-mobile-phone-text" },
+-      icon: "mobile",
+-      primary_button: {
+-        label: { string_id: "onboarding-mobile-phone-button" },
+-        action: {
+-          type: "OPEN_URL",
+-          data: {
+-            args: "https://www.mozilla.org/firefox/mobile/",
+-            where: "tabshifted",
+-          },
+-        },
+-      },
+-    },
+-    targeting:
+-      "trailheadTriplet in ['supercharge', 'static'] || ('dynamic' in trailheadTriplet && sync.mobileDevices < 1)",
+-    trigger: { id: "showOnboarding" },
+-  },
+   {
+     id: "TRAILHEAD_CARD_7",
+     template: "onboarding",
+diff --git a/browser/locales/en-US/browser/newtab/onboarding.ftl b/browser/locales/en-US/browser/newtab/onboarding.ftl
+index 106227c..4600bdc 100644
+--- a/browser/locales/en-US/browser/newtab/onboarding.ftl
++++ b/browser/locales/en-US/browser/newtab/onboarding.ftl
+@@ -114,12 +114,6 @@ onboarding-firefox-send-title = Keep Your Shared Files Private
+ onboarding-firefox-send-text2 = Upload your files to { -send-brand-name } to share them with end-to-end encryption and a link that automatically expires.
+ onboarding-firefox-send-button = Try { -send-brand-name }
+ 
+-onboarding-mobile-phone-title = Get { -brand-product-name } on Your Phone
+-onboarding-mobile-phone-text = Download { -brand-product-name } for iOS or Android and sync your data across devices.
+-# "Mobile" is short for mobile/cellular phone, "Browser" is short for web
+-# browser.
+-onboarding-mobile-phone-button = Download Mobile Browser
+-
+ onboarding-send-tabs-title = Instantly Send Yourself Tabs
+ # "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a
+ # tab's context menu.