diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-10-08 04:26:34 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-08 04:26:34 +0100 |
commit | 325837835fc86686829aaa6acace3d3c06c74cea (patch) | |
tree | 6cc31680e4ce26ab26e863fd7b72d0ffe2d9366f /net-im | |
parent | 7ad61ca2bfc8f8da08d2fb3085e4333dcccb0a64 (diff) |
gentoo auto-resync : 08:10:2024 - 04:26:34
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/Manifest.gz | bin | 9074 -> 9072 bytes | |||
-rw-r--r-- | net-im/neochat/Manifest | 4 | ||||
-rw-r--r-- | net-im/neochat/neochat-24.05.2-r2.ebuild (renamed from net-im/neochat/neochat-24.05.2-r1.ebuild) | 2 | ||||
-rw-r--r-- | net-im/neochat/neochat-24.08.1-r2.ebuild (renamed from net-im/neochat/neochat-24.08.1-r1.ebuild) | 2 | ||||
-rw-r--r-- | net-im/telegram-desktop/Manifest | 2 | ||||
-rw-r--r-- | net-im/telegram-desktop/telegram-desktop-5.6.0.ebuild | 261 |
6 files changed, 267 insertions, 4 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz Binary files differindex 163c3e35290f..90b15436333e 100644 --- a/net-im/Manifest.gz +++ b/net-im/Manifest.gz diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest index 65dfc946ee8b..32bc09404300 100644 --- a/net-im/neochat/Manifest +++ b/net-im/neochat/Manifest @@ -1,5 +1,5 @@ DIST neochat-24.05.2.tar.xz 980740 BLAKE2B ad04b0ac30337195d1666a308e354efa6bedfb6268f644c36d2fa2f9276ef4670311981377272552c3573c9cd78a223e285022c97169bee5c141460bdcd84ccd SHA512 fef944f0b7b4f4ce85645a18791a08b225989d7a55736a5946ae71c5db850f8ce620622ffcc276d688bc0047115067fb04c5aa48b3917e97b86fca0ca6bbb1d9 DIST neochat-24.08.1.tar.xz 1025240 BLAKE2B 1d257a5d35a8e5df03c8ad98e951dff32b4266e1535af7809e0fb61eab0c67b8186afbb787dd71b6cd3c9ecb1afbfb92769fe0756132ba8d0e3ddbd16fe12447 SHA512 fc480e0f936e5059d9c71ea2d6c4344ac9a5fb80c32b830937e423adb3ac46608a0ee54fd24db53e59c28968bbe05c3afc88ce11b7d2568f9382389bac885196 -EBUILD neochat-24.05.2-r1.ebuild 1856 BLAKE2B 13626045703868f96189026c639a833d02386893859951520155f59015c014eef8ae9f59f65238260c86b73f91777c973625e457449689617f2189f50665e736 SHA512 120c20f1b8ebe02fe65b8a66948acc8494315245b53b600c4d5333d7ed4305baecdce37ab7b95686953ea831f2c2c6e6ecc81c13ec15231e49ff4183727c406b -EBUILD neochat-24.08.1-r1.ebuild 1853 BLAKE2B 7406fb1cc8f99fa3d13781521096ed37ce5ae075022a6d26fe5115c4903dda3a624ee60b90165c5d5316b1177f6fd892bb3e7d63045cccdc0e07c42b88bdd046 SHA512 77d8414a0ea7426912b9d1f783d6dd6a4734aae194da9ccbcef94e7ea22e4df9673ef25fc936c186529bef3369cecfa4c4538b6a290b4f10e5ca68d6d2724bea +EBUILD neochat-24.05.2-r2.ebuild 1859 BLAKE2B ef6844495ad0ac625a2da463e07b178f4a5b489b3c000abf1039115f30d415bf0a9d3d0203ce6bc8faee13d54aacccf449c93ea65d1eec22facf9f13097be071 SHA512 f299d9ac44cea32862e65cea8fed0436bf7c9e5a0ed7f3a834e061e9ac5589ad815396a6d5637523427b6c4a745fb38e6d87db0267da06d7f0ca84708e483f13 +EBUILD neochat-24.08.1-r2.ebuild 1856 BLAKE2B a90ca6ae3e319600be8a05daf4e30f4807143b02b6869111d8a870b576fbb9b6320c9fe1831859aadc7ea9c88f1a89f069aa3407de01c222f30478a48b695dbe SHA512 5a51a7373a630c9001cfe501e2848ff4c0d897a87a006433a9dddb3497f4637b91c09918e10906667685c36cdd79c560a36fe9f2bd3390d87178315bd2bd2dd1 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/net-im/neochat/neochat-24.05.2-r1.ebuild b/net-im/neochat/neochat-24.05.2-r2.ebuild index 3b2b29f80c7f..ad1fe7e5da07 100644 --- a/net-im/neochat/neochat-24.05.2-r1.ebuild +++ b/net-im/neochat/neochat-24.05.2-r2.ebuild @@ -46,7 +46,7 @@ DEPEND=" >=kde-frameworks/sonnet-${KFMIN}:6[qml] >=kde-frameworks/syntax-highlighting-${KFMIN}:6 media-libs/kquickimageeditor:6 - >=net-libs/libquotient-0.8.1.2-r1:=[qt6] + >=net-libs/libquotient-0.8.1.2-r1:=[qt6(+)] " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] diff --git a/net-im/neochat/neochat-24.08.1-r1.ebuild b/net-im/neochat/neochat-24.08.1-r2.ebuild index 779cfb088e8c..eab060dd1363 100644 --- a/net-im/neochat/neochat-24.08.1-r1.ebuild +++ b/net-im/neochat/neochat-24.08.1-r2.ebuild @@ -46,7 +46,7 @@ DEPEND=" >=kde-frameworks/sonnet-${KFMIN}:6[qml] >=kde-frameworks/syntax-highlighting-${KFMIN}:6 media-libs/kquickimageeditor:6 - >=net-libs/libquotient-0.8.2:=[qt6] + >=net-libs/libquotient-0.8.2:=[qt6(+)] " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index d49c8495c980..b54fb656e41c 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -8,9 +8,11 @@ DIST tdesktop-5.2.3-full.tar.gz 69745773 BLAKE2B a6811098d2e0f8d0ebc0d7ac4d39298 DIST tdesktop-5.4.1-full.tar.gz 70056797 BLAKE2B 078a747c51df9ca8a173270b128e5c84439706b6c9d5ecde0fb0c88301f709b01613d2a895e9d1219809093cf3409211e63d8e131abed172c16192763dadc764 SHA512 f86b86c6001b2c214d897821c175f41c53ca44401285909b2b12254634cca821137d61a28c75d79ed757c1ade08873035397aae7c462494c1ab6382501a8072a DIST tdesktop-5.5.1-full.tar.gz 70095171 BLAKE2B 3221defb9df90333434b688e698b7c1ef842dca968049f3cd0cee428da353867cac52a0325fa1006e7d0a11d693c8e5e28b1983b57217ac4c227831cf1052214 SHA512 c8aadf6d2ad739523e714774c1b69be6792f805fb83d7f16a716c688cc800c54c5f13595742bd26d8b84f26342d89e21c668c8a79ed2a0607782a8421a40844a DIST tdesktop-5.5.5-full.tar.gz 70112426 BLAKE2B 21cdb01d66ea1d1b7479995d790fc44d65248c807dafb25d865970a0d619483ccccd99c8d64b6853d8aa29c78c73010f14e720bf707c918e7c3bb5cb2428dde5 SHA512 88cd526fb02b7b0459cb1bd1b0c57147b2261e57c392d2cb62964015ef6b26e202fba717b35d74201c41becf0a5d78ef4d9d593b5666b3f0a0db646e40bfd1fc +DIST tdesktop-5.6.0-full.tar.gz 70322928 BLAKE2B 8576262d44bc0511e906184791247c424dedb27a6ff0218aa2b4120f53c032e7befde64f7d67ff8be1ec94e4080979c38bd53dc8985236d8a20c486f8f26afac SHA512 a7582b0e41bc23233621fc96fd273d7b963cc87579f778d0f92759d0b93037d17f2ceb717d3050d0b8133be3858208123d6ab02227a1650d624e3f5967be0b8d EBUILD telegram-desktop-5.0.4.ebuild 8059 BLAKE2B 92eef60b7a4b64525531bc90628337ac1e84d1e1927674db9a706dc8f436b866195f1915f4bd2c7b44bb9bdbc3e5b0dd1809f160669b07eea4a27fb51d13aba1 SHA512 58a4f07be2b04a92f59cbbf3481dda12c624c6038de44963303e401a90e79dfc72c0983c7ee6c81bb3ffd4e7b9d40a95c026fd481b76c3f210455449a8a1b2ba EBUILD telegram-desktop-5.2.3.ebuild 8625 BLAKE2B 883ce12ec143bbae55cd86dce5d7cc318e1bcf13eb1b97bb36bb6752e67e45cdf8113f8d15292078b96a6e1217a00fb853510f0aed82071b21d242da06348c28 SHA512 17e9d5d3fd930ba89a468f3193cfe463ff5eb1b1b9d44753ca7276aab32ce526fbf64fb4b5c7248695c28c260c19ada436be4040d0afd11b03a147cdc36d429c EBUILD telegram-desktop-5.4.1.ebuild 8612 BLAKE2B b7ecef63da852fff43d7a40c6fcdd4cd80351bc3d500f986918f45f363efde4dc292e1a70e54321977014587c35b789be4602b891b28788d0d009141d416be42 SHA512 9f05f1bec2849d8e5299b930ef3579b54392cfeb9f267aae88b9eaadc969d085aff9f3ac15762e6f94b9cd15f1330bfed6c4392786fa6a2f82b9bf49c837d9ec EBUILD telegram-desktop-5.5.1.ebuild 8626 BLAKE2B a9d02a9e4bf4ab88d393aa0b43fe046ec5b37a1fa75c6697a98b05c8ee5c720cd86ed54e9cd88596541847761d0a007110b9a4b0aaaffa9b48df94cceb85087e SHA512 0f977bf5388c35b728b475ec62b7e5a9e81ff0c26bc360073df06a929a8b9c209ed2504f498ab4f3e7a95a337e65b34b6e7345ccf5425dbd60d83a84140b769b EBUILD telegram-desktop-5.5.5.ebuild 8626 BLAKE2B a9d02a9e4bf4ab88d393aa0b43fe046ec5b37a1fa75c6697a98b05c8ee5c720cd86ed54e9cd88596541847761d0a007110b9a4b0aaaffa9b48df94cceb85087e SHA512 0f977bf5388c35b728b475ec62b7e5a9e81ff0c26bc360073df06a929a8b9c209ed2504f498ab4f3e7a95a337e65b34b6e7345ccf5425dbd60d83a84140b769b +EBUILD telegram-desktop-5.6.0.ebuild 8626 BLAKE2B a9d02a9e4bf4ab88d393aa0b43fe046ec5b37a1fa75c6697a98b05c8ee5c720cd86ed54e9cd88596541847761d0a007110b9a4b0aaaffa9b48df94cceb85087e SHA512 0f977bf5388c35b728b475ec62b7e5a9e81ff0c26bc360073df06a929a8b9c209ed2504f498ab4f3e7a95a337e65b34b6e7345ccf5425dbd60d83a84140b769b MISC metadata.xml 1415 BLAKE2B ff67e288b209502228591761d9a7774a95b52cca610ddcfb4398b1aa6db264d84df36aec1f8f109679cd09d5858c8b8237bbf9fa0643fef4974864c5f9e1e192 SHA512 609618e13e7fd77b17797ca5f3fcd4a4a508f5f13a5a4c4a84e002f0634b44dd231b75a52635b65fbe76aad0e75fa6deb3b366dbff7e54316fe143367f6c0c89 diff --git a/net-im/telegram-desktop/telegram-desktop-5.6.0.ebuild b/net-im/telegram-desktop/telegram-desktop-5.6.0.ebuild new file mode 100644 index 000000000000..98c1b5012cf5 --- /dev/null +++ b/net-im/telegram-desktop/telegram-desktop-5.6.0.ebuild @@ -0,0 +1,261 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit xdg cmake python-any-r1 optfeature flag-o-matic + +DESCRIPTION="Official desktop client for Telegram" +HOMEPAGE="https://desktop.telegram.org https://github.com/telegramdesktop/tdesktop" + +MY_P="tdesktop-${PV}-full" +SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 qt6-imageformats wayland webkit +X" +REQUIRED_USE=" + qt6-imageformats? ( qt6 ) +" + +KIMAGEFORMATS_RDEPEND=" + media-libs/libavif:= + media-libs/libheif:= + >=media-libs/libjxl-0.8.0:= +" +CDEPEND=" + !net-im/telegram-desktop-bin + app-arch/lz4:= + dev-cpp/abseil-cpp:= + dev-cpp/ada:= + >=dev-cpp/glibmm-2.77:2.68 + dev-libs/glib:2 + dev-libs/openssl:= + dev-libs/protobuf + dev-libs/xxhash + media-libs/libjpeg-turbo:= + ~media-libs/libtgvoip-2.4.4_p20240706 + media-libs/openal + media-libs/opus + media-libs/rnnoise + ~media-libs/tg_owt-0_pre20240804:=[screencast=,X=] + media-video/ffmpeg:=[opus,vpx] + sys-libs/zlib:=[minizip] + !enchant? ( >=app-text/hunspell-1.7:= ) + enchant? ( app-text/enchant:= ) + jemalloc? ( dev-libs/jemalloc:= ) + libdispatch? ( dev-libs/libdispatch ) + !qt6? ( + >=dev-qt/qtcore-5.15:5= + >=dev-qt/qtgui-5.15:5=[dbus?,jpeg,png,wayland?,X?] + >=dev-qt/qtimageformats-5.15:5 + >=dev-qt/qtnetwork-5.15:5[ssl] + >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtwidgets-5.15:5[png,X?] + kde-frameworks/kcoreaddons:5 + webkit? ( + >=dev-qt/qtdeclarative-5.15:5 + >=dev-qt/qtwayland-5.15:5[compositor(+)] + ) + ) + qt6? ( + >=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?] + >=dev-qt/qtimageformats-6.5:6 + >=dev-qt/qtsvg-6.5:6 + webkit? ( + >=dev-qt/qtdeclarative-6.5:6 + >=dev-qt/qtwayland-6.5:6[compositor,qml] + ) + qt6-imageformats? ( + >=dev-qt/qtimageformats-6.5:6= + ${KIMAGEFORMATS_RDEPEND} + ) + ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${CDEPEND} + webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) ) +" +DEPEND="${CDEPEND} + >=dev-cpp/cppgir-2.0_p20240315 + >=dev-cpp/ms-gsl-4 + dev-cpp/expected-lite + dev-cpp/range-v3 +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/cmake-3.16 + >=dev-cpp/cppgir-2.0_p20240315 + dev-util/gdbus-codegen + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch + "${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch + "${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch + "${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch +) + +pkg_pretend() { + if has ccache ${FEATURES}; then + ewarn "ccache does not work with ${PN} out of the box" + ewarn "due to usage of precompiled headers" + ewarn "check bug https://bugs.gentoo.org/715114 for more info" + ewarn + fi +} + +src_prepare() { + # Bundle kde-frameworks/kimageformats for qt6, since it's impossible to + # build in gentoo right now. + if use qt6-imageformats; then + sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \ + cmake/external/kimageformats/CMakeLists.txt || die + printf '%s\n' \ + 'Q_IMPORT_PLUGIN(QAVIFPlugin)' \ + 'Q_IMPORT_PLUGIN(HEIFPlugin)' \ + 'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \ + >> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die + fi + # kde-frameworks/kcoreaddons is bundled when using qt6. + + # Happily fail if libraries aren't found... + find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \ + \! -path './Telegram/lib_webview/CMakeLists.txt' \ + \! -path './cmake/external/expected/CMakeLists.txt' \ + \! -path './cmake/external/kcoreaddons/CMakeLists.txt' \ + \! -path './cmake/external/qt/package.cmake' \ + -print0 | xargs -0 sed -i \ + -e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \ + -e '/find_package(/s/)/ REQUIRED)/' || die + # Make sure to check the excluded files for new + # CMAKE_DISABLE_FIND_PACKAGE entries. + + # Control QtDBus dependency from here, to avoid messing with QtGui. + # QtGui will use find_package to find QtDbus as well, which + # conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method. + if ! use dbus; then + sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \ + -i cmake/external/qt/package.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + # Having user paths sneak into the build environment through the + # XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir: + # - bug 909038: can't read from flatpak directories (fixed upstream) + # - bug 920819: system-wide directories ignored when variable is set + export XDG_DATA_DIRS="${EPREFIX}/usr/share" + + # Evil flag (bug #919201) + filter-flags -fno-delete-null-pointer-checks + + # The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep + # the same state across both projects. + # See https://bugs.gentoo.org/866055 + append-cppflags '-DNDEBUG' + + # https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398 + use !libdispatch && append-cppflags -DCRL_FORCE_QT + + local qt=$(usex qt6 6 5) + local mycmakeargs=( + -DQT_VERSION_MAJOR=${qt} + + # Override new cmake.eclass defaults (https://bugs.gentoo.org/921939) + # Upstream never tests this any other way + -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF + + # Control automagic dependencies on certain packages + ## Header-only lib, some git version. + -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland) + ## Only used in Telegram/lib_webview/CMakeLists.txt + -DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit) + ## KF6CoreAddons is currently unavailable in ::gentoo + -DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6) + + -DDESKTOP_APP_USE_LIBDISPATCH=$(usex libdispatch) + -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) + -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland) + -DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc) + ## Enables enchant and disables hunspell + -DDESKTOP_APP_USE_ENCHANT=$(usex enchant) + ## Use system fonts instead of bundled ones + -DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts) + ) + + if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then + einfo "Found custom API credentials" + mycmakeargs+=( + -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" + -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" + ) + else + # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml + # Building with snapcraft API credentials by default + # Custom API credentials can be obtained here: + # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md + # After getting credentials you can export variables: + # export MY_TDESKTOP_API_ID="17349"" + # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" + # and restart the build" + # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop + # portage will use custom variable every build automatically + mycmakeargs+=( + -DTDESKTOP_API_ID="611335" + -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" + ) + fi + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use X && ! use screencast; then + ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!" + ewarn + fi + if ! use jemalloc && use elibc_glibc; then + # https://github.com/telegramdesktop/tdesktop/issues/16084 + # https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003 + ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!" + ewarn "Do NOT report issues about RAM usage without enabling this flag first." + ewarn + fi + if ! use libdispatch; then + ewarn "Disabling USE=libdispatch may cause performance degradation" + ewarn "due to fallback to poor QThreadPool! Please see" + ewarn "https://github.com/telegramdesktop/tdesktop/wiki/The-Packaged-Building-Mode" + ewarn + fi + if use wayland && ! use qt6; then + ewarn "Wayland-specific integrations have been deprecated with Qt5." + ewarn "The app will continue to function under wayland, but some" + ewarn "functionality may be reduced." + ewarn "These integrations are only supported when built with Qt6." + ewarn + fi + if use qt6 && ! use qt6-imageformats; then + elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support" + elog + fi + optfeature_header + if ! use qt6; then + optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl] + fi +} |