PR#71: [iceweasel] 112.0, update according to upstream changes - abslibre

abslibre

#71 [iceweasel] 112.0, update according to upstream changes

Closed a year ago by grizzlyuser. Opened a year ago by grizzlyuser.

iceweasel into pull-requests

libre: [iceweasel] Update to 113.0 with upstream changes

grizzlyuser • a year ago

c168079

libre/iceweasel/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch

file added

+39

		`@@ -0,0 +1,39 @@`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`+ From: ahochheiden <ahochheiden@mozilla.com>`
		`+ Date: Sat, 6 May 2023 21:07:09 +0000`
		`+ Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of`
		+ `mach` r=firefox-build-system-reviewers,glandium
		`+`
		`+ Differential Revision: https://phabricator.services.mozilla.com/D177340`
		`+ ---`
		`+ python/sites/build.txt \| 1 -`
		`+ python/sites/mach.txt \| 1 +`
		`+ python/sites/python-test.txt \| 1 -`
		`+ 3 files changed, 1 insertion(+), 2 deletions(-)`
		`+`
		`+ diff --git a/python/sites/build.txt b/python/sites/build.txt`
		`+ index b43f7680d200..4e6f6c51d9ad 100644`
		`+ --- a/python/sites/build.txt`
		`+ +++ b/python/sites/build.txt`
		`+ @@ -1,2 +1 @@`
		`+ -vendored:third_party/python/glean_parser`
		`+ pth:third_party/python/vsdownload`
		`+ diff --git a/python/sites/mach.txt b/python/sites/mach.txt`
		`+ index b9fafd0b9c59..a18691184312 100644`
		`+ --- a/python/sites/mach.txt`
		`+ +++ b/python/sites/mach.txt`
		`+ @@ -78,6 +78,7 @@ vendored:third_party/python/esprima`
		`+ vendored:third_party/python/fluent.migrate`
		`+ vendored:third_party/python/fluent.syntax`
		`+ vendored:third_party/python/giturlparse`
		`+ +vendored:third_party/python/glean_parser`
		`+ vendored:third_party/python/gyp/pylib`
		`+ vendored:third_party/python/idna`
		`+ vendored:third_party/python/importlib_metadata`
		`+ diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt`
		`+ index 48cdcd2b8f48..74889365a22b 100644`
		`+ --- a/python/sites/python-test.txt`
		`+ +++ b/python/sites/python-test.txt`
		`+ @@ -1,2 +1 @@`
		`+ -vendored:third_party/python/glean_parser`
		`+ pypi:pytest==7.0.1`

libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch

file modified

+4 -4

		`@@ -682,8 +682,8 @@`
		`--- a/services/settings/RemoteSettingsClient.sys.mjs`
		`+++ b/services/settings/RemoteSettingsClient.sys.mjs`
		`@@ -11,6 +11,7 @@ const lazy = {};`
		`-`
		`- ChromeUtils.defineESModuleGetters(lazy, {`
		`+ ClientEnvironmentBase:`
		`+ "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs",`
		`Database: "resource://services-settings/Database.sys.mjs",`
		`+ DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",`
		`RemoteSettingsWorker:`
		`@@ -791,9 +791,9 @@`

		`XPCOMUtils.defineLazyModuleGetters(lazy, {`
		`+ CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",`
		`- ClientEnvironmentBase:`
		`- "resource://gre/modules/components-utils/ClientEnvironment.jsm",`
		`IDBHelpers: "resource://services-settings/IDBHelpers.jsm",`
		`+ KintoHttpClient: "resource://services-common/kinto-http-client.js",`
		`+ ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",`
		`@@ -1176,7 +1177,10 @@ export class RemoteSettingsClient extends EventEmitter {`
		`const old = oldById.get(r.id);`
		`if (old) {`

libre/iceweasel/9004-FSDG-misc.patch

file modified

+3 -3

		`@@ -1172,10 +1172,10 @@`
		`</groupbox>`

		`<vbox id="hasFxaAccount">`
		`- diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl`
		`+ diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl`
		`index a52cde5532..251acad0f8 100644`
		`- --- a/browser/locales/en-US/browser/branding/brandings.ftl`
		`- +++ b/browser/locales/en-US/browser/branding/brandings.ftl`
		`+ --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl`
		`+ +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl`
		`@@ -15,28 +15,28 @@`
		`## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark`

libre/iceweasel/PKGBUILD

file modified

