summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2022-10-26 00:53:00 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2022-10-26 22:06:39 -0400
commitf1073704990f9139b34d75e2c66387d44f82e8d0 (patch)
tree5d983406a1308d00b6b736cee6681d81806ecb0e /libre/iceweasel
parent2427904c29e52f4e3c6b249bc228219c0648d1ad (diff)
[iceweasel]: upgrade to v106.0.1
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/9004-FSDG-misc.patch139
-rw-r--r--libre/iceweasel/PKGBUILD16
2 files changed, 128 insertions, 27 deletions
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index 7d1da5668..591daa0c3 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -334,15 +334,13 @@ index 44d36d3b28..6823855d56 100644
// These app marketplace icons are referenced based on the user's locale
// in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx
-diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-index 940332f27f..1f7378bbae 100644
+diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [
- ],
+@@ -649,321 +649,6 @@
},
},
-- {
+ {
- id: "PB_NEWTAB_FOCUS_PROMO",
- type: "default",
- template: "pb_newtab",
@@ -423,10 +421,6 @@ index 940332f27f..1f7378bbae 100644
- alt_text: {
- string_id: "spotlight-focus-promo-qr-code",
- },
-- image_overrides: {
-- de:
-- "chrome://browser/content/assets/klar-qr-code.svg",
-- },
- },
- marketplace_buttons: ["ios", "android"],
- },
@@ -449,7 +443,9 @@ index 940332f27f..1f7378bbae 100644
- ],
- lifetime: 12,
- },
-- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",
+- // Exclude the next 2 messages: 1) Klar for en 2) Klar for de
+- targeting:
+- "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en') && localeLanguageCode != 'de'",
- },
- {
- id: "PB_NEWTAB_KLAR_PROMO",
@@ -529,6 +525,109 @@ index 940332f27f..1f7378bbae 100644
- QR_code: {
- image_url:
- "chrome://browser/content/assets/klar-qr-code.svg",
+- alt_text: "Scan the QR code to get Firefox Klar",
+- },
+- marketplace_buttons: ["ios", "android"],
+- },
+- },
+- },
+- },
+- ],
+- },
+- },
+- },
+- },
+- },
+- priority: 2,
+- frequency: {
+- custom: [
+- {
+- cap: 3,
+- period: 604800000, // Max 3 per week
+- },
+- ],
+- lifetime: 12,
+- },
+- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",
+- },
+- {
+- id: "PB_NEWTAB_KLAR_PROMO_DE",
+- type: "default",
+- template: "pb_newtab",
+- groups: ["pbNewtab"],
+- content: {
+- infoBody: "fluent:about-private-browsing-info-description-simplified",
+- infoEnabled: true,
+- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",
+- infoLinkText: "fluent:about-private-browsing-learn-more-link",
+- infoTitle: "",
+- infoTitleEnabled: false,
+- promoEnabled: true,
+- promoType: "FOCUS",
+- promoHeader: "fluent:about-private-browsing-focus-promo-header-c",
+- promoImageLarge: "chrome://browser/content/assets/focus-promo.png",
+- promoLinkText: "fluent:about-private-browsing-focus-promo-cta",
+- promoLinkType: "button",
+- promoSectionStyle: "below-search",
+- promoTitle: "fluent:about-private-browsing-focus-promo-text-c",
+- promoTitleEnabled: true,
+- promoButton: {
+- action: {
+- type: "SHOW_SPOTLIGHT",
+- data: {
+- content: {
+- id: "FOCUS_PROMO",
+- template: "multistage",
+- modal: "tab",
+- backdrop: "transparent",
+- screens: [
+- {
+- id: "DEFAULT_MODAL_UI",
+- content: {
+- logo: {
+- imageURL:
+- "chrome://browser/content/assets/focus-logo.svg",
+- height: "48px",
+- },
+- title: {
+- string_id: "spotlight-focus-promo-title",
+- },
+- subtitle: {
+- string_id: "spotlight-focus-promo-subtitle",
+- },
+- dismiss_button: {
+- action: {
+- navigate: true,
+- },
+- },
+- ios: {
+- action: {
+- data: {
+- args:
+- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- android: {
+- action: {
+- data: {
+- args:
+- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",
+- where: "tabshifted",
+- },
+- type: "OPEN_URL",
+- navigate: true,
+- },
+- },
+- tiles: {
+- type: "mobile_downloads",
+- data: {
+- QR_code: {
+- image_url:
+- "chrome://browser/content/assets/klar-qr-code.svg",
- alt_text: {
- string_id: "spotlight-focus-promo-qr-code",
- },
@@ -554,21 +653,19 @@ index 940332f27f..1f7378bbae 100644
- ],
- lifetime: 12,
- },
-- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",
+- targeting: "localeLanguageCode == 'de'",
- },
- {
+- {
id: "PB_NEWTAB_INFO_SECTION",
template: "pb_newtab",
-
-diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm
-index a991581f7b..af57c3eea8 100644
+ content: {
+diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm
--- a/browser/components/newtab/lib/PanelTestProvider.jsm
+++ b/browser/components/newtab/lib/PanelTestProvider.jsm
-@@ -558,90 +558,6 @@ const MESSAGES = () => [
- frequency: { lifetime: 3 },
+@@ -557,87 +557,6 @@
trigger: { id: "defaultBrowserCheck" },
},
-- {
+ {
- id: "PB_FOCUS_PROMO",
- groups: ["panel-test-provider"],
- template: "spotlight",
@@ -636,9 +733,6 @@ index a991581f7b..af57c3eea8 100644
- alt_text: {
- string_id: "spotlight-focus-promo-qr-code",
- },
-- image_overrides: {
-- de: "chrome://browser/content/assets/klar-qr-code.svg",
-- },
- },
- email: {
- link_text: "Email yourself a link",
@@ -652,9 +746,10 @@ index a991581f7b..af57c3eea8 100644
- },
- trigger: { id: "defaultBrowserCheck" },
- },
- {
+- {
id: "PB_NEWTAB_VPN_PROMO",
template: "pb_newtab",
+ content: {
diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg
deleted file mode 100644
index f182567314..0000000000
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 261e0c84b..c037b8955 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,7 +70,7 @@
pkgname=iceweasel
epoch=1
-pkgver=105.0.2
+pkgver=106.0.1
pkgrel=1
pkgrel+=.parabola1
_brandingver=102.0-1
@@ -112,7 +112,7 @@ source_i686=(avoid-libxul-OOM-python-check.patch
firefox-106.0.1-fdlibm.patch
simd_avx2.patch
fix-i686-build-moz-1792159.patch)
-sha256sums=('fb1ed65cd9e6698122885fe38984cfd00018c7a837109f511762b2986b391e25'
+sha256sums=('bdf8184f9aadce4fd9613ec63525a96891e2e9dbbef9e4f72193038450a7fd35'
'SKIP'
'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'
@@ -120,7 +120,8 @@ sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'
'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf'
'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b'
'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1'
- '370dd0855d8ec56970fb389bdb69f5e44465e4d66be1b38f23589653923086a2'
+# 'e66bc271b35e0eabe1e8a67802ce95ea3742d73006b8ad37bbce225457366458'
+ '0c5333c4fc28ba9ca5b4d00127918d662fe8c570d4ebc0a64e5174e0ef41ae01'
'6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65'
'5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45'
'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be')
@@ -218,6 +219,8 @@ _check_build_config() {
_check_patching() {
pushd "${srcdir}"/firefox-${pkgver} > /dev/null
+ echo "verifying libre patching"
+
# URI protocol handlers
local uri_handlers=uriloader/exthandler/HandlerList.jsm
local webmails='google|yahoo'
@@ -563,7 +566,9 @@ END
# Remove remaining non-free bits
echo "applying 9004-FSDG-misc.patch"
patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9004-FSDG-misc.patch
- rm toolkit/crashreporter/tools/upload_symbols.py
+
+ echo "removing remaining non-free bits"
+ rm -v toolkit/crashreporter/tools/upload_symbols.py
rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a
@@ -672,6 +677,7 @@ END
echo "Removing instrumented browser..."
./mach clobber
+ echo "Building optimized browser..."
cat >.mozconfig ../mozconfig - <<END
ac_add_options --enable-lto=cross
ac_add_options --enable-profile-use=cross
@@ -688,7 +694,7 @@ END
## main build ##
- echo "Building optimized browser..."
+ (( ! $_should_skip_pgo )) || echo "Building optimized browser..."
./mach build
# echo "Building symbol archive..." # anti-feature