diff --git a/backports/electron-tasje/APKBUILD b/backports/electron-tasje/APKBUILD index ac8776a..2f92d3b 100644 --- a/backports/electron-tasje/APKBUILD +++ b/backports/electron-tasje/APKBUILD @@ -1,7 +1,7 @@ # Contributor: lauren n. liberda # Maintainer: lauren n. liberda pkgname=electron-tasje -pkgver=0.7.3 +pkgver=0.7.4 pkgrel=0 pkgdesc="Tiny replacement for electron-builder" url="https://codeberg.org/selfisekai/electron_tasje/" @@ -31,5 +31,5 @@ package() { } sha512sums=" -251b7eabe74acdb5c7394f9d4d735b736acf555352785a9896ddaeed37632b238e823e1bb639e1f5a44a50455957ec41e1a585a3b2a9919b5818bb40843bd877 electron_tasje-0.7.3.tar.gz +e2f028e4bdba0ea47bd4b51f6495315bebf1009e8037d446c9dd4826656e65f2b5dfd3be1efe40c20e0c8ce482ff9588bc20603fa7b11b48c5147f98be46cedd electron_tasje-0.7.4.tar.gz " diff --git a/backports/element-desktop/APKBUILD b/backports/element-desktop/APKBUILD index c5d8fd7..6430945 100644 --- a/backports/element-desktop/APKBUILD +++ b/backports/element-desktop/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda maintainer="lauren n. liberda " pkgname=element-desktop -pkgver=1.12.3 -pkgrel=1 +pkgver=1.12.8 +pkgrel=0 pkgdesc="Secure and independent communication, connected via Matrix" url="https://element.io/" arch="aarch64 x86_64" # same as electron @@ -27,7 +27,6 @@ makedepends=" python3 py3-setuptools sqlcipher-dev - swc yarn " source=" @@ -39,6 +38,7 @@ source=" tasje-fixes.patch no-source-maps.patch.web use-system-fonts.patch.web + rollup-wasm.patch.web element-desktop " @@ -90,15 +90,38 @@ prepare() { yarn install --frozen-lockfile --ignore-scripts --ignore-engines jq '.show_labs_settings = true' < config.sample.json > config.json ) + # install script + ( + cd "$srcdir"/element-web-$pkgver/packages/shared-components + yarn install --frozen-lockfile --ignore-scripts + ) + # postinstall + ( + cd "$srcdir"/element-web-$pkgver + yarn run patch-package + ) ln -s "$srcdir"/element-web-$pkgver/webapp webapp msg "Fetch element-desktop dependencies" yarn install --frozen-lockfile --ignore-scripts - patch -p1 -i patches/@types+auto-launch+5.0.5.patch + yarn run patch-package } build() { + ( + cd "$srcdir"/element-web-$pkgver/packages/shared-components + yarn run patch-package + ) + ( + cd "$srcdir"/element-web-$pkgver + NODE_ENV=production yarn build:res + ) + ( + cd "$srcdir"/element-web-$pkgver/packages/shared-components + NODE_ENV=production node scripts/gatherTranslationKeys.ts + NODE_ENV=production yarn run vite build + ) ( cd "$srcdir"/element-web-$pkgver @@ -118,20 +141,9 @@ build() { yarn build:res - # we need it as js to be of any use for tasje. - # fails with `yarn tsc`. https://github.com/electron-userland/electron-builder/issues/7961 - swc compile electron-builder.ts --out-file electron-builder.mjs - yarn install --frozen-lockfile --ignore-scripts --production - npm rebuild keytar-forked --nodedir=/usr/include/electron/node_headers --build-from-source - find node_modules/keytar-forked/build/ -type f \ - \! -path node_modules/keytar-forked/build/Release/keytar.node \ - -delete - # stripping in build because it gets into asar - strip node_modules/keytar-forked/build/Release/keytar.node - - tasje -c electron-builder.mjs pack + tasje -c electron-builder.ts pack } check() { @@ -148,8 +160,6 @@ package() { install -Dm644 $resources/app.asar "$pkgdir"/usr/lib/element-desktop/app.asar install -Dm644 webapp.asar "$pkgdir"/usr/lib/element-desktop/webapp.asar - cp -r $resources/app.asar.unpacked "$pkgdir"/usr/lib/element-desktop/app.asar.unpacked - install -Dm644 $resources/build/icon.png "$pkgdir"/usr/lib/element-desktop/build/icon.png install -Dm755 "$srcdir"/$pkgname "$pkgdir"/usr/bin/$pkgname @@ -161,12 +171,13 @@ package() { } sha512sums=" -f302907165a35f4a4f069f5aec6bc28edeba3d09c75f483c818e3930ceb4e838e5bb91ad9d42019a11a661d6e656da3c1ff25507cbb281c69183aac7d499e882 element-desktop-1.12.3.tar.gz -b845ff71ca39d7ae4dca9bb55e821bfdf911b12de5d012ba55d598f3287046fb2b525bce608925a9fa8fa7d39a4ceed9b4213d5d1c1d0c9e6b9b72154c9a35a5 element-web-1.12.3.tar.gz +e5cacd02e8cfe7f8bbe146de6a6fe5db2383dbe32c5ba2b1f606b67157958f25d0eaabd53bcb28533efc7d76375399577bfc89db2aa5002cbf8b059d7271e7c0 element-desktop-1.12.8.tar.gz +c3920a84d144094f6a10b57ce00119b63772d9dc67a921c5cb94dc033680b5ad28304b049785f73169ec8fb478db9cc713a2bd66c896ed4a1ce6c977012d858d element-web-1.12.8.tar.gz 4747893ed3e43d3074e9afe1cdd668a6be0de073d439205fe8c38c5e0f4091cc76e3cd15d98818bea5139add29501d8d07e83c58e9da230a4ce5bb538d388f80 add-alpine-targets.patch 755b17f7b828eb6920c06a6950ad4e14c32c99d22e9c05fcef7a081b5d2034adb03db3958aa5209c99fb7201f4d888c2383fc9864c5e743dd33f8b5c4925acd7 use-system-headers.patch -a5d90dd1ec7aec0dc18b73eb3a6fd51ac1223e381c492d24e7dc0fd2ade955ac727cebbaff6ffa27c7e18d9acf712c709de3f886ee2ddf87ab3b028d3eb461c6 tasje-fixes.patch +3dce5d3fe48b8f76e1e53c28090737a191f581ca2ad3d5a217d1f295a2667a0e4c9c5edab73f902dbf85e9342711d68d42f21d09c8cb4de31f95451f02eea41d tasje-fixes.patch ec635fde026f7fce8e8cc57960b5b9dcec4418416d4867ed47711422d48f068bb58a3c9ceb7715efc9c177beca3788da6b0babc9b689ea8c0724a0395f2b85f8 no-source-maps.patch.web -aaf46476bac403aa5204aa265fcf0654fad4c149fd74d0ec4273c051a5549943384cae3cdd62c5b78fdedfed55c11ecceb898b886e44165cbe7e30953a095cf9 use-system-fonts.patch.web +378a70e87e325091ac4770153d7eeba82684f4670797e6a73c4b623d8450ea7852e9fd28ac177e6b282e085b2940b43c68554a1466270ff9925e0c2e7aacfd51 use-system-fonts.patch.web +b1d2ae29325d945435ad7477b0f351d99503e5e2119e67674dfb69a51afb7297f707ce7f1b4404f31d84d9e9617ab08656c5d9692ed8412d6eef44e6ffb2c3b2 rollup-wasm.patch.web afc588311dc3b566a754e3e7fe6b37b99a06d47b8bbce0ed9acca8ef308fdab0bd1d41b406199e5cbdd86bdce695ff847cd8668857a235cbdc292ad8b899c063 element-desktop " diff --git a/backports/element-desktop/rollup-wasm.patch.web b/backports/element-desktop/rollup-wasm.patch.web new file mode 100644 index 0000000..e2fc56e --- /dev/null +++ b/backports/element-desktop/rollup-wasm.patch.web @@ -0,0 +1,168 @@ +--- ./packages/shared-components/package.json.orig ++++ ./packages/shared-components/package.json +@@ -46,6 +46,7 @@ + "test:storybook:update": "playwright-screenshots --entrypoint yarn --with-node-modules && playwright-screenshots --entrypoint /work/node_modules/.bin/test-storybook --with-node-modules --url http://host.docker.internal:6007/ --updateSnapshot" + }, + "resolutions": { ++ "rollup": "npm:@rollup/wasm-node@4.53.3", + "playwright": "1.57.0" + }, + "dependencies": { +--- ./packages/shared-components/yarn.lock.orig ++++ ./packages/shared-components/yarn.lock +@@ -1129,116 +1129,6 @@ + estree-walker "^2.0.2" + picomatch "^4.0.2" + +-"@rollup/rollup-android-arm-eabi@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.3.tgz#7e478b66180c5330429dd161bf84dad66b59c8eb" +- integrity sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w== +- +-"@rollup/rollup-android-arm64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.3.tgz#2b025510c53a5e3962d3edade91fba9368c9d71c" +- integrity sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w== +- +-"@rollup/rollup-darwin-arm64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.3.tgz#3577c38af68ccf34c03e84f476bfd526abca10a0" +- integrity sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA== +- +-"@rollup/rollup-darwin-x64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.3.tgz#2bf5f2520a1f3b551723d274b9669ba5b75ed69c" +- integrity sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ== +- +-"@rollup/rollup-freebsd-arm64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.3.tgz#4bb9cc80252564c158efc0710153c71633f1927c" +- integrity sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w== +- +-"@rollup/rollup-freebsd-x64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.3.tgz#2301289094d49415a380cf942219ae9d8b127440" +- integrity sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q== +- +-"@rollup/rollup-linux-arm-gnueabihf@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.3.tgz#1d03d776f2065e09fc141df7d143476e94acca88" +- integrity sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw== +- +-"@rollup/rollup-linux-arm-musleabihf@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.3.tgz#8623de0e040b2fd52a541c602688228f51f96701" +- integrity sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg== +- +-"@rollup/rollup-linux-arm64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.3.tgz#ce2d1999bc166277935dde0301cde3dd0417fb6e" +- integrity sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w== +- +-"@rollup/rollup-linux-arm64-musl@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.3.tgz#88c2523778444da952651a2219026416564a4899" +- integrity sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A== +- +-"@rollup/rollup-linux-loong64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.3.tgz#578ca2220a200ac4226c536c10c8cc6e4f276714" +- integrity sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g== +- +-"@rollup/rollup-linux-ppc64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.3.tgz#aa338d3effd4168a20a5023834a74ba2c3081293" +- integrity sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw== +- +-"@rollup/rollup-linux-riscv64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.3.tgz#16ba582f9f6cff58119aa242782209b1557a1508" +- integrity sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g== +- +-"@rollup/rollup-linux-riscv64-musl@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.3.tgz#e404a77ebd6378483888b8064c703adb011340ab" +- integrity sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A== +- +-"@rollup/rollup-linux-s390x-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.3.tgz#92ad52d306227c56bec43d96ad2164495437ffe6" +- integrity sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg== +- +-"@rollup/rollup-linux-x64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz#fd0dea3bb9aa07e7083579f25e1c2285a46cb9fa" +- integrity sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w== +- +-"@rollup/rollup-linux-x64-musl@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz#37a3efb09f18d555f8afc490e1f0444885de8951" +- integrity sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q== +- +-"@rollup/rollup-openharmony-arm64@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.3.tgz#c489bec9f4f8320d42c9b324cca220c90091c1f7" +- integrity sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw== +- +-"@rollup/rollup-win32-arm64-msvc@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.3.tgz#152832b5f79dc22d1606fac3db946283601b7080" +- integrity sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw== +- +-"@rollup/rollup-win32-ia32-msvc@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.3.tgz#54d91b2bb3bf3e9f30d32b72065a4e52b3a172a5" +- integrity sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA== +- +-"@rollup/rollup-win32-x64-gnu@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.3.tgz#df9df03e61a003873efec8decd2034e7f135c71e" +- integrity sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg== +- +-"@rollup/rollup-win32-x64-msvc@4.53.3": +- version "4.53.3" +- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.3.tgz#38ae84f4c04226c1d56a3b17296ef1e0460ecdfe" +- integrity sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ== +- + "@rushstack/node-core-library@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-5.17.0.tgz#30b9c7b1fe01f79e6448d0433d163ef4d3b290c9" +@@ -6180,35 +6070,13 @@ + hash-base "^3.1.2" + inherits "^2.0.4" + +-rollup@^4.43.0: ++rollup@^4.43.0, "rollup@npm:@rollup/wasm-node@4.53.3": + version "4.53.3" +- resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.53.3.tgz#dbc8cd8743b38710019fb8297e8d7a76e3faa406" +- integrity sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA== ++ resolved "https://registry.yarnpkg.com/@rollup/wasm-node/-/wasm-node-4.53.3.tgz#29dca5b11744c211a8ba3b9fc2c07cdc0aceade3" ++ integrity sha512-mB8z32H6kz4kVjn+tfTGcrXBae7rIeAvm/g6itsE3IqcXpjSRRvk1/EOWDEi5wL8NNmxXiH71t4jtNfr128zpw== + dependencies: + "@types/estree" "1.0.8" + optionalDependencies: +- "@rollup/rollup-android-arm-eabi" "4.53.3" +- "@rollup/rollup-android-arm64" "4.53.3" +- "@rollup/rollup-darwin-arm64" "4.53.3" +- "@rollup/rollup-darwin-x64" "4.53.3" +- "@rollup/rollup-freebsd-arm64" "4.53.3" +- "@rollup/rollup-freebsd-x64" "4.53.3" +- "@rollup/rollup-linux-arm-gnueabihf" "4.53.3" +- "@rollup/rollup-linux-arm-musleabihf" "4.53.3" +- "@rollup/rollup-linux-arm64-gnu" "4.53.3" +- "@rollup/rollup-linux-arm64-musl" "4.53.3" +- "@rollup/rollup-linux-loong64-gnu" "4.53.3" +- "@rollup/rollup-linux-ppc64-gnu" "4.53.3" +- "@rollup/rollup-linux-riscv64-gnu" "4.53.3" +- "@rollup/rollup-linux-riscv64-musl" "4.53.3" +- "@rollup/rollup-linux-s390x-gnu" "4.53.3" +- "@rollup/rollup-linux-x64-gnu" "4.53.3" +- "@rollup/rollup-linux-x64-musl" "4.53.3" +- "@rollup/rollup-openharmony-arm64" "4.53.3" +- "@rollup/rollup-win32-arm64-msvc" "4.53.3" +- "@rollup/rollup-win32-ia32-msvc" "4.53.3" +- "@rollup/rollup-win32-x64-gnu" "4.53.3" +- "@rollup/rollup-win32-x64-msvc" "4.53.3" + fsevents "~2.3.2" + + run-parallel@^1.1.9: diff --git a/backports/element-desktop/tasje-fixes.patch b/backports/element-desktop/tasje-fixes.patch index 0e026c5..a018f57 100644 --- a/backports/element-desktop/tasje-fixes.patch +++ b/backports/element-desktop/tasje-fixes.patch @@ -1,3 +1,5 @@ +type imports fail due to importing non-production package. + directories in .hak/hakModules are already symlinked inside node_modules, and as such are already being copied by default. this makes tasje fail with: ``` @@ -9,7 +11,15 @@ console.log interferes with tasje, which reads config from node stdout --- ./electron-builder.ts.orig +++ ./electron-builder.ts -@@ -72,10 +72,6 @@ +@@ -1,7 +1,6 @@ + import * as os from "node:os"; + import * as fs from "node:fs"; + import * as path from "node:path"; +-import { type Configuration as BaseConfiguration, type Protocol } from "electron-builder"; + + /** + * This script has different outputs depending on your os platform. +@@ -72,10 +71,6 @@ console.warn(`No VARIANT_PATH specified, using default variant configuration '${DEFAULT_VARIANT}':`); } @@ -20,7 +30,7 @@ console.log interferes with tasje, which reads config from node stdout interface Configuration extends BaseConfiguration { extraMetadata: Partial> & ExtraMetadata; linux: BaseConfiguration["linux"]; -@@ -112,10 +108,6 @@ +@@ -112,10 +107,6 @@ }, files: [ "package.json", diff --git a/backports/element-desktop/use-system-fonts.patch.web b/backports/element-desktop/use-system-fonts.patch.web index 855fdea..0edb374 100644 --- a/backports/element-desktop/use-system-fonts.patch.web +++ b/backports/element-desktop/use-system-fonts.patch.web @@ -69,10 +69,10 @@ -import "@fontsource/inter/700.css"; -import "@fontsource/inter/700-italic.css"; - --import "@fontsource/inconsolata/latin-ext-400.css"; --import "@fontsource/inconsolata/latin-400.css"; --import "@fontsource/inconsolata/latin-ext-700.css"; --import "@fontsource/inconsolata/latin-700.css"; +-import "@fontsource/fira-code/latin-ext-400.css"; +-import "@fontsource/fira-code/latin-400.css"; +-import "@fontsource/fira-code/latin-ext-700.css"; +-import "@fontsource/fira-code/latin-700.css"; - import { logger } from "matrix-js-sdk/src/logger";