diff options
author | grizzlyuser <grizzlyuser@protonmail.com> | 2024-01-26 21:56:01 +0100 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2024-02-17 09:04:39 -0500 |
commit | 529cb9ec668cba1f943b98397ebde4fd3194346c (patch) | |
tree | 1be22069bc9438e5e8602d15bea572a6f12e4f0e /libre/iceweasel | |
parent | 7f6e6e1c4f7e34b203bbe3c652b886412cce3340 (diff) |
libre/iceweasel: 122.0, sync with upstream changes
Diffstat (limited to 'libre/iceweasel')
-rw-r--r-- | libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch | 240 | ||||
-rw-r--r-- | libre/iceweasel/9002-FSDG-preference-defaults.patch | 6 | ||||
-rw-r--r-- | libre/iceweasel/9004-FSDG-misc.patch | 15 | ||||
-rw-r--r-- | libre/iceweasel/PKGBUILD | 45 | ||||
-rw-r--r-- | libre/iceweasel/process-json-files.py | 2 |
5 files changed, 147 insertions, 161 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 31f4a5b36..e81f2d598 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 @@ -1,4 +1,4 @@ -From 2699eccd5dc65f94d65738cec193e28e71f6321e Mon Sep 17 00:00:00 2001 +From 924f9c99de6f3223a46e472339c59726e60e5c79 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -22,21 +22,48 @@ If necessary, missing files can be added later. [1] https://remote-settings.readthedocs.io/en/latest/introduction.html [2] https://www.gnu.org/distros/free-system-distribution-guidelines.en.html#license-rules --- - browser/components/newtab/bin/import-rollouts.js | 4 ++-- .../components/ASRouterAdmin/ASRouterAdmin.jsx | 2 +- - .../newtab/data/content/activity-stream.bundle.js | 2 +- + .../components/asrouter/content/asrouter-admin.bundle.js | 2 +- + browser/components/newtab/bin/import-rollouts.js | 4 ++-- services/settings/Utils.sys.mjs | 2 +- services/settings/docs/index.rst | 4 ++-- .../periodic-updates/scripts/periodic_file_updates.sh | 2 +- + third_party/rust/remote_settings/.cargo-checksum.json | 2 +- + third_party/rust/remote_settings/src/client.rs | 4 ++-- .../components/antitracking/docs/query-stripping/index.md | 2 +- .../backgroundtasks/BackgroundTask_message.sys.mjs | 4 ++-- toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- toolkit/components/search/docs/DefaultSearchEngines.rst | 2 +- .../components/search/docs/SearchEngineConfiguration.rst | 2 +- toolkit/modules/AppConstants.sys.mjs | 4 ++-- - toolkit/mozapps/defaultagent/RemoteSettings.cpp | 2 +- - 13 files changed, 20 insertions(+), 20 deletions(-) + 14 files changed, 22 insertions(+), 22 deletions(-) +diff --git a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +index 7d4484dc83..9346d518e6 100644 +--- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx ++++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +@@ -874,7 +874,7 @@ export class ASRouterAdminInner extends React.PureComponent { + <a + className="providerUrl" + target="_blank" +- href="https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records" ++ href="resource://app/defaults/settings/main/nimbus-desktop-experiments.json" + rel="noopener noreferrer" + > + nimbus-desktop-experiments +diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js +index 614e8a62a1..3ce250c6ed 100644 +--- a/browser/components/asrouter/content/asrouter-admin.bundle.js ++++ b/browser/components/asrouter/content/asrouter-admin.bundle.js +@@ -1641,7 +1641,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P + label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { + className: "providerUrl", + target: "_blank", +- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", ++ href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json", + rel: "noopener noreferrer" + }, "nimbus-desktop-experiments"), ")"); + } diff --git a/browser/components/newtab/bin/import-rollouts.js b/browser/components/newtab/bin/import-rollouts.js index ce22d4a114..b2dc35e9d9 100644 --- a/browser/components/newtab/bin/import-rollouts.js @@ -59,34 +86,8 @@ index ce22d4a114..b2dc35e9d9 100644 console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`); -diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -index 3762be9c99..1a9c5028ff 100644 ---- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -+++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -@@ -1255,7 +1255,7 @@ export class ASRouterAdminInner extends React.PureComponent { - <a - className="providerUrl" - target="_blank" -- href="https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records" -+ href="resource://app/defaults/settings/main/nimbus-desktop-experiments.json" - rel="noopener noreferrer" - > - nimbus-desktop-experiments -diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index 88a06b5702..a807face6a 100644 ---- a/browser/components/newtab/data/content/activity-stream.bundle.js -+++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1787,7 +1787,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { - label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { - className: "providerUrl", - target: "_blank", -- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", -+ href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json", - rel: "noopener noreferrer" - }, "nimbus-desktop-experiments"), ")"); - } diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index c2db005b68..91aa355a87 100644 +index 73c83e526b..653cabe7e1 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -100,7 +100,7 @@ export var Utils = { @@ -117,7 +118,7 @@ index 3e042f67e4..dc8584c318 100644 #. Add the filename to the ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build`` #. Add the filename to the ``[browser]`` section of ``mobile/android/installer/package-manifest.in`` IF the file should be bundled with Android. diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -index b88ee476da..440615e4e1 100755 +index 160b7fbc35..2e9dcde464 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh @@ -286,7 +286,7 @@ function compare_suffix_lists { @@ -129,6 +130,36 @@ index b88ee476da..440615e4e1 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" +diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json +index 28ac46a2c2..e8a54e1bac 100644 +--- a/third_party/rust/remote_settings/.cargo-checksum.json ++++ b/third_party/rust/remote_settings/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"3d87162e6913a81cc6f5178a7ca791e262d0d029e7dedf3df4fe2f66e5501185","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"ff1ab5961fe695989d1ff343c5042ce0f907dc323da2ba87005fc9437919b448","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs +index 9585a7cc7c..1c97208b82 100644 +--- a/third_party/rust/remote_settings/src/client.rs ++++ b/third_party/rust/remote_settings/src/client.rs +@@ -33,7 +33,7 @@ impl Client { + pub fn new(config: RemoteSettingsConfig) -> Result<Self> { + let server_url = config + .server_url +- .unwrap_or_else(|| String::from("https://firefox.settings.services.mozilla.com")); ++ .unwrap_or_else(|| String::from("resource://app/defaults/settings")); + let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main")); + let base_url = Url::parse(&server_url)?; + +@@ -518,7 +518,7 @@ mod test { + }; + let client = Client::new(config).unwrap(); + assert_eq!( +- Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), ++ Url::parse("resource://app/defaults/settings").unwrap(), + client.base_url + ); + assert_eq!(String::from("main"), client.bucket_name); diff --git a/toolkit/components/antitracking/docs/query-stripping/index.md b/toolkit/components/antitracking/docs/query-stripping/index.md index e49d8513ba..c1c6ae5deb 100644 --- a/toolkit/components/antitracking/docs/query-stripping/index.md @@ -158,10 +189,10 @@ index bb9d71b5c0..ec0c5f11d7 100644 // --preview: enable Remote Settings and Experiment previews. // diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs -index 0e86068dd4..964475174e 100644 +index 8e474b58a2..a8cd3cccac 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -152,13 +152,13 @@ export var SearchUtils = { +@@ -193,13 +193,13 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -201,10 +232,10 @@ index c782f9f7c3..4d773d27c5 100644 +.. _viewed live: resource://app/defaults/settings/main/search-config.json .. _Normandy: /toolkit/components/normandy/normandy/services.html diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs -index b430666f68..0f640980ae 100644 +index 36b26056ec..ba54202045 100644 --- a/toolkit/modules/AppConstants.sys.mjs +++ b/toolkit/modules/AppConstants.sys.mjs -@@ -409,9 +409,9 @@ export var AppConstants = Object.freeze({ +@@ -416,9 +416,9 @@ export var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -216,41 +247,11 @@ index b430666f68..0f640980ae 100644 #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: -diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json -index 8794c625fe..d2752e72ef 100644 ---- a/third_party/rust/remote_settings/.cargo-checksum.json -+++ b/third_party/rust/remote_settings/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"c74e3df90cd82fb4ee00dd38d7e39cd7a0142ad601b8b63ae214978a28fbe1ac","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"3d87162e6913a81cc6f5178a7ca791e262d0d029e7dedf3df4fe2f66e5501185","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} -\ No newline at end of file -+{"files":{"Cargo.toml":"c74e3df90cd82fb4ee00dd38d7e39cd7a0142ad601b8b63ae214978a28fbe1ac","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"ff1ab5961fe695989d1ff343c5042ce0f907dc323da2ba87005fc9437919b448","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} -diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 9585a7cc7c..1c97208b82 100644 ---- a/third_party/rust/remote_settings/src/client.rs -+++ b/third_party/rust/remote_settings/src/client.rs -@@ -33,7 +33,7 @@ impl Client { - pub fn new(config: RemoteSettingsConfig) -> Result<Self> { - let server_url = config - .server_url -- .unwrap_or_else(|| String::from("https://firefox.settings.services.mozilla.com")); -+ .unwrap_or_else(|| String::from("resource://app/defaults/settings")); - let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main")); - let base_url = Url::parse(&server_url)?; - -@@ -518,7 +518,7 @@ mod test { - }; - let client = Client::new(config).unwrap(); - assert_eq!( -- Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), -+ Url::parse("resource://app/defaults/settings").unwrap(), - client.base_url - ); - assert_eq!(String::from("main"), client.bucket_name); -- -2.42.0 +2.43.0 -From d954757081cd70d27e0dc8d5adca68d95c97cb57 Mon Sep 17 00:00:00 2001 +From 3536b16aa46bda48ac8692ca72e978837fcef796 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -291,10 +292,10 @@ index eea31ef192..529ecd6917 100644 * Call the listeners of the specified broadcasts. * diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs -index 95896f5f6e..01111aa690 100644 +index b93da0f0e4..8d59bc6b05 100644 --- a/services/settings/remote-settings.sys.mjs +++ b/services/settings/remote-settings.sys.mjs -@@ -572,11 +572,7 @@ function remoteSettingsFunction() { +@@ -575,11 +575,7 @@ function remoteSettingsFunction() { moduleURI: import.meta.url, symbolName: "remoteSettingsBroadcastHandler", }; @@ -307,7 +308,7 @@ index 95896f5f6e..01111aa690 100644 }; return remoteSettings; -@@ -596,9 +592,6 @@ export var remoteSettingsBroadcastHandler = { +@@ -599,9 +595,6 @@ export var remoteSettingsBroadcastHandler = { `Push notification received (version=${version} phase=${phase})` ); @@ -319,10 +320,10 @@ index 95896f5f6e..01111aa690 100644 }, }; -- -2.42.0 +2.43.0 -From 01820751018f1b849884204d081816e7d4bcb9df Mon Sep 17 00:00:00 2001 +From 528c5d6d9437c003b731b3531273dbeb10422a0c Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -363,10 +364,10 @@ index 3bfed26ea4..807eb220ec 100644 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 -- -2.42.0 +2.43.0 -From 400c2e04fa34d920e294c00235838083a0bf6bd4 Mon Sep 17 00:00:00 2001 +From d13036fd21af770da7d305d058ecedd560afba2f Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -385,10 +386,10 @@ code that expects them. create mode 100644 services/settings/dumps/monitor/moz.build diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 5296d2b4b1..6d8aa0e0b1 100644 +index b3213b8c44..0f953c3425 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -260,6 +260,7 @@ +@@ -258,6 +258,7 @@ @RESPATH@/browser/defaults/settings/last_modified.json @RESPATH@/browser/defaults/settings/blocklists @RESPATH@/browser/defaults/settings/main @@ -397,10 +398,10 @@ index 5296d2b4b1..6d8aa0e0b1 100644 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index 91aa355a87..c9e11531d4 100644 +index 653cabe7e1..e4d4247253 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs -@@ -369,7 +369,7 @@ export var Utils = { +@@ -376,7 +376,7 @@ export var Utils = { async fetchLatestChanges(serverUrl, options = {}) { const { expectedTimestamp, lastEtag = "", filters = {} } = options; @@ -409,7 +410,7 @@ index 91aa355a87..c9e11531d4 100644 const params = { ...filters, _expected: expectedTimestamp ?? 0, -@@ -384,7 +384,21 @@ export var Utils = { +@@ -391,7 +391,21 @@ export var Utils = { .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) .join("&"); } @@ -432,7 +433,7 @@ index 91aa355a87..c9e11531d4 100644 if (response.status >= 500) { throw new Error(`Server error ${response.status} ${response.statusText}`); -@@ -419,7 +433,15 @@ export var Utils = { +@@ -426,7 +440,15 @@ export var Utils = { } } @@ -476,10 +477,10 @@ index f407580bfa..53e9d8b45e 100644 ] -- -2.42.0 +2.43.0 -From 906c6cdabc913a605cf91889503072cfaa7b9085 Mon Sep 17 00:00:00 2001 +From b2a061b8b79988eeef189af214fa03e4d7c76153 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -491,10 +492,10 @@ current and any future code that relies on it. 1 file changed, 10 deletions(-) diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index c9e11531d4..092c94376f 100644 +index e4d4247253..296001536c 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs -@@ -183,16 +183,6 @@ export var Utils = { +@@ -190,16 +190,6 @@ export var Utils = { * @return {bool} Whether network is down or not. */ get isOffline() { @@ -512,10 +513,10 @@ index c9e11531d4..092c94376f 100644 }, -- -2.42.0 +2.43.0 -From 6e4aa6ad6c0579e96e7a3eb8d3c6d9de1d8fc898 Mon Sep 17 00:00:00 2001 +From 96d145c3ca83e835c4ec6711e75c01627e509ea0 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -566,10 +567,10 @@ index 1eeaf0bed9..d998a2d3b1 100644 /** -- -2.42.0 +2.43.0 -From ae2173787a6e4690ec4f63a367210753b3ea47be Mon Sep 17 00:00:00 2001 +From b612fe1de7381746ac51694a4110268d0769ca6c Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -604,10 +605,10 @@ the upgrade to local-only setup. 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 17a693ad93..b0efbd2403 100644 +index 7e95b9baab..989a3180b8 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -702,11 +702,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -706,11 +706,9 @@ export class RemoteSettingsClient extends EventEmitter { // If the data is up-to-date but don't have metadata (records loaded from dump), // we fetch them and validate the signature immediately. @@ -621,7 +622,7 @@ index 17a693ad93..b0efbd2403 100644 await this.db.importChanges(metadata); // We don't bother validating the signature if the dump was just loaded. We do // if the dump was loaded at some other point (eg. from .get()). -@@ -983,38 +981,28 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -987,38 +985,28 @@ export class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ async _validateCollectionSignature(records, timestamp, metadata) { @@ -668,7 +669,7 @@ index 17a693ad93..b0efbd2403 100644 } } -@@ -1181,24 +1169,26 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1185,24 +1173,26 @@ export class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -712,10 +713,10 @@ index 17a693ad93..b0efbd2403 100644 remoteRecords, }; -- -2.42.0 +2.43.0 -From 4b80ad7284b8b2397afcc0c33de070e0c9abf223 Mon Sep 17 00:00:00 2001 +From 9eaa21162fc1e2abeb24381edd4bea01fd103065 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -737,7 +738,7 @@ occurs during the session. 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index b0efbd2403..232fd5ddbf 100644 +index 989a3180b8..c2c2a5734b 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { @@ -817,10 +818,10 @@ index b0efbd2403..232fd5ddbf 100644 * Synchronize the local database with the remote server. * -- -2.42.0 +2.43.0 -From 4947e8705cdde1b78e223f2713edb435233d03b7 Mon Sep 17 00:00:00 2001 +From 4598808209c3a9a8cd3902053b250c88861bced2 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -842,7 +843,7 @@ noticeable performance issues. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 232fd5ddbf..64fda00c7f 100644 +index c2c2a5734b..ee612a049c 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -9,6 +9,7 @@ import { Downloader } from "resource://services-settings/Attachments.sys.mjs"; @@ -853,7 +854,7 @@ index 232fd5ddbf..64fda00c7f 100644 ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs", Database: "resource://services-settings/Database.sys.mjs", -@@ -1169,7 +1170,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1173,7 +1174,10 @@ export class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); @@ -866,10 +867,10 @@ index 232fd5ddbf..64fda00c7f 100644 } } else { -- -2.42.0 +2.43.0 -From 31e3597a5fc978ccbec4dda6ee51a129f8a41a1e Mon Sep 17 00:00:00 2001 +From 79445efeb9c18ad9c2e2c4070cdc72aa6b736d1e Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -887,7 +888,7 @@ logic gets the data about the attachments from those records. 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 64fda00c7f..396f1c3eac 100644 +index ee612a049c..b3c6caebba 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -255,7 +255,7 @@ class AttachmentDownloader extends Downloader { @@ -899,7 +900,7 @@ index 64fda00c7f..396f1c3eac 100644 ) ); } -@@ -1129,7 +1129,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1133,7 +1133,7 @@ export class RemoteSettingsClient extends EventEmitter { // Signature failed, clear local DB because it contains // bad data (local + remote changes). lazy.console.debug(`${this.identifier} clear local data`); @@ -908,7 +909,7 @@ index 64fda00c7f..396f1c3eac 100644 // Local data was tampered, throw and it will retry from empty DB. lazy.console.error(`${this.identifier} local data was corrupted`); throw new CorruptedDataError(this.identifier); -@@ -1151,7 +1151,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1155,7 +1155,7 @@ export class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -917,7 +918,7 @@ index 64fda00c7f..396f1c3eac 100644 } } } -@@ -1191,6 +1191,12 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1195,6 +1195,12 @@ export class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -931,10 +932,10 @@ index 64fda00c7f..396f1c3eac 100644 * Fetch information from changeset endpoint. * -- -2.42.0 +2.43.0 -From 0e73e5552e2c9b4189a1bb19ce086420e5f54336 Mon Sep 17 00:00:00 2001 +From 24ba3c8ca82381eba887a318fb09f6d24e07064c Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -949,10 +950,10 @@ necessary cleanup. So remove the checks. 1 file changed, 5 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 396f1c3eac..60be4b0372 100644 +index b3c6caebba..264a6cc831 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -1071,14 +1071,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1075,14 +1075,9 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; @@ -968,10 +969,10 @@ index 396f1c3eac..60be4b0372 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.42.0 +2.43.0 -From 1423f0168d322121a302b227be9ae64fd9f0adea Mon Sep 17 00:00:00 2001 +From 633d8d40e00786b388e62898e32414d1305fa91f Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -1060,10 +1061,10 @@ index 5ddc6bb046..f7888cb769 100644 /** -- -2.42.0 +2.43.0 -From 961ada13d31f49efbc1e8b56aa8a8811ca61408a Mon Sep 17 00:00:00 2001 +From c0b96623a42ed3c74218fcc2574f78196fd901ff Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -1088,10 +1089,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index c7ca7ae249..f5d7c4e320 100644 +index 592ddd3229..9688ee64fd 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -13980,7 +13980,7 @@ +@@ -14167,7 +14167,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1101,7 +1102,7 @@ index c7ca7ae249..f5d7c4e320 100644 - name: security.tls.version.min diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 3893cdcdf2..adf85992a4 100644 +index dd14b5c24c..90350be691 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1129,6 +1129,7 @@ void nsNSSComponent::setValidationOptions( @@ -1113,4 +1114,5 @@ index 3893cdcdf2..adf85992a4 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.42.0 +2.43.0 + diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index 770b1f85b..667c55e99 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -339,9 +339,9 @@ index f58075204d..a2ffbec390 100644 // engine https://browser.mt/. -pref("browser.translations.enable", true); +pref("browser.translations.enable", false); - - // Telemetry settings. - // Determines if Telemetry pings can be archived locally. + + // Enable the new Firefox Translations Settings UI Design + pref("browser.translations.newSettingsUI.enable", false); -- 2.42.0 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index dbbf48426..ea0617030 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1159,16 +1159,13 @@ index 7d37d26..4ebbc06 100644 <vbox id="hasFxaAccount"> diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -index e446a1e651..b6c9e4adc6 100644 +index 504598d05e..075f9f60cb 100644 --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -@@ -15,18 +15,18 @@ +@@ -15,16 +15,16 @@ ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark -facebook-container-brand-name = Facebook Container ---lockwise-brand-name = Firefox Lockwise -+-lockwise-brand-name = Iceweasel Lockwise - -lockwise-brand-short-name = Lockwise --monitor-brand-name = Firefox Monitor +-monitor-brand-name = Iceweasel Monitor -monitor-brand-short-name = Monitor @@ -1189,7 +1186,7 @@ index e446a1e651..b6c9e4adc6 100644 -relay-brand-short-name = Relay -fakespot-brand-name = Fakespot -@@ -36,14 +36,14 @@ +@@ -34,14 +34,14 @@ # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated. -fakespot-brand-full-name = Fakespot by Mozilla @@ -1197,19 +1194,19 @@ index e446a1e651..b6c9e4adc6 100644 +# “Suggest” can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefox-suggest-brand-name = Firefox Suggest -+-firefox-suggest-brand-name = Iceweasel Suggest ++-Iceweasel-suggest-brand-name = Iceweasel Suggest -# ”Home" can be localized, “Firefox” must be treated as a brand +# ”Home" can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefox-home-brand-name = Firefox Home -+-firefox-home-brand-name = Iceweasel Home ++-Iceweasel-home-brand-name = Iceweasel Home -# View" can be localized, “Firefox” must be treated as a brand +# View" can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefoxview-brand-name = Firefox View -+-firefoxview-brand-name = Iceweasel View ++-Iceweaselview-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 829c18c5e1..71c75114e9 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ea1782bf2..fe12ca2f8 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=121.0.1 +pkgver=122.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=120.0 @@ -99,7 +99,6 @@ makedepends=( cbindgen clang diffutils - dump_syms imake inetutils jack @@ -142,11 +141,9 @@ optdepends=( # provides=('firefox') # TODO: redmine #2164 - currently conflicts with 'your-freedom' replaces=('firefox') options=( - !debug !emptydirs !lto !makeflags - !strip ) source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} @@ -180,34 +177,34 @@ validpgpkeys+=( '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce' +sha256sums=('b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop # identity-icons-brand.svg sha256sums+=('a5eed3c1f31a253f90b0284e0caf17bd35b3fa35197cfc403cb1bd987ecd56eb' # *.branding.tar.xz 'SKIP' - '4ff07eff69343e50357c9bb571dfa6a702efb3a7915ce8ca8dcb42ee18446aac' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '3e3c5c0a9751e4728a7c7f009a1eb90565de4ebe1b938b74b6669b28168bf335' # 9002-FSDG-preference-defaults.patch - '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch - 'f999ddb5a2cde87217bb5b0ebf20b4e0aabe88657a73545c9487cddde1deab22' # 9004-FSDG-misc.patch - '5f3a646d90a075458b4cb27c19ddbd50ae7717f4e3371c9e2e4de1a8e718553e' # process-json-files.py + 'b6b100d7749387362bda9c8c8c19fe742870ec8a7a39172878b8dbfe773efeee' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '8f530e41f19675bd74e62f5182f7975a24b690d5d17420fbe8a5365d55b71910' # 9002-FSDG-preference-defaults.patch + '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch + '6d1b95deba71e6e0569fe4aff460ca1c0734c9f3a56b6c56809b7414a82189e5' # 9004-FSDG-misc.patch + 'c1d57c2b5b3621b34a4c5e7cc6e83170cfa576965b341c71e750e610440f490c' # process-json-files.py '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch 'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01' # rust-static-disable-network-test-on-static-libraries.patch 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55' +b2sums=('7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop # identity-icons-brand.svg b2sums+=('d6ccdc46fce7cfc4bb35a6b09deee8cd96b9076c599c1f031b4d2c5a9c2722bdf98dd14eddde50422e9a1b88f24d425c8a5f1e861877a367c6ff5365e61258c0' # *.branding.tar.xz 'SKIP' - '9834f69d69f9ce3cee872a7e75b6848d5539b94752aa50c74612177a740319a33b02734f1d2cdde31ee50efa7a3ed85cf85efb7e6687cfe6ab7be843b4089e7b' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - 'c11cb32b7959a47e6d52b45a1611d27c04129eefcb015f8f9b005c9b29a2ee216e4a4702386b159867ed121705768f0a1721e01f5cab03a5444cdf09a9ef053b' # 9002-FSDG-preference-defaults.patch - 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch - '7d7c9a67ef8035f85482b37d0b7b7743f005d5e7f48d1865f21745ebd10053ed8a6c15e1e176f42d5ef738e7bb074bdad8e912983ca4614a2aab50b95824a4a6' # 9004-FSDG-misc.patch - '6224eb8db58c0d00353512d5bf420a16be90a86dc86c9a8d735026a7f77ca4a8a148fea38015fc9639254b9e02b17d01521ad6b233a890aa082fb8476992fa2f' # process-json-files.py + 'adb8c96328cbc6f8c7e50207b89c2d4c68733dd1fdcd341ae2ac4a3a1702430c2e5983e4249682153e0e593e0f54ab0258ed01d849589e8dc77c8729beccf3e7' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '97bc57322635a7fa5d55b087303ece6f982104db5ef945393e74722acd783262bcc63e5cd3e5748eae9f07a9add59925898b67a2e20fa8420d4c7bfc4cd39867' # 9002-FSDG-preference-defaults.patch + 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch + '043d0abcd81a3826104868c3885d4b102949616a787e7bf3f2bc502d46d9fdf9fb9c2ee6578e0907cb6083c985dda2dc2862b8e63504eda130d28eadd06489a8' # 9004-FSDG-misc.patch + '74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135' # process-json-files.py 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9' # rust-static-disable-network-test-on-static-libraries.patch @@ -421,6 +418,7 @@ ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd ac_add_options --enable-linker=lld +ac_add_options --disable-install-strip ac_add_options --disable-elf-hack ac_add_options --disable-bootstrap ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot @@ -713,7 +711,6 @@ build() { export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy export MOZBUILD_STATE_PATH="$srcdir/mozbuild" export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)" - # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature export MOZ_NOSPAM=1 # malloc_usable_size is used in various parts of the codebase @@ -840,9 +837,6 @@ END (( ! _SKIP_PGO )) || echo "Building optimized browser..." ./mach build - - # echo "Building symbol archive..." # anti-feature - # ./mach buildsymbols # anti-feature } package() { @@ -907,7 +901,7 @@ END "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" install -Dvm644 ../$pkgname.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + "$pkgdir/usr/share/applications/${pkgname//-/}.desktop" # Install a wrapper to avoid confusion about binary path install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END @@ -948,16 +942,9 @@ END 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 +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 - # else # anti-feature - # cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.tar.zst # anti-feature - # fi } diff --git a/libre/iceweasel/process-json-files.py b/libre/iceweasel/process-json-files.py index 57e54d4b5..e29013560 100644 --- a/libre/iceweasel/process-json-files.py +++ b/libre/iceweasel/process-json-files.py @@ -155,7 +155,7 @@ class SearchConfig(RemoteSettings): 'main/search-config.json', ) SCHEMA_PATH = arguments.MAIN_PATH / \ - 'toolkit/components/search/schema/search-engine-config-schema.json' + 'toolkit/components/search/schema/search-config-schema.json' OUTPUT_PATH = JSON_PATHS[0] _DUCKDUCKGO_SEARCH_ENGINE_ID = 'ddg@search.mozilla.org' |