summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2023-07-04 21:39:01 +0200
committerbill-auger <mr.j.spam.me@gmail.com>2023-07-08 01:19:22 -0400
commit7476960c2b4b3b490c5e70b69d6d8a530128b58b (patch)
tree76a1bb464c02dd5ae32a2a5cc9247eafec3d64dd /libre/iceweasel
parentca05e4f319cd7da542471fe1e4935a6d21b82beb (diff)
libre/iceweasel: 115.0-1.parabola1
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch6
-rw-r--r--libre/iceweasel/9004-FSDG-misc.patch133
-rw-r--r--libre/iceweasel/PKGBUILD32
3 files changed, 91 insertions, 80 deletions
diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
index 96a8b615b..5c988def2 100644
--- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
+++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
@@ -108,7 +108,7 @@ index 1d9e4cb79b..7c1f9895fc 100644
// environment variables still apply.
//
// --stage: use stage Remote Settings
--// (`https://settings-cdn.stage.mozaws.net/v1`) rather than production
+-// (`https://firefox.settings.services.allizom.org/v1`) rather than production
-// (`https://firefox.settings.services.mozilla.com/v1`)
+// (`resource://app/defaults/settings/`) rather than production
+// (`resource://app/defaults/settings/`)
@@ -129,10 +129,10 @@ index 2d15977ae2..815bf5cac9 100644
- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
+ "resource://app/defaults/settings/main/search-config.json",
"stage-main":
-- "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
+- "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records",
+ "resource://app/defaults/settings/main/search-config.json",
"stage-preview":
-- "https://settings.stage.mozaws.net/v1/buckets/main-preview/collections/search-config/records",
+- "https://firefox.settings.services.allizom.org/v1/buckets/main-preview/collections/search-config/records",
+ "resource://app/defaults/settings/main/search-config.json",
},
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index 4d2680c6a..c6d8e92b1 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -129,22 +129,20 @@ index 76b495ea6c..d0c2b98b11 100644
pref("browser.preferences.defaultPerformanceSettings.enabled", true);
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
-index 4c59b84a7c..44d36d3b28 100644
+index df8a1997a7..40696ea097 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
-@@ -136,17 +135,6 @@ var whitelist = [
+@@ -147,15 +147,6 @@ var whitelist = [
// extensions/pref/autoconfig/src/nsReadConfig.cpp
{ file: "resource://gre/defaults/autoconfig/prefcalls.js" },
- // browser/components/preferences/moreFromMozilla.js
- // These files URLs are constructed programatically at run time.
- {
-- file:
-- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
+- file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",
- },
- {
-- file:
-- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
+- file: "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",
- },
-
{ file: "resource://gre/greprefs.js" },
@@ -232,7 +230,7 @@ index 1208a5dbcd..ff91f7421e 100644
if (BrowserUtils.shouldShowVPNPromo()) {
const vpn = {
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index f6dc2b3781..34c7d8c528 100644
+index 115a67c962..3f9b72b021 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -10,7 +10,6 @@
@@ -243,23 +241,22 @@ index f6dc2b3781..34c7d8c528 100644
/* import-globals-from findInPage.js */
/* import-globals-from /browser/base/content/utilityOverlay.js */
/* import-globals-from /toolkit/content/preferencesBindings.js */
-@@ -203,14 +202,6 @@ function init_all() {
+@@ -227,13 +226,6 @@ function init_all() {
register_module("paneExperimental", gExperimentalPane);
}
- NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true });
- if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) {
- document.getElementById("category-more-from-mozilla").hidden = false;
-- gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable(
-- "template"
-- );
+- gMoreFromMozillaPane.option =
+- NimbusFeatures.moreFromMozilla.getVariable("template");
- register_module("paneMoreFromMozilla", gMoreFromMozillaPane);
- }
// The Sync category needs to be the last of the "real" categories
// registered and inititalized since many tests wait for the
// "sync-pane-loaded" observer notification before starting the test.
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 37544d2092..32b95bf95e 100644
+index a355a63d64..835cebe655 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -31,7 +31,6 @@
@@ -268,8 +265,8 @@ index 37544d2092..32b95bf95e 100644
<link rel="localization" href="browser/preferences/fonts.ftl"/>
- <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>
<link rel="localization" href="browser/preferences/preferences.ftl"/>
- <link rel="localization" href="locales-preview/translations.ftl"/>
<link rel="localization" href="toolkit/branding/accounts.ftl"/>
+ <link rel="localization" href="toolkit/branding/brandings.ftl"/>
@@ -156,16 +155,6 @@
<image class="category-icon"/>
<label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>
@@ -311,7 +308,7 @@ for the same reasons as the original Firefox.
browser/app/profile/firefox.js | 2 +-
.../static/browser_all_files_referenced.js | 2 -
.../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------
- .../newtab/lib/PanelTestProvider.jsm | 84 -------
+ .../newtab/lib/PanelTestProvider.sys.mjs | 84 -------
.../content/assets/focus-qr-code.svg | 114 ----------
.../content/assets/klar-qr-code.svg | 114 ----------
6 files changed, 1 insertion(+), 530 deletions(-)
@@ -319,38 +316,40 @@ for the same reasons as the original Firefox.
delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index d0c2b98b11..54cc9de7e6 100644
+index d0eeab95fa..f69cab44a1 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g
+@@ -2013,7 +2013,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g
pref("browser.promo.focus.disallowed_regions", "cn");
// Default to enabling focus promos to be shown where allowed.
-pref("browser.promo.focus.enabled", true);
+pref("browser.promo.focus.enabled", false);
- // Comma separated string of mozilla vpn supported platforms.
- pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
+ // Default to enabling pin promos to be shown where allowed.
+ pref("browser.promo.pin.enabled", true);
diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
-index 44d36d3b28..6823855d56 100644
+index df8a1997a7..d3cafd9c7f 100644
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
-@@ -32,8 +32,6 @@ var gExceptionPaths = [
- "chrome://activity-stream/content/data/content/assets/remote/",
+@@ -35,8 +35,6 @@ var gExceptionPaths = [
+ "chrome://activity-stream/content/data/content/assets/person-typing.svg",
"chrome://browser/content/assets/moz-vpn.svg",
"chrome://browser/content/assets/vpn-logo.svg",
- "chrome://browser/content/assets/focus-promo.png",
- "chrome://browser/content/assets/klar-qr-code.svg",
- // These app marketplace icons are referenced based on the user's locale
- // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx
-diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+ // toolkit/components/pdfjs/content/build/pdf.js
+ "resource://pdf.js/web/images/",
+diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+index bcc02aba5f..6a36bfb797 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -649,321 +649,6 @@
+@@ -513,315 +513,6 @@ const BASE_MESSAGES = () => [
+ ],
},
},
- {
+- {
- id: "PB_NEWTAB_FOCUS_PROMO",
- type: "default",
- template: "pb_newtab",
@@ -403,8 +402,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -414,8 +412,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -510,8 +507,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- 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",
+- 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",
@@ -521,8 +517,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- 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",
+- 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",
@@ -613,8 +608,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- 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",
+- 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",
@@ -624,8 +618,7 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- 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",
+- 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",
@@ -665,17 +658,18 @@ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/
- },
- targeting: "localeLanguageCode == 'de'",
- },
-- {
+ {
id: "PB_NEWTAB_INFO_SECTION",
template: "pb_newtab",
- 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
-@@ -557,87 +557,6 @@
+diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+index b5ff59290a..eb5fc60451 100644
+--- a/browser/components/newtab/lib/PanelTestProvider.sys.mjs
++++ b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
+@@ -367,85 +367,6 @@ const MESSAGES = () => [
+ frequency: { lifetime: 3 },
trigger: { id: "defaultBrowserCheck" },
},
- {
+- {
- id: "PB_FOCUS_PROMO",
- groups: ["panel-test-provider"],
- template: "spotlight",
@@ -705,8 +699,7 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
- ios: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -716,8 +709,7 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
- android: {
- action: {
- data: {
-- args:
-- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
+- args: "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",
- where: "tabshifted",
- },
- type: "OPEN_URL",
@@ -756,10 +748,9 @@ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/componen
- },
- 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
@@ -1086,7 +1077,7 @@ so this can still be a privacy concern. BTW, POST is the default search
method when searching directly from DDG HTML home page.
2. Remove suspicious t=ffab URL parameter, because it can tell DDG that
- this particular search extension is the origin of the search.`
+ this particular search extension is the origin of the search.
Private search engine that doesn't track its users, huh?
@@ -1097,7 +1088,7 @@ Private search engine that doesn't track its users, huh?
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json
-index 56295197aa..475133c208 100644
+index 1e1bffed47..14b6cf9f5a 100644
--- a/browser/components/search/extensions/ddg/manifest.json
+++ b/browser/components/search/extensions/ddg/manifest.json
@@ -1,6 +1,6 @@
@@ -1107,9 +1098,9 @@ index 56295197aa..475133c208 100644
+ "name": "DuckDuckGo HTML",
+ "description": "Search DuckDuckGo HTML",
"manifest_version": 2,
- "version": "1.3",
+ "version": "1.4",
"browser_specific_settings": {
-@@ -18,10 +18,9 @@
+@@ -16,10 +16,9 @@
"chrome_settings_overrides": {
"search_provider": {
"keyword": ["@duckduckgo", "@ddg"],
@@ -1221,11 +1212,11 @@ index a52cde5532..251acad0f8 100644
+-firefoxview-brand-name = Iceweasel View
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
-index 1b29e8d..6f7566c 100644
+index 829c18c5e1..71c75114e9 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
-@@ -714,16 +714,6 @@ sync-signedout-account-signin2 =
- .label = Sign in to { -sync-brand-short-name }…
+@@ -838,16 +838,6 @@ sync-signedout-account-signin3 =
+ .label = Sign in to sync…
.accesskey = i
-# This message contains two links and two icon images.
@@ -1238,7 +1229,7 @@ index 1b29e8d..6f7566c 100644
-# to your language, but should not be changed or translated.
-sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.
-
- ## Firefox Account - Signed in
+ ## Firefox account - Signed in
sync-profile-picture =
diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
@@ -1277,18 +1268,26 @@ index 5ac8a7b08c..fec81698e3 100644
vpn-banner-header = Protection that extends beyond the browser
# Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
-index e33c814f62..5698f2b3e9 100644
+index 1374c30fd7..0d70747bf7 100644
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
-@@ -303,8 +303,6 @@
- </div>
- <p class="content" data-l10n-id="vpn-header-content"></p>
- <p class="content subscribed" data-l10n-id="vpn-header-content-subscribed">
-- <a target="_blank" id="vpn-google-playstore-link" data-l10n-name="vpn-google-playstore-link"></a>
-- <a target="_blank" id="vpn-app-store-link" data-l10n-name="vpn-app-store-link"></a>
+@@ -572,16 +572,6 @@
+ class="content subscribed"
+ data-l10n-id="vpn-header-content-subscribed"
+ >
+- <a
+- target="_blank"
+- id="vpn-google-playstore-link"
+- data-l10n-name="vpn-google-playstore-link"
+- ></a>
+- <a
+- target="_blank"
+- id="vpn-app-store-link"
+- data-l10n-name="vpn-app-store-link"
+- ></a>
</p>
</div>
- <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>
+ <a
diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs
index 2417f1a641..698c48ccc3 100644
--- a/browser/components/protections/content/vpn-card.mjs
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index ecc4fbc1e..0e3955e4e 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,10 +70,10 @@
pkgname=iceweasel
epoch=1
-pkgver=114.0
+pkgver=115.0
pkgrel=1
pkgrel+=.parabola1
-_brandingver=112.0
+_brandingver=115.0
_brandingrel=1
pkgdesc="Standalone web browser derived from Mozilla Firefox"
url=https://wiki.parabola.nu/Iceweasel
@@ -179,15 +179,15 @@ validpgpkeys+=(
'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
'3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger
)
-sha256sums=('d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6'
+sha256sums=('7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898'
'SKIP'
'9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
-sha256sums+=('a44dc1e9f2d508203d1cacc2b5bb212c73eb04311da9a036560ff389d7b8e9e6'
+sha256sums+=('8df4cc8dab42268323594efd07697511746f21c006f1724b564b00fe8c5ac798'
'SKIP'
- '5c698551b1170e4bbf6e079c82ff0ccdc5266d87678b0653623dea5ec124d09a' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+ 'e90da1ee4fed83e8e40898f5f87b3f1534af50e253409539cd4b4635e14800eb' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
'131acdeff2af06c07f245717cd7cb898291f4466136f441b7b90acb2ccdade0a' # 9002-FSDG-preference-defaults.patch
'13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62' # 9003-FSDG-urihandlers.patch
- 'f2775f40dec9849b318f290c91f34c608ebbe274044fec9b05a485536e7041c0' # 9004-FSDG-misc.patch
+ 'f01c4bda81b859f400c741ca97fcf945a768a799efe73943f45eb327d717eaa2' # 9004-FSDG-misc.patch
'00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332' # process-json-files.py
'8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc' # vendor.js.in
'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
@@ -197,15 +197,15 @@ sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e3
'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'
'2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'
'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544')
-b2sums=('09d29112a487bc23c0e54380bf5e6ef5c62639aa53b6cca7c9a61b2452f4ee0e1a1b9f7ca996ddb78b842170fa67be0dc926c17956ab505e42966d443a798f34'
+b2sums=('f5489d96be60f3ed5f5657cb43142a876a7ef2bfe46b2ebb54df2b9be8262ab8c8d3aa342adf84fa68ffe0abc63e3b4671f310e0a3dd4c53c137a612e9e67932'
'SKIP'
'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635')
-b2sums+=('8472a10e5e27cc82f1467dd6592dfee512cd165e39f23ebbb4c8e76bbf6fd8614a4c1f1d91d42046f773eb711f463ece1aa23e1b1882173290529c28b0f3b60a'
+b2sums+=('c45680883ab019e5075214da47adf405c1a857de51df17f7254aa413f7e654d426e83bcd2be84b2260ceedaf98b85cb9d81588eb38b70a0d92686ce4bb152e45'
'SKIP'
- '9bd51af60740fcbf31b8387901d73c09dbc2f15ddd98d18f4c90ee909f58c9a8fe032712679c36d0c52358dad34c68b539695fccb019b4c35859673a724c3f72' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+ 'ed3eb1c8aba0e6302058a361431b5dd411ff4ff74587c2305279ef30b4d19fae9e8c97c029513a8a091384278a0930a950fb37d9cffc5713de58d1a7e289bf57' # 9001-FSDG-sync-remote-settings-with-local-dump.patch
'fc2204d183cf8ef133cb94580a92db26356edb069424e751743b2af349f115fb6069f0e3fe860496e05193cb0ca3dcb9aa5869c86d5c96c05a6eaec5242f8a35' # 9002-FSDG-preference-defaults.patch
'9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c' # 9003-FSDG-urihandlers.patch
- '7ce9bd437d2877545f71a2f258b94f4c3e4107dbb65957ea544b2ae915dd2f783ea1473354608097425e5245d76ea51c8993ddeffebd6aeca6e23711415bbf93' # 9004-FSDG-misc.patch
+ '2213f136bb3c66baed52bbff1c09f3d883c5e9bb0b06d9d0777ad718fcd55ce68a5f512d4cca796de78d254aba1078d0d254070e79275571e3d94aacbbb8556f' # 9004-FSDG-misc.patch
'085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4' # process-json-files.py
'5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a' # vendor.js.in
'2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
@@ -831,6 +831,9 @@ pref("browser.shell.checkDefaultBrowser", false);
// Don't disable extensions in the application directory
pref("extensions.autoDisableScopes", 11);
+
+// Enable GNOME Shell search provider
+pref("browser.gnome-search-provider.enabled", true);
END
# Parabola additions to vendor.js
@@ -905,6 +908,15 @@ END
ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
fi
+ local sprovider="$pkgdir/usr/share/gnome-shell/search-providers/$pkgname.search-provider.ini"
+ install -Dvm644 /dev/stdin "$sprovider" <<END
+[Shell Search Provider]
+DesktopId=$pkgname.desktop
+BusName=org.mozilla.${pkgname//-/}.SearchProvider
+ObjectPath=/org/mozilla/${pkgname//-/}/SearchProvider
+Version=2
+END
+
# export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token" # anti-feature
# if [[ -f $SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE ]]; then # anti-feature
# make -C obj uploadsymbols # anti-feature