From fdc65f814fd4b2148e5741eafa730ab0fb613d37 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 17:15:45 +0200 Subject: [PATCH 1/2] firefox: update to 99.0. --- .../patches/fix-dot-desktop-startupwmclass.patch | 10 ++++++++++ srcpkgs/firefox/template | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/firefox/patches/fix-dot-desktop-startupwmclass.patch diff --git a/srcpkgs/firefox/patches/fix-dot-desktop-startupwmclass.patch b/srcpkgs/firefox/patches/fix-dot-desktop-startupwmclass.patch new file mode 100644 index 000000000000..0cb554598b0f --- /dev/null +++ b/srcpkgs/firefox/patches/fix-dot-desktop-startupwmclass.patch @@ -0,0 +1,10 @@ +--- a/taskcluster/docker/firefox-snap/firefox.desktop ++++ b/taskcluster/docker/firefox-snap/firefox.desktop +@@ -159,6 +159,7 @@ + MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; + StartupNotify=true + Actions=NewWindow;NewPrivateWindow; ++StartupWMClass=@MOZ_APP_REMOTINGNAME@ + + [Desktop Action NewWindow] + Name=Open a New Window diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 6c1596b19e06..8134b3269089 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=98.0 +version=99.0 revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" @@ -11,7 +11,7 @@ maintainer="Duncaen " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd +checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327 lib32disabled=yes @@ -64,6 +64,9 @@ post_extract() { # Mozilla API keys (see https://location.services.mozilla.com/api) # Note: This is for Void Linux use ONLY. echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key + + # add the right StartupWMClass to the desktop file we install later + vsed -i -e "s/@MOZ_APP_REMOTINGNAME@/Firefox/docker/firefox-snap/firefox.desktop } post_patch() { @@ -73,6 +76,8 @@ post_patch() { do_build() { cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig" + echo "MOZ_APP_REMOTINGNAME=Firefox" >>.mozconfig + case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig From 006db53460abada00f49617cefeb91e8cbf1e3ec Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 5 Apr 2022 17:15:53 +0200 Subject: [PATCH 2/2] firefox-i18n: update to 99.0. --- srcpkgs/firefox-i18n/template | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index 713c5914d0ab..0e98d438bd21 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -1,6 +1,6 @@ # Template file for 'firefox-i18n' pkgname=firefox-i18n -version=98.0 +version=99.0 revision=1 build_style=meta short_desc="Firefox language packs" @@ -140,99 +140,99 @@ _pkgtmpl() { } } -checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f - b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616 - 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06 - 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86 - b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd - dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0 - 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6 - 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815 - b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8 - bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b - 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30 - d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb - 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58 - cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2 - fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6 - e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b - 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141 - 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e - b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d - 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9 - 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8 - 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee - 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f - ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676 - c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f - fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602 - bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9 - 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f - 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9 - 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec - d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0 - 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6 - 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3 - 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095 - bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b - fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33 - bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953 - b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95 - 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812 - cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956 - cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97 - 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee - 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267 - f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206 - 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535 - 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e - 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189 - 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616 - 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1 - c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314 - 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838 - c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0 - c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768 - 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f - 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8 - 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239 - 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c - 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4 - 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06 - 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272 - ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504 - 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c - b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484 - 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af - 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3 - 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40 - a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4 - 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c - ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854 - cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8 - b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b - b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c - 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374 - 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda - 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6 - 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d - 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d - 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80 - 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed - 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50 - 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade - ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc - 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be - b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e - 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352 - 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121 - 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b - 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef - 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804 - a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82 - 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83 - 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320 - 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11 - 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196 - d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8 - 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea" +checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc + a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f + 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960 + 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681 + 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47 + 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2 + fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517 + c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0 + c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980 + e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6 + 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749 + 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83 + 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984 + 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee + 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160 + 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19 + 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897 + 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623 + 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca + cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c + 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c + 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93 + 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56 + 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb + 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5 + faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161 + 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317 + 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7 + 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485 + da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0 + 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070 + 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396 + 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7 + 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7 + 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2 + c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578 + ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90 + e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549 + cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1 + 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92 + bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952 + 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783 + 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be + 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147 + 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84 + 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1 + c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa + 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a + 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7 + 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4 + 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c + 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a + 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f + 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee + 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99 + 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27 + bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1 + 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1 + 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d + 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933 + 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57 + 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf + 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280 + d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3 + 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274 + 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60 + 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0 + b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580 + 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4 + 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d + 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4 + f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084 + e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3 + bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8 + 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0 + 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e + 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a + eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487 + 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2 + 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28 + 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6 + 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154 + 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057 + 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a + 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b + 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e + cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9 + d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582 + 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb + 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518 + dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9 + 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3 + 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a + aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8 + d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf + 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"