diff options
author | grizzlyuser <grizzlyuser@protonmail.com> | 2023-10-26 09:06:27 +0200 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2023-10-26 22:58:38 -0400 |
commit | af4250db200ef1deac3daf511761f0ecd041cecb (patch) | |
tree | 9bd775256f31a1c8c7ea120ba411a1b70a323b34 /libre/iceweasel | |
parent | 2959980b509c4907dd738b2b52d1b090e7513f41 (diff) |
libre/iceweasel: 119.0-1.parabola1
Update according to 119.0 changes from upstreams. Mozilla has added
Remote Settings client written in Rust, but from what I understood,
currently it's used only to fetch the data for suggestions called
Firefox Suggest, which include sponsored suggestions, of course. It
doesn't appear to support local dumps currently, so if more features
start using Rust client, it'll probably need further patching.
Diffstat (limited to 'libre/iceweasel')
-rw-r--r-- | libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch | 30 | ||||
-rw-r--r-- | libre/iceweasel/9004-FSDG-misc.patch | 18 | ||||
-rw-r--r-- | libre/iceweasel/PKGBUILD | 23 |
3 files changed, 50 insertions, 21 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 379ce9ebc..721c30ce4 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 @@ -229,6 +229,36 @@ index 37a376ff90..ef73563f85 100644 #define PROD_BID "main" #define PROD_CID "windows-default-browser-agent" #define PROD_ID "state" +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 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 0971c5866..ffb073f95 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1118,10 +1118,10 @@ index 1e1bffed47..14b6cf9f5a 100644 2.39.2 diff --git a/browser/app/permissions b/browser/app/permissions -index 5bc1d66fcd..a8252ab784 100644 +index 1c72a96de8..052a6a5c83 100644 --- a/browser/app/permissions +++ b/browser/app/permissions -@@ -17,14 +17,8 @@ origin uitour 1 https://truecolors.firefox.com +@@ -15,9 +15,6 @@ origin uitour 1 https://support.mozilla.org origin uitour 1 about:home origin uitour 1 about:newtab @@ -1131,11 +1131,6 @@ index 5bc1d66fcd..a8252ab784 100644 # Remote troubleshooting origin remote-troubleshooting 1 https://support.mozilla.org --# addon install --origin install 1 https://fpn.firefox.com -- - # autoplay video/audio - origin autoplay-media 1 about:welcome diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml index 7d37d26..4ebbc06 100644 --- a/browser/components/preferences/sync.inc.xhtml @@ -1164,10 +1159,10 @@ 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 a52cde5532..251acad0f8 100644 +index e446a1e651..b6c9e4adc6 100644 --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -@@ -15,28 +15,28 @@ +@@ -15,18 +15,18 @@ ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark -facebook-container-brand-name = Facebook Container @@ -1194,6 +1189,10 @@ index a52cde5532..251acad0f8 100644 -relay-brand-short-name = Relay -fakespot-brand-name = Fakespot +@@ -36,14 +36,14 @@ + # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated. + -fakespot-brand-full-name = Fakespot by Mozilla + -# “Suggest” can be localized, “Firefox” must be treated as a brand +# “Suggest” can be localized, “Iceweasel” must be treated as a brand # and kept in English. @@ -1211,7 +1210,6 @@ index a52cde5532..251acad0f8 100644 # and kept in English. --firefoxview-brand-name = Firefox View +-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 829c18c5e1..71c75114e9 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ebcc871d3..76ab01135 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,10 +70,10 @@ pkgname=iceweasel epoch=1 -pkgver=118.0.2 +pkgver=119.0 pkgrel=1 pkgrel+=.parabola1 -_brandingver=115.0 +_brandingver=119.0 _brandingrel=1 pkgdesc="Standalone web browser derived from Mozilla Firefox" url=https://wiki.parabola.nu/Iceweasel @@ -153,7 +153,8 @@ options=( source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} $pkgname.desktop - identity-icons-brand.svg) + identity-icons-brand.svg +) source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride source+=( https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} @@ -179,15 +180,15 @@ validpgpkeys+=( 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('89626520f2f0f782f37c074b94690e0f08dcf416be2b992f4aad68df5d727b21' +sha256sums=('f63e44194548f246e1396508800739a24c0517e65e920002a6f67ee099be39dd' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') -sha256sums+=('b701b4c47fca2661feeabe172e398c76c8015ee08ff4cc3cc2f7c3ef2ed692a7' +sha256sums+=('3ea72621218b8db739d2a8ee723361f7f61c048edeab12abdba3a9f9d9ec6cb2' 'SKIP' - '4dd43c446e865da73596bb34ee16966be937b78154e1269534b49566399a8025' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + 'b01209c5462237dff3ff7788e7bfedad7a327d9d2759dd65c77cfb71667f2fbd' # 9001-FSDG-sync-remote-settings-with-local-dump.patch '65d9a18b9b2b3f1034b427af486c82416c360c0e9254ada42d81ff2b7132b1ca' # 9002-FSDG-preference-defaults.patch '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch - '4d9b0dc4b34fb5c00067f075c33338a4d27d99cfd90629caa117ad02c7a64e30' # 9004-FSDG-misc.patch + '75c437e73c4a8007251581c957d3d36b85ba77270a72411ff5185a201cfeac6f' # 9004-FSDG-misc.patch '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332' # process-json-files.py '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06' # vendor.js.in 'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff @@ -196,15 +197,15 @@ sha256sums_i686=('a8786bb747ae8a12d28268f6731621810e13f405b664373b23a3070d5ed213 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('e7b166903dc13ddaf514dea7833de0f464611551b054e5c2e336d3e1995f9c0d3bf6cfbd3cb9306be672d6451b6343e56025c99d0fed4b1d23fd6ea8e519ac9c' +b2sums=('4fc9852839a65b05c0861eea1d3c99aa9ef8eef02ba02dab15720d0da62b219f0fc2c4bdda1741dcf0eed316b88f032580c7cf433c4d09170b5c8e19e8ad4e1d' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') -b2sums+=('a22044292e464b3922eb2e4a8cf0993524d232eeb4a8602707589d00f690498d3b76e515c8d0ce4995b3bf8a65df9aa814b49de469178aa1f8cc07ec19dd5d32' +b2sums+=('0e1569ae34575e16762e034d3dba241a390a78d7af2d181683b419da35ac06acc557c3b3799a52e6aebf368063104ee51d81546749244db4a968aa360c111aa1' 'SKIP' - '03020bb01d0fc528f76f2532d07c60f93abcfd4f59f3dd49e82a660cf5333aff447a576d9a6a6042849c7527499d5265b31f3a86bf3e16068987c2eb434b7f9c' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + 'cc79ed221206fcc4ec63f4d5e2e430a2993904077a5074d9bfa193911401199d5d8df01c392fdab0adfdce4085938855ab3098556630cc6fd377d5cf97d00b25' # 9001-FSDG-sync-remote-settings-with-local-dump.patch '2d2174819ec281314a5c736c05e647c8ba270670e92fc9a4c17496a2ac45da4514095ae57db05253cf48513e42d58eda87b28c9c62c119d5a4788fcaab01d213' # 9002-FSDG-preference-defaults.patch 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch - '751908c3fa56b55cd85b41ed504300d6988172427c18bdbb2f88ea47a073a646d0b6d3f3887d3d090eb2f80462ff36aac82b86592c1651c69f0442e187f46efd' # 9004-FSDG-misc.patch + '878b4aa544b65dac165e329e3cbcb88d4ee8cdc41a5c47a9e1bc332c3f52912fd73836072e60da907c825a062695d34478d52886aa05a76915852e6dbd892e91' # 9004-FSDG-misc.patch '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4' # process-json-files.py 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9' # vendor.js.in '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff |