Github messages for voidlinux
 help / color / mirror / Atom feed
From: Zapeth <Zapeth@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] firefox-esr: update to 102.6.0
Date: Wed, 21 Dec 2022 21:15:47 +0100	[thread overview]
Message-ID: <20221221201547.hVhp2CxrL9Hjlr1bO9QgZMpXrcOnBEe0ZF2-kWFwyTs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41060@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1614 bytes --]

There is an updated pull request by Zapeth against master on the void-packages repository

https://github.com/Zapeth/void-packages firefox-esr-update
https://github.com/void-linux/void-packages/pull/41060

firefox-esr: update to 102.6.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

I currently dont have the space to build and test this locally, but I wanted to at least start it off since apparently a somewhat important issue from 102 version was fixed -> https://bugzilla.mozilla.org/show_bug.cgi?id=1781167

Feel free to close this again, or use it for testing (there were also some language packs missing which I added)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/41060.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-esr-update-41060.patch --]
[-- Type: text/x-diff, Size: 27681 bytes --]

From 5b1d700a33c7aa11b7716470c3158bdf85b62533 Mon Sep 17 00:00:00 2001
From: Zapeth <steami@live.at>
Date: Tue, 13 Dec 2022 21:28:20 +0000
Subject: [PATCH 1/2] firefox-esr-i18n: update to 102.6.0

---
 srcpkgs/firefox-esr-i18n-ca-valencia |   1 +
 srcpkgs/firefox-esr-i18n-sco         |   1 +
 srcpkgs/firefox-esr-i18n-szl         |   1 +
 srcpkgs/firefox-esr-i18n-tl          |   1 +
 srcpkgs/firefox-esr-i18n-trs         |   1 +
 srcpkgs/firefox-esr-i18n/template    | 198 ++++++++++++++-------------
 6 files changed, 109 insertions(+), 94 deletions(-)
 create mode 120000 srcpkgs/firefox-esr-i18n-ca-valencia
 create mode 120000 srcpkgs/firefox-esr-i18n-sco
 create mode 120000 srcpkgs/firefox-esr-i18n-szl
 create mode 120000 srcpkgs/firefox-esr-i18n-tl
 create mode 120000 srcpkgs/firefox-esr-i18n-trs