+14 -9

		`@@ -70,7 +70,7 @@`

		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=112.0.2`
		`+ pkgver=113.0`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`_brandingver=112.0`
		`@@ -153,6 +153,7 @@`
		`https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}`
		`$pkgname.desktop`
		`identity-icons-brand.svg`
		`+ 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch`
		`)`
		`source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride`
		`source+=(`
		`@@ -179,15 +180,16 @@`
		`'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin`
		`'3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger`
		`)`
		`- sha256sums=('e6a4819a3b82b1ca6c45296e50e6c9ab653306eeb540e50ba8683e339565992e'`
		`+ sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627'`
		`'SKIP'`
		`- '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')`
		`+ '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'`
		`+ '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9')`
		`sha256sums+=('a44dc1e9f2d508203d1cacc2b5bb212c73eb04311da9a036560ff389d7b8e9e6'`
		`'SKIP'`
		`- '87780f5c83dd961162c9f95170ff4077aed3a5febe4d5417dad10cbb6e6677c6' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`+ '63245fa00363d8884aa2b62fbade557cbe72c5cb326303c7d3f7664e0e3e359c' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'1e4d28bd87688334b20cce9213490111e004ea6bcf1654f550da8ebe6bdbf3ef' # 9002-FSDG-preference-defaults.patch`
		`'13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62' # 9003-FSDG-urihandlers.patch`
		`- 'b2b6bc72de4abb7accce7a8d71390f97da11ee19d3f004749ece090c9bd90812' # 9004-FSDG-misc.patch`
		`+ '44eeea69361ee4b9e4814452ed7e59f1caf2280688316dfdfe3e8b0f5da35798' # 9004-FSDG-misc.patch`
		`'00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332' # process-json-files.py`
		`'8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc') # vendor.js.in`
		`sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`@@ -196,15 +198,16 @@`
		`'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'`
		`'2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'`
		`'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544')`
		`- b2sums=('44f2fae6c7260a1a6cad24ee31bbd52bc7efad15ac5b9f64f4bceabda7a371f20a490512cee324e53373b9a96fd218572c1478b76e5931383dbef00cc25743aa'`
		`+ b2sums=('1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146'`
		`'SKIP'`
		`- 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635')`
		`+ 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'`
		`+ '4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7')`
		`b2sums+=('8472a10e5e27cc82f1467dd6592dfee512cd165e39f23ebbb4c8e76bbf6fd8614a4c1f1d91d42046f773eb711f463ece1aa23e1b1882173290529c28b0f3b60a'`
		`'SKIP'`
		`- 'f23515dbac37f7368f4038dee58c1206900285ce9a03bed79f858cc4f8d34aea1e2b858f209f63262842411f7c8b0b017836f0b84c708245d007831851e8d073' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`+ 'ba9530d65871a84fdfd121c2ee13ce9f80d65e1f7cd23be7ea9fc232822601c9f7428c15e08e971f0d24791d93290945ecee55de99e6c2b64f8cdc6d2806b564' # 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`'bdb08d681f6f17ae9f8e0bb37e23087a0401d4be26c91ead3eda4654362ad37c3b1cddf69596e2b2278f77e0fd45714b7dbb7a97aca35aae5417e916079d24bf' # 9002-FSDG-preference-defaults.patch`
		`'9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c' # 9003-FSDG-urihandlers.patch`
		`- '6908728072a69b7b9ba41b9b952fec90e835bc36ead1e6eb547a5a7985f763aea1709dbba77dc828a9f2e71e2abf2dbd7909115c66cdeb8d0a4942df60c2b978' # 9004-FSDG-misc.patch`
		`+ '82224f03e7688daebed3b70959206d2aa4758212f2982e9847862617a5a4005be29493fcd44066604f421ebec6b8c94dcf0cfbf03d0c3d670f00d5192d2421d7' # 9004-FSDG-misc.patch`
		`'085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4' # process-json-files.py`
		`'5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a') # vendor.js.in`
		`b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')`
		`@@ -338,6 +341,8 @@`


		`## technical patching ##`
		`+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691`
		`+ patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch`

		`# arch-specific technical patching`
		`case ${CARCH} in`

grizzlyuser commented a year ago

Depends on https://pagure.io/iceweasel/pull-request/9

WARNING! Arch Linux package is still in [testing]. Please do not publish this to [libre] before Arch package moves to [extra], because some of the patches were taken from Arch.

Built for x86_64 in fresh clean librechroot. Had to modify /usr/lib/libretools/chroot/mkarchroot to remove deprecated option 'd' dropped by pacstrap, so that it's now pacstrap -GMc

Older versions of python-zstandard and (probably) python-pydantic have to be installed for build to succeed.

Didn't try to build on i686 and armv7h, also didn't check if there were any updates from their upstreams, sorry.