diff --git a/srcpkgs/firefox-esr-i18n-ca-valencia b/srcpkgs/firefox-esr-i18n-ca-valencia
new file mode 120000
index 000000000000..0707c37f205d
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n-ca-valencia
@@ -0,0 +1 @@
+firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-sco b/srcpkgs/firefox-esr-i18n-sco
new file mode 120000
index 000000000000..0707c37f205d
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n-sco
@@ -0,0 +1 @@
+firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-szl b/srcpkgs/firefox-esr-i18n-szl
new file mode 120000
index 000000000000..0707c37f205d
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n-szl
@@ -0,0 +1 @@
+firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-tl b/srcpkgs/firefox-esr-i18n-tl
new file mode 120000
index 000000000000..0707c37f205d
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n-tl
@@ -0,0 +1 @@
+firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n-trs b/srcpkgs/firefox-esr-i18n-trs
new file mode 120000
index 000000000000..0707c37f205d
--- /dev/null
+++ b/srcpkgs/firefox-esr-i18n-trs
@@ -0,0 +1 @@
+firefox-esr-i18n
\ No newline at end of file
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index c4e43c47dffd..92bef23e953a 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=102.3.0
+version=102.6.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -26,6 +26,7 @@ _languages=(
 	'bn     "Bengali"'
 	'br     "Breton"'
 	'bs     "Bosnian"'
+	'ca-valencia "Català (Valencià)"'
 	'ca     "Catalan"'
 	'cak    "Kaqchikel"'
 	'cs     "Czech"'
@@ -89,6 +90,7 @@ _languages=(
 	'pt-PT  "Portuguese (Portugal)"'
 	'rm     "Romansh"'
 	'ro     "Romanian"'
+	'sco    "Scots"'
 	'ru     "Russian"'
 	'si     "Sinhala"'
 	'sk     "Slovak"'
@@ -97,10 +99,13 @@ _languages=(
 	'sq     "Albanian"'
 	'sr     "Serbian"'
 	'sv-SE  "Swedish"'
+	'szl    "Ślōnski"'
 	'ta     "Tamil"'
 	'te     "Telugu"'
 	'th     "Thai"'
+	'tl     "Tagalog (PH)"'
 	'tr     "Turkish"'
+	'trs    "Triqui (Oaxaca)"'
 	'uk     "Ukrainian"'
 	'ur     "Urdu"'
 	'uz     "Uzbek"'
@@ -135,96 +140,101 @@ _pkgtmpl() {
 	}
 }
 
-checksum="93dd0334d275731ea4f867500111fe38058e338b31591f8cee74133a55ff4d46
- fa0d0c3852e338171b763dd0d42543f72a0f2a0da1e329a317fd40ad4f046ab0
- f92fa0c86aae4911212d219d03cecf2243e781e166dbebb87e2b9872832458d4
- da30027303889ab80755f0d5cdecc4c8d31d4fd9be435fb8dc579fd715741027
- 710aa262aad3591203387d08c23aebfe862d64722be77f8fb768d6eaef4d6f09
- 167aa89e3706c5c1e54694c76a7d6e10babf5da1953cd1bd499483fcf2209cc4
- 1ebdaf2a6645a573dff3ad5307a73ad0cddef46b46e7ebd6b92a80a362b7d5d3
- de20466501dcb78fc5a6162107e783f8d631a46c726e11222d467794550f1dcc
- 8f14022666ecd3b60cd8ddab16aad96e36e5602c93146725d36de24536854c65
- 56303941a3c8c955a07976c147e3f2df84a2829855991dae3b578b6fce5ebbc5
- 6e169ce1d1eb13272cd975247c7f287ced1cfd579838c0f31ed7fa4e0cab310a
- a58bf622501b6b9e5d555ca05f1072daaeb65b4d51c59c6d9e1418b09923e4e2
- ef21061edb855fa55dec91b160593fcdba0733659e919b258268f246c470d19d
- 33adcfb41d9fc8a19ea0e701736a623739c26e444ae3cd08ab5f581f40e0e242
- 258521699d7b19dac022e1b0defe4a2321e8c6ea277ebc19ae4562225a0526c1
- 60b9343b5545fa4a945e24a36786fbb32fdc59eb4c30ead5e80797b3d73de977
- d77e153f50de3c70dfb0fd1497a8ad23067b508c13fea8e5c02aaf54b6b73730
- bfb2b490475c4d0d49255eb9bf8686b10beba3c03793c4fba7caa71fea82c207
- b9967ad09e94e2356dd00666a3554df9f9e47b26a2a42fd0cbbdadda88c2ed48
- e62a405e498600da9343066242e71ed5c2009b36739abbf1f2b291e25417059e
- 059e490f8553f3fb2622094c7e7d9f2f6e8f1e6b3d82ec9aa3f4440fb45559ab
- f85d72d646ef012f1cab077850769290507e4a418cff52e861e12503048d22e4
- 60d6b1e0335d3a614c800ab4d3ffe55d121c6de128aacd3b8a3e036319f75242
- dca5484a94569162dbe04d9af94f3e461b32e21fcf2eee000ff151dd3b7797c5
- cb092c2a6900f77c6108688760867e2a016c70ab27c39ed28a140247c1370260
- b1ffab35b5b5e163512148b1ee4e4ecf359664f9196328383ee36391917131d8
- ef8dfd8cc78a2ed55c9082236babfc29f90f0978864aef4ebb71c52c98e73702
- fc1c61833caa0cf8fc25dc314998f7d9a3fb282619cdaf6441caf17fc798dbb2
- 6fe864c9a8bd5b3f75f00ae920fb9959973098df801b290683550d2891686415
- 3ec10b9ed9fb6fa9d1108424f6c18f9209fcb0b3f5d7ae515fa8b7895cacd8f7
- 969bbaec56cf727b1f4113d9d05288d4e60dfafa71ab379b2df08314812ab59c
- c762c728c183b8561ca8d78e9f565c3029d90dfc76ce04d266de614bfec7d0af
- bc0f1e849910b78a790b76f630dc89e86e807914e57464a916eaab08fd865b9d
- 55b07e5d61ef668c7e53b7372eb9649c622efce1851dc11cfd967501a76afcc1
- 47f9f03ee0afa4bf77d1c914057b6b17e04bae12fc05955e26d8b300872bd4ad
- 702cf7be703b0cf9e8d6823a579db48ad45dd07e5658237b6dca2ecf31d797a6
- cdcaa5c9bed615d42c30e3cb911548e7850f8566dfb76c83eca6e7e2c29d2ba9
- 09f5abb8d89fd2e12e92a8b4898319ce93708418348ffef336d4b02809fa0cd1
- 40315720e6224e3b97ad4c82b1c9e2705e3e1d511967db8184fc04634402aa77
- b12abcc569961d2199d4e6bdd898d31d343b93ebdd1a5475f2241b07391aad33
- 14cc330337b33d427314179cceb51b11fa81d50314b816264c9029fc09b3efc6
- 38363be90fe01ee02b97d2eac9a04bd3dc732099b78561e4cc73b40c4980a34d
- b662514661d2551ace400614c908bd5eb51298306cce801f88ed9e5be2b3c7bb
- 9a38652bcec925b3c04694cae5e608831cc78f56ef22eb3c8bb1642d01168d55
- 6fcbc6be1336a78a752e51aaa48b02e64319699abdc6965519887426c496c545
- 7c0afb7fc6c12be340de564bbbc73be771dc10e8798f1fea3b701d5db41c34fa
- 1c50849335eb1b1ea9b44047c29250c1bfe55330ca7e9301cc487c5d9844355c
- 0144858c69dfaf30ab053409fdd3911d8615bbffd1d684a6372dcbb38a39a2cd
- be7b331955d522cdc8f7eee74a6e97b5cda0945fee53604b187b32620fe04f7b
- c7d1fbbf614622e0e5cc347cab61259bd86b1e31783d9edf1fd2afa7c753505e
- 59243fc2de6ce42e4770057d9c74c3ca85baebf1977e9e5b568e8bc6adffea6f
- 1da89fa826e7508b84cf2c535d479335bc890f333ebacf412c6792f26c2641b2
- 7c0c56550cdf663b94a6f7bf5c71dbe8a5f0968564d2240fa59b79baafdaba3f
- 305e398a64443dd3bd50250c5025163fb1b7320f3d134493b8fddc19222506aa
- f37861203a640b6b6ae00e499a14e71e58fa06483bf223baf1bdbf2a490717cb
- 68c2db3b213ca9c586e78548170d5d763d1775999277028acc4de26f94a396d8
- 2c28a6dc1f87fe124b4b1504ec80a06c5f5137891fc599432bcdb4a0d5aa6e41
- fdd4377915ef22021d7610cb5a9d6c91e53ac16eee9d6268a7c4c9c359a45a0a
- 999f8c2db0abf974722fc978e7f73457e674a8fca9b4ced04e92e163fd8597da
- 5bf73780e1f953f34c2367f0c27ca717baef14aaf645c385529c6c42a3a1c76e
- 841454849679338ae40eee0d7dc63c437dabd676aaaacfcf30daf06c9594c73c
- 8b3e9f1a73b45290567a92f04898f3013b2be985a33de136040f0bd3d8ca3874
- b80d180daca2d920e86a911566fdaa1dd1fd8fb3870a75e0af4e208a05e97e9c
- 63a88b6b2db14037f943b7bc28cfd41c2cb29666d34d4cf6c19266f8323436fd
- 04494a9b11b65ce2460485251c0bb9076bafefa0e0961f54a22b2baf9d237d58
- ab910c1330b3b5f82383c3f73c46f1bc2e712fa00cc6ec6e028cedf5cd578bfe
- e6d60b1a0ccd16236f1186825eb758703c9611b2ef20a6e88b2d4b7052411bb9
- 7429a4cf68dac3d6027da9422d29822f1a6853bc668f23849ca9e579a8bbc29b
- 4157a11e193a93349b92c1d0a69aa1f0c8cff0707287b8e77dcc61ab9038f63e
- d56c5832607ba90f2c4a16b1cfa65772e0b3cb9d9c987a2553179b033d4575b6
- 376bedbb1e53276df0daa64746da6022bdccadf0a3efb2ec58a284e3d877b065
- abd364052a3fabe0412492165ecd54e39e85eb00d93b0ae1f451ca28eab5cbb9
- 16f6d9e160fecd9a84fb4f1486e5b9c1c520266a052f49bf6fa1721c6a69b6bd
- 39a24d202c440af9d29795f64c82d03d85950efe09628e497a763305e60d806e
- 4cebed2c500946f17df5c55cfd707fc49a00767e6a80a725807788c3cf059f0a
- 2d7a3d099b7840cafc1fdebbb168b73642cd4bcf231d580bc6bcadcf3fe2af0f
- df625be3dfdd15bc654b39a470cd1599b03405f1e25874124845c21dffebb4a7
- bdd2aa7cce4727cfc2c4da1deffca9092d6791dd65410b77aa6040544ea345c0
- ce2478915b5541488a02a041d70383b554cbc6146ddbc8dc5a061275a67f3448
- a43892fdbb349a68132f43ffe8a574ecd7518fbc1115a01d576e1825d0e39ba8
- d0cee55ac73276aa173b6d749f83cba999d61f64e11a9dba648db5e6bfc41b64
- dafe1fa80f65d0acf510e229cf7337b48359fd15f4a4fcfb5d172eb6f32c8def
- ff8197abcb285d250b407b65f06fa246eb5a9d8eed19782baeeab8bb41f28d3c
- 008830ae0da7ab9c31c16eb671c5242fb50eee96b2f8f8c00d95c0a51bd2596e
- 00fadffb1745126d6f073327eab5ef0e8bf82d7929edf0cb1e34b4941aefc90a
- b2a1c6523290ebc895c8b263372c86cfe9e95016fcbbdd1b8964fc456ff0e855
- 1054ecc9013cb347b77e9a80d97fa89444e44f667d5d758beb8b7ca5e9da2b12
- c6736dab1165deb33024e6f33fedde79f55c6cbaa4a803ea4e41dec68b33399b
- 5aa0239328b4656fbed84dbcb4d8cc24a8232455c98888c064fa62bb927ca75f
- aac291540a7da9bed3eeb703ad975614f41b6f76e15ceb3b066000773ca961ab
- fcac28b2e02beeeccddc131da2a12ae9344a48669cc3037cb6f0429936af9879
- 693cb3b5196a0276c039497bc5c6e1c99e376959cb1a9802ffc8f08dc9d32c2a
- d962e094ec48a8042067d50d2b22b870c94b12ff35afc58c85bf2001fe98da9b"
+checksum="30afdf7ee7755539c7e639cb638ca538fc20b7762721e2ba6434bddda99326f5
+ 55357d349442c929d0865dea93b36387de67287014e30fd79f8c69d11774c8bd
+ 012f3021ce509fe4af605356a826a2dab4062e0e52dfb186e70bdc171ce00854
+ 41b391552b095713309cab1f8b3c430522f9ba4db3db0ae43eb80868387c6465
+ 06ffb55c19c92e202c2ecc60eb818cadbaaf23233002cef8ce01add4bca63437
+ 54172db63c100ab7450c609f6771eac9c277f9e617e4fb70d2d6c6ef7db48a09
+ ae88210a49f3c323ea6b83b249d82e1d24bfdd1d20da0c0e1b08da389377c5e8
+ 4c85ef0aa30df8c62fdacd5bb619bb3d7756a48bd8d2406912986f69f791771e
+ ae2c7020a6738939baf62f210c5932e806b723995169424691e07eba8ed76bea
+ ba48bd7be70cfa4a9e493941b894d85388adb2f3ed7e52f4e85db0c9bbe54a3f
+ 41a699afe8cb3edce3ef28d69ae848c41a0dc0ba3834a8ce52cdb18112b7d88e
+ d1cc01767b127df2b948bd7bb57ed2cfc607bd470412a1ce61226d82a1ba8c3c
+ 96da4e3cd738ff053370e9914f10a2a097384f2cfa27190d8dd7d796c25bdef0
+ 71e8494129277bfee30150278e1c785b70f6eb0b0b1a07e8e99e89d3d70d9506
+ 4fc247e054565c8d488ade103b443cf55c2bb9481f164b7448eefe388870afa4
+ 3725c1bea4cec3da9bc9906ae41bd2f445f6c04b30451d55a76bb0913ef445ef
+ 53479b5cedf7022148052c75a5dff070a27075d2afc4c41ddbaaa8a3ef0218c2
+ a2eeb4d8cf0e4eb462688dc23d446434e1e54a4f338d4d9d03212228e5a556b9
+ 36b7f839005862cb5e1c11b2326226bbcad1a5ae88927407d16723133d57eb2b
+ ef88124289dc5c0db7210a36ed732d59e50b66ee620254a7e0f18a9f512bbb00
+ 2fe3b6bec4af59abad6b4c2d7703077b632094ad51204f8037862edba1d353a6
+ 6478ed53ef27f6f98c35731ced95273b56f3f0fe38fb2a9e70a60f4c851ca22a
+ ee6059879c988800748b1cd5b71822e787eb7fa08ddc6ba9c94660bcf58404c7
+ f7c45567170acec4f9eb952afa5b8f9cf9195f5ba806698105359ea07a0325c8
+ d3b8ec2e1d0775277029c7b1b79be377eecb28c098f11185520632a15d8e1383
+ 3abf5bd1e1d87181d0f4f348ec8dd3f93fb02aa18ed3f2d6cb6ae532e044c3cf
+ fa41d7bdf6c4b043f06251d248361ddf2d1ff1995eda0d6a7f6074df965da075
+ 694dd1b4a87a7498dc5a3d1c3d656f0c70e7f86e65d46e83110f32008ea8170e
+ 02bed6610092641292307f58323993a302bfcc599b9afab59d913e96337a0d08
+ 4f7a9a11bee03d195dcc45e5235d30232799a36c1ec3ff78e45c66dcbfa42036
+ 58b85868cbd74d8199c01a4bcfbe54e49850b5543c6d53316b99a2c7d0495feb
+ 8d4c0e4ece5063ab6f2f111ee67a661ff07f117c6cfea429c97263a9d2baec29
+ a48c6831febf96efc98dfb4c79d5f2ebc40bc76105aa9b4ba6d0c9c07b838ca5
+ b9be967d3bde77ca140b88ced2514c4aa973477846ff02681342b460f20e664c
+ e19f4c816b6a597ff008d08fcd99a9279e4f88119dfa036aa3eca374f114c5a5
+ e2e50b65748375296cf071e3040110aaad163b13522caa47f50a95770020973a
+ 50750c55b63a5fa8d01ca1e32043cc79edb576edf639ddea0b36c6add783cec1
+ 7c680ed32eb2504c1ee984918f319d9c8b52bb7a7df78bc5691e92d4ef9f2aed
+ b6cb646c3d85c4e5153f3c1c82eb7d46c8b2eb04bbc1204e7bbada013de93a75
+ 37895af11e1dfe6316fdedd592b215e5dc12ddfc042322719df823605aad5bb2
+ 5a4d2fe576b8969023cdd62fec0412afcb3f921389ec04d6c98e6bbac1b95f4d
+ c875b86e2fc5dacf1fa95902feb44760e2f4cafe12643439fadaf2acebb6da3a
+ 1f87d290ea388ef22f81dbdac66461194a271a7f54a1cd85430e834208dc9335
+ c0f254743568cac14aa8a398e6a4c6adbe26a1bd39e71c6a7f527336ffb3ff9a
+ 24ed0b54a7d9db47545b330d8c2c30a95b58c54a638dfa8b87445787148afa27
+ b054740c6bca96ce4b961a9c34f517e81529785ff6772052aecd1c9c9b86531f
+ 5f239a10427ccfba183f9321247c258df5856f983e95eabfdb211b077a630d5c
+ c2e13ba994de8739e8bcbae4e214acff99004b267253acb1597fdab4bad34cad
+ b954cd09fed2d5dabde9b808d66bad5cfc3981db1c4e2e680cc7ebdfb134c63c
+ 5b61a8ce72113e7057faccf436c6d359025fb0a215697584b4afd7e13d2a157a
+ 84863641f0abfc9871121c9e33399e665eecfda5af5be2aac53b57481349690b
+ e2ab4e4530f2ab68048e516d33e0dee1428ee9343efa11cab7f89ea8de1837f1
+ 1bd242deb0107499dfa7799b61122d59b99365791cd1de68b55643f8489afe25
+ 0871d3d40876f0e399ebbf51b306f02fd35df19201dc684d94f8c9bff24282f0
+ 51c738ff9266e29690be71b925e0d998b29b4eb62a87fe31a405ba31003ce924
+ df4250ef778f86479afcf8525dafbc01c09c872733fe8e5c21a6f62475a8d8e7
+ 75884b3717231f51deb507e11c16ace04b2329cb9957f18f3db8ea7e4e64d230
+ 005c11bb8115c317724a8b7f9c631afefa9a446e70ed3677cc5ece66e5d29e54
+ 952a6dac53e479301f5e91c9a17d54d534c74ca8409065a48cb1b45253f86830
+ 99605723f67f66549e291f4ac2bed5a2dc83ae80d600f2e510efa65720c2166e
+ e129f1a9508fd52ae53389d3edd3cc32e608c9be7895121c7619fc0894c80fb9
+ a1f290ab094e0cb10e04d4492dbfaa34711658b5c751b863758dc41d326231ef
+ 94c511f09dc6ff2c1218808ee02345b7ed09d1e39a07c22fd1b7e5c9b9fdd477
+ f93253ceeae73d861bd94dbedac1a661aefd9e06da6ceee81a1496d10ea211be
+ 79f55257b060a30f3283c61c7e7cf8616c990aaea781bf2b4b4e1479f4798bf3
+ 48ed3bbee317b65656467d2fc44a95107b24a570980b154e695e85302694b8ef
+ 4a14cc00bbd86e7e7a469ac788445c5f5f685390306960060fcbb7752c0edb05
+ 7dfd1c9ad3907ed027a53011a181d05c73eaf41536185c11eff062ffa72c9d81
+ 638202edc8da9005bc2a0b025def627ef377678b29226d044bb1699bd032e3d0
+ c8424f30cc12cc5ac1fa4dc12b872cdb9796fecd6b6d8c122acce248a4f176c9
+ fe8e6fb8f2b059ff3f341e9e92574c61dbf9145a5569aa0c7b52588f74e5c659
+ d09e2bbde0b91bfcb16c3e007a8ce26e1fcb53a45f0e794a00ab07fe406772b5
+ 28f2f4a06f946188a881abf302df39319d123adbefea357f9b47515ba03ed733
+ ff38abede5a8a53fe5414c5c68259d702bed70d8980e9a6914665d91e1c8ec83
+ 28ccea4e773d9fba661f5c8eb4060669feb09928972bdeaa790d8a3c4aa93896
+ 26e97f131b83c841ac2958ecd00532e31fd5aa3aaf6140ed8993db8f929f99f8
+ b22a64e248eaa63ca966310a30eded472439f93cf918558eeae7466533c3699a
+ 1e743cc7a3c78700a15b4100ce0598dce95c6a4140cc6cccbb87bbd3c52f67b1
+ 514ff2a0a441da1b81f45362d42b577e25d9a2fda9f378436bead4b1bef8fd70
+ 8692d5345752c860459e829b63a6ef8dd654ffdd818dc322eab604eedcf9dffe
+ 47fe38623e974722f55d6bb93572b0cec1ff6e70cb681664279b849fa6957829
+ 8f797699a2d6d347614128db551041787932b64c578374d03fcda28443fba6e0
+ 62e3eaf174962d26ce0bc538359549a70e433d984a97a51eedd5d1f2a568a4a2
+ c3a4e68475a9142c1b8fe08380127a48b50144c2ea15b8cb1e1429040a19ca07
+ fe50dc674885b13cb8ab4054e394d498ef4d26f8fcf3271c52c4f866fb379bd0
+ eed85791ac913cd074feed7f20f51fe10bdd8c03e6b165b798adfbc423867983
+ 33e8b9bc0a4a495646b5b3d69bf9765ae54d6c9919a38d0664a254443306036b
+ dd154320a094aa61564dcac5539ee9927c2d95eea1eb01699f35a63713a35d4a
+ fbc54febb27fe8c607fa18102a53908c62bc2b983beed3941a3f7aeb1273d1e2
+ 5fea65168ffcbc22d0d77966cdbd2dc64a838a662ab31e32ad26f7c34ff99a60
+ 58d3d93b6aa5560aeb61bc107655a7d03e6488c0a2324a7bd45d4bdaa1cb2ed2
+ 00c091ee2b3a38fb28c06dfed4292079647ad6e3fb8f73da3ef31b08156d90a1
+ 624a36a8aa923bc8e71f196b9e509fedcbf3d280e2d98b9e14a930346a66d268
+ e38e3492084cedb17ade413e68cf9665e7dc789eaa0e7ae657abe044b1f35f59
+ b8401e80bab7d99dbd8b129ffa96cb0c310b4d5a9688202975a2c2e3bd250e17
+ cba00494fa4626241e5a42e4acb1cb7763a010e7cb88d9d81263cbeaaf6f44a4
+ 7a80c3fd57de2c475d261f90de592efe7c3b8906206c25ebcd2728c472b83de3
+ f0115900ae270631ae1858a2a62a944d4019fcb51fc5c3f65523ef7e513e738e"

From 4bb184abf4026356fe74e26972d34a2681780546 Mon Sep 17 00:00:00 2001
From: Zapeth <steami@live.at>
Date: Wed, 21 Dec 2022 20:13:51 +0000
Subject: [PATCH 2/2] firefox-esr: update to 102.6.0

---
 .../firefox-esr/patches/fix-cbindgen.patch    |  22 ----
 .../patches/fix-iomode-python3.11.patch       | 107 ++++++++++++++++++
 .../firefox-esr/patches/ply-python3.11.patch  |  85 ++++++++++++++
 srcpkgs/firefox-esr/template                  |   4 +-
 4 files changed, 194 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/firefox-esr/patches/fix-cbindgen.patch
 create mode 100644 srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch
 create mode 100644 srcpkgs/firefox-esr/patches/ply-python3.11.patch

diff --git a/srcpkgs/firefox-esr/patches/fix-cbindgen.patch b/srcpkgs/firefox-esr/patches/fix-cbindgen.patch
deleted file mode 100644
index ba3ce7ae3e97..000000000000
--- a/srcpkgs/firefox-esr/patches/fix-cbindgen.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix error with new cbindgen:
-
-/builddir/firefox-102.1.0/obj-x86_64-unknown-linux-gnu/dist/include/mozilla/webrender/webrender_ffi_generated.h:24:33: error: redefinition of 'constexpr const uint64_t mozilla::wr::ROOT_CLIP_CHAIN'
-   24 | constexpr static const uint64_t ROOT_CLIP_CHAIN = ~0;
-      |                                 ^~~~~~~~~~~~~~~
-/builddir/firefox-102.1.0/obj-x86_64-unknown-linux-gnu/dist/include/mozilla/webrender/webrender_ffi.h:76:16: note: 'const uint64_t mozilla::wr::ROOT_CLIP_CHAIN' previously defined here
-   76 | const uint64_t ROOT_CLIP_CHAIN = ~0;
-      |                ^~~~~~~~~~~~~~~
-
-diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h
-index b1d67b17a4bde..eb79974bdf434 100644
---- a/gfx/webrender_bindings/webrender_ffi.h
-+++ b/gfx/webrender_bindings/webrender_ffi.h
-@@ -73,8 +73,6 @@ struct WrPipelineInfo;
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
- 
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- }  // namespace wr
- }  // namespace mozilla
- 
diff --git a/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch b/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch
new file mode 100644
index 000000000000..3c13bc656d54
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/fix-iomode-python3.11.patch
@@ -0,0 +1,107 @@
+Support for 'U' mode was removed in python 3.11, see https://bugs.python.org/issue37330
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b3..7e2c714 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@ import re
+ 
+ def read_conf(conf_filename):
+     # Can't read/write from a single StringIO, so make a new one for reading.
+-    stream = open(conf_filename, "rU")
++    stream = open(conf_filename, "r")
+ 
+     def parse_counters(stream):
+         for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401a..aca59d0 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+     ) and not config.substs.get("JS_STANDALONE"):
+         config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+ 
+-    with open(path, "rU") as input:
++    with open(path, "r") as input:
+         r = re.compile(
+             "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+         )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986..b64a709 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ class BuildBackend(LoggingMixin):
+         return status
+ 
+     @contextmanager
+-    def _write_file(self, path=None, fh=None, readmode="rU"):
++    def _write_file(self, path=None, fh=None, readmode="r"):
+         """Context manager to write a file.
+ 
+         This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9..857f1a6 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ class Preprocessor:
+ 
+         if args:
+             for f in args:
+-                with io.open(f, "rU", encoding="utf-8") as input:
++                with io.open(f, "r", encoding="utf-8") as input:
+                     self.processFile(input=input, output=out)
+             if depfile:
+                 mk = Makefile()
+@@ -860,7 +860,7 @@ class Preprocessor:
+                     args = self.applyFilters(args)
+                 if not os.path.isabs(args):
+                     args = os.path.join(self.curdir, args)
+-                args = io.open(args, "rU", encoding="utf-8")
++                args = io.open(args, "r", encoding="utf-8")
+             except Preprocessor.Error:
+                 raise
+             except Exception:
+@@ -914,7 +914,7 @@ class Preprocessor:
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+     pp = Preprocessor(defines=defines, marker=marker)
+     for f in includes:
+-        with io.open(f, "rU", encoding="utf-8") as input:
++        with io.open(f, "r", encoding="utf-8") as input:
+             pp.processFile(input=input, output=output)
+     return pp.includes
+ 
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f164..4f1e0cd 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+     still occur, as well as diff capture if requested.
+     """
+ 
+-    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++    def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+         BytesIO.__init__(self)
+         self.name = filename
+         assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed..a295a67 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ class PreprocessedFile(BaseFile):
+         pp = Preprocessor(defines=self.defines, marker=self.marker)
+         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+ 
+-        with _open(self.path, "rU") as input:
++        with _open(self.path, "r") as input:
+             with _open(os.devnull, "w") as output:
+                 pp.processFile(input=input, output=output)
+ 
+@@ -611,7 +611,7 @@ class PreprocessedFile(BaseFile):
+         pp = Preprocessor(defines=self.defines, marker=self.marker)
+         pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+ 
+-        with _open(self.path, "rU") as input:
++        with _open(self.path, "r") as input:
+             pp.processFile(input=input, output=dest, depfile=deps_out)
+ 
+         dest.close()
diff --git a/srcpkgs/firefox-esr/patches/ply-python3.11.patch b/srcpkgs/firefox-esr/patches/ply-python3.11.patch
new file mode 100644
index 000000000000..8d1415a4b369
--- /dev/null
+++ b/srcpkgs/firefox-esr/patches/ply-python3.11.patch
@@ -0,0 +1,85 @@
+The Ply lexer, which doesn't seem too active a project, wraps regular
+expressions from grammar definitions in its own regular expressions that name
+groups. This breaks re.compile in Python >= 3.11 when the original expressions
+contain global flags, because the compiler requires that global flags appear at
+the start of the expression instead of inside the named group.
+
+This patch wraps re.compile to scan the expression for any global flags and,
+when found, moves them to the start of the expression.
+
+--- a/third_party/python/ply/ply/lex.py
++++ b/third_party/python/ply/ply/lex.py
+@@ -49,6 +49,37 @@
+     # Python 3.0
+     StringTypes = (str, bytes)
+ 
++
++def _re_compile(expression, *args, **kwargs):
++    '''
++    Rearrange global flags in the regular expression to appear at the
++    beginning, avoiding deprecation warnings on Python < 3.11 and hard
++    errors on Python >= 3.11.
++    '''
++    flags = set()
++    remainder = ''
++
++    pattern = re.compile(r'\(\?([aiLmsux]+)\)')
++    while m := pattern.search(expression):
++        # Location of the global flag spec
++        l, h = m.span(0)
++        # Accumulate global flags from this spec
++        flags.update(m.group(1))
++        # Capture all text leading up to the match
++        remainder += expression[:l]
++        # Trim to the end fo the flag spec
++        expression = expression[h:]
++
++    # Any remaining expression contains no flags
++    remainder += expression
++
++    # If there are flags, they belong at the beginning
++    if flags:
++        remainder = f'(?{"".join(sorted(flags))})' + remainder
++
++    return re.compile(remainder, *args, **kwargs)
++
++
+ # This regular expression is used to match valid token names
+ _is_identifier = re.compile(r'^[a-zA-Z0-9_]+$')
+ 
+@@ -230,7 +261,7 @@
+             titem = []
+             txtitem = []
+             for pat, func_name in lre:
+-                titem.append((re.compile(pat, lextab._lexreflags), _names_to_funcs(func_name, fdict)))
++                titem.append((_re_compile(pat, lextab._lexreflags), _names_to_funcs(func_name, fdict)))
+ 
+             self.lexstatere[statename] = titem
+             self.lexstateretext[statename] = txtitem
+@@ -495,7 +526,7 @@
+         return []
+     regex = '|'.join(relist)
+     try:
+-        lexre = re.compile(regex, reflags)
++        lexre = _re_compile(regex, reflags)
+ 
+         # Build the index to function map for the matching engine
+         lexindexfunc = [None] * (max(lexre.groupindex.values()) + 1)
+@@ -758,7 +789,7 @@
+                     continue
+ 
+                 try:
+-                    c = re.compile('(?P<%s>%s)' % (fname, _get_regex(f)), self.reflags)
++                    c = _re_compile('(?P<%s>%s)' % (fname, _get_regex(f)), self.reflags)
+                     if c.match(''):
+                         self.log.error("%s:%d: Regular expression for rule '%s' matches empty string", file, line, f.__name__)
+                         self.error = True
+@@ -782,7 +813,7 @@
+                     continue
+ 
+                 try:
+-                    c = re.compile('(?P<%s>%s)' % (name, r), self.reflags)
++                    c = _re_compile('(?P<%s>%s)' % (name, r), self.reflags)
+                     if (c.match('')):
+                         self.log.error("Regular expression for rule '%s' matches empty string", name)
+                         self.error = True
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 99ebf3d75e04..e160bacdce12 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=102.3.0
+version=102.6.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=308e23b6dcf964e342cf95fd0c8a386127371b620a489ae26e537d728341b55a
+checksum=d23154a4d876d76122161e7be2659de6e88985802d9e5125baf1d133f37f0ffe
 
 lib32disabled=yes
 

  parent reply	other threads:[~2022-12-21 20:15 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-13 14:23 [PR PATCH] " Zapeth
2022-12-13 17:44 ` [PR PATCH] [Updated] " Zapeth
2022-12-13 17:51 ` Zapeth
2022-12-13 18:42 ` [PR PATCH] [Updated] " Zapeth
2022-12-13 21:30 ` Zapeth
2022-12-14 10:11 ` biopsin
2022-12-14 10:15 ` biopsin
2022-12-14 13:42 ` [PR PATCH] [Updated] " Zapeth
2022-12-14 13:50 ` Zapeth
2022-12-14 15:01 ` [PR PATCH] [Updated] " Zapeth
2022-12-14 15:03 ` Zapeth
2022-12-14 17:16 ` biopsin
2022-12-14 17:32 ` paper42
2022-12-14 18:35 ` [PR PATCH] [Updated] " Zapeth
2022-12-14 18:39 ` Zapeth
2022-12-21 20:15 ` Zapeth [this message]
2022-12-22  9:18 ` biopsin
2022-12-22 18:08 ` [PR PATCH] [Updated] " Zapeth
2022-12-22 18:32 ` Zapeth
2022-12-22 19:12 ` Zapeth
2022-12-22 19:12 ` Zapeth
2022-12-22 23:36 ` biopsin
2022-12-31 16:36 ` paper42
2022-12-31 16:55 ` [PR PATCH] [Updated] " Zapeth
2023-01-18 11:18 ` Zapeth
2023-01-18 11:27 ` Zapeth
2023-01-21 10:08 ` firefox-esr: update to 102.7.0 biopsin
2023-01-21 10:26 ` Zapeth
2023-01-21 12:22 ` biopsin
2023-03-05  9:28 ` biopsin
2023-03-05 16:50 ` Zapeth
2023-03-05 16:55 ` Zapeth
2023-04-11 14:07 ` [PR PATCH] [Closed]: " Zapeth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221221201547.hVhp2CxrL9Hjlr1bO9QgZMpXrcOnBEe0ZF2-kWFwyTs@z \
    --to=zapeth@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).