From ec43f351be8f8a238061bcdc9f248f3014e87e6d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:25:37 -0400 Subject: [PATCH 01/25] fmt: update to 10.2.1. --- common/shlibs | 2 +- srcpkgs/fmt/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1ec4e5b0c6abd7..8ee50f267322e6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3508,7 +3508,7 @@ libcotp.so.3 libcotp-3.0.0_1 libunarr.so.1 libunarr-1.0.1_1 libretro-gtk-1.so.0 retro-gtk-1.0.0_1 libmanette-0.2.so.0 libmanette-0.2.1_1 -libfmt.so.9 fmt-9.0.0_1 +libfmt.so.10 fmt-10.2.1_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 libtls.so.29 libtls-3.9.1_1 diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template index 8b94c6dc51f1a3..db5be1ebc5dcc3 100644 --- a/srcpkgs/fmt/template +++ b/srcpkgs/fmt/template @@ -1,6 +1,6 @@ # Template file for 'fmt' pkgname=fmt -version=9.1.0 +version=10.2.1 revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF" @@ -10,10 +10,10 @@ license="BSD-2-Clause" homepage="https://github.com/fmtlib/fmt" changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst" distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz" -checksum=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 +checksum=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811 post_install() { - vlicense LICENSE.rst LICENSE + vlicense LICENSE } fmt-devel_package() { From 2d9f416d990012c526b31d96e3ce5748d524044e Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:26:06 -0400 Subject: [PATCH 02/25] spdlog: update to 1.14.1. --- common/shlibs | 2 +- srcpkgs/spdlog/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8ee50f267322e6..365052adcaaf28 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4008,7 +4008,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1 libwayland-egl++.so.0 libwaylandpp-0.2.8_1 libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1 -libspdlog.so.1.11 libspdlog-1.11.0_1 +libspdlog.so.1.14 libspdlog-1.14.1_1 libmd.so.0 libmd-1.0.3_1 libldacBT_abr.so.2 ldacBT-2.0.2.3_1 libldacBT_enc.so.2 ldacBT-2.0.2.3_1 diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template index 045f86def2cc33..6b525f73faa69b 100644 --- a/srcpkgs/spdlog/template +++ b/srcpkgs/spdlog/template @@ -1,6 +1,6 @@ # Template file for 'spdlog' pkgname=spdlog -version=1.11.0 +version=1.14.1 revision=1 build_style=cmake configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON @@ -13,7 +13,7 @@ maintainer="skmpz " license="MIT" homepage="https://github.com/gabime/spdlog" distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz" -checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb +checksum=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON" From db351f4fde0ec1ee661f3c643ab25882e77b5951 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:41 -0400 Subject: [PATCH 03/25] 0ad: rebuild for fmt-10 --- srcpkgs/0ad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index ae29ee78b02335..a0f7607b39e2ad 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.26 -revision=9 +revision=10 archs="x86_64* i686* aarch64* armv7l* ppc64le*" build_helper=rust hostmakedepends="pkg-config perl cmake python3.11 rust cargo yasm tar clang" From 399b4ec197dc8bf16049bd055ff51811f4f22161 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:44 -0400 Subject: [PATCH 04/25] Bear: rebuild for fmt-10 --- srcpkgs/Bear/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template index 23d24214daa389..e2aa7f2401fe08 100644 --- a/srcpkgs/Bear/template +++ b/srcpkgs/Bear/template @@ -1,7 +1,7 @@ # Template file for 'Bear' pkgname=Bear version=3.1.3 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config protobuf protobuf-devel grpc" makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel" From 76d8d97c40fbadd22c648656edc22b1f7b48b223 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:48 -0400 Subject: [PATCH 05/25] MangoHud: rebuild for fmt-10 --- srcpkgs/MangoHud/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index ac024dba897b7e..135f8a39cdec65 100644 --- a/srcpkgs/MangoHud/template +++ b/srcpkgs/MangoHud/template @@ -1,7 +1,7 @@ # Template file for 'MangoHud' pkgname=MangoHud version=0.7.0 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_xnvctrl=disabled -Dwith_nvml=disabled -Duse_system_spdlog=enabled" From dc724586380753d3f11b56f74ad2e82ebb2e4103 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:51 -0400 Subject: [PATCH 06/25] Waybar: rebuild for fmt-10 --- srcpkgs/Waybar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 898bdf6e49926a..1a5f2d89e3fe75 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,7 +1,7 @@ # Template file for 'Waybar' pkgname=Waybar version=0.10.2 -revision=1 +revision=2 build_style=meson configure_args="-Dlibudev=enabled -Dman-pages=enabled -Dsystemd=disabled -Drfkill=enabled From 1638b0bebc437f60517a103c3cb5faa0b9206fb4 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:54 -0400 Subject: [PATCH 07/25] cherrytree: rebuild for fmt-10 --- srcpkgs/cherrytree/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template index 61596a846a6b6b..089887e9e6c725 100644 --- a/srcpkgs/cherrytree/template +++ b/srcpkgs/cherrytree/template @@ -1,7 +1,7 @@ # Template file for 'cherrytree' pkgname=cherrytree version=1.1.2 -revision=1 +revision=2 build_style=cmake # Tests are built during the normal build process and require access to X server configure_args="-DBUILD_TESTING=OFF" From 7a91853b53330bbabf84147c6868798618ddbb8c Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:28:58 -0400 Subject: [PATCH 08/25] coeurl: rebuild for fmt-10 --- srcpkgs/coeurl/patches/fmt-10.patch | 33 +++++++++++++++++++++++++++++ srcpkgs/coeurl/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/coeurl/patches/fmt-10.patch diff --git a/srcpkgs/coeurl/patches/fmt-10.patch b/srcpkgs/coeurl/patches/fmt-10.patch new file mode 100644 index 00000000000000..afc1762b2b32ec --- /dev/null +++ b/srcpkgs/coeurl/patches/fmt-10.patch @@ -0,0 +1,33 @@ +From 831e2ee8e9cf08ea1ee9736cde8370f9d0312abc Mon Sep 17 00:00:00 2001 +From: Nicolas Werner +Date: Wed, 28 Jun 2023 13:01:58 +0200 +Subject: [PATCH] Fix build with fmt10 + +--- + lib/client.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/client.cpp b/lib/client.cpp +index 624f046..3666623 100644 +--- a/lib/client.cpp ++++ b/lib/client.cpp +@@ -6,6 +6,7 @@ + #include + + #include "coeurl/request.hpp" ++#include "coeurl/errors.hpp" + + namespace coeurl { + std::shared_ptr Client::log = spdlog::null_logger_mt("coeurl_null"); +@@ -347,7 +348,7 @@ void Client::remove_request(Request *r) { + long http_code; + curl_easy_getinfo(req->easy, CURLINFO_RESPONSE_CODE, &http_code); + +- Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, req->curl_error, req->error, http_code); ++ Client::log->trace("DONE: {} => {} ({}) http: {}", req->url_, coeurl::to_string(req->curl_error), req->error, http_code); + + if (req->on_complete_) + req->on_complete_(*req.get()); +-- +GitLab + diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template index fc0175da3c486c..7b66be703c7a50 100644 --- a/srcpkgs/coeurl/template +++ b/srcpkgs/coeurl/template @@ -1,7 +1,7 @@ # Template file for 'coeurl' pkgname=coeurl version=0.3.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="spdlog libevent-devel libcurl-devel" From cdf7790cc0f5f5e5f697a6ba254cf2656de1386d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:01 -0400 Subject: [PATCH 09/25] cryfs: rebuild for fmt-10 --- srcpkgs/cryfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index bb2109c034e8cb..3e523766b129c1 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,7 +1,7 @@ # Template file for 'cryfs' pkgname=cryfs version=0.11.4 -revision=2 +revision=3 build_style=cmake configure_args="-DBoost_USE_STATIC_LIBS=OFF -DCRYFS_UPDATE_CHECKS=off -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake" From 5892a6112e18edb7f21a5a2e8913883299269f75 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:04 -0400 Subject: [PATCH 10/25] devilutionX: rebuild for fmt-10 --- srcpkgs/devilutionX/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index ad911b48f8631c..6c253537baf770 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -1,7 +1,7 @@ # Template file for 'devilutionX' pkgname=devilutionX version=1.4.1 -revision=3 +revision=4 build_style=cmake configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON" hostmakedepends="pkg-config" From 0a55494528cd06ccd54b2e3ed05f9310f84dc9eb Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:08 -0400 Subject: [PATCH 11/25] easyeffects: rebuild for fmt-10 --- srcpkgs/easyeffects/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template index 83563265ea9226..a2b4c85358753a 100644 --- a/srcpkgs/easyeffects/template +++ b/srcpkgs/easyeffects/template @@ -1,7 +1,7 @@ # Template file for 'easyeffects' pkgname=easyeffects version=7.1.5 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils gtk4-update-icon-cache" From e5ad03950dad3b2ae57b4a546fe47b1b84664c55 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:11 -0400 Subject: [PATCH 12/25] furnace: rebuild for fmt-10 --- srcpkgs/furnace/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/furnace/template b/srcpkgs/furnace/template index c18d2d375e40e8..d17e1cd0bf892d 100644 --- a/srcpkgs/furnace/template +++ b/srcpkgs/furnace/template @@ -1,7 +1,7 @@ # Template file for 'furnace' pkgname=furnace version=0.6.3 -revision=1 +revision=2 _adpcm_commit="ef7a217154badc3b99978ac481b268c8aab67bd8" build_style=cmake configure_args="-DSYSTEM_FFTW=ON -DSYSTEM_FMT=ON -DSYSTEM_LIBSNDFILE=ON -DSYSTEM_PORTAUDIO=ON -DSYSTEM_RTMIDI=ON From f4cf48362a8c7ae42d61c9374db1306da9003618 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:14 -0400 Subject: [PATCH 13/25] gerbera: rebuild for fmt-10 --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index ae14f35c767c03..2dc0ac0ce03b55 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.12.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config" From e49a99b998f2e93ae38c1128a1dd897ce8e859ba Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:18 -0400 Subject: [PATCH 14/25] gnuradio: rebuild for fmt-10 --- srcpkgs/gnuradio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 58127cedd3ddc6..0ecf804c22c072 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.8.0 -revision=1 +revision=2 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax From 7e42f4b6094a79aabc1ad7a96178e3f127083007 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:21 -0400 Subject: [PATCH 15/25] imhex: rebuild for fmt-10 --- srcpkgs/imhex/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template index 72af581ce9d128..b1665f91001de4 100644 --- a/srcpkgs/imhex/template +++ b/srcpkgs/imhex/template @@ -1,7 +1,7 @@ # Template file for 'imhex' pkgname=imhex version=1.30.1 -revision=3 +revision=4 build_wrksrc="ImHex" build_style=cmake build_helper=qemu From 76a22c739cafce3a0dc619391bcbfa84535a040e Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:24 -0400 Subject: [PATCH 16/25] justbuild: rebuild for fmt-10 --- srcpkgs/justbuild/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template index 653f0601b0c094..0c8cb846ba7bec 100644 --- a/srcpkgs/justbuild/template +++ b/srcpkgs/justbuild/template @@ -1,7 +1,7 @@ # Template file for 'justbuild' pkgname=justbuild version=1.2.5 -revision=1 +revision=2 create_wrksrc=yes hostmakedepends="jo pandoc pkg-config python3 tar unzip wget grpc protobuf" makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++ From 9935dedc0caadf7cdef2318b6c49f2903cd62421 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:28 -0400 Subject: [PATCH 17/25] kodi: rebuild for fmt-10 --- srcpkgs/kodi/patches/fmt-10.patch | 108 ++++++++++++++++++++++++++++++ srcpkgs/kodi/template | 2 +- 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kodi/patches/fmt-10.patch diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch new file mode 100644 index 00000000000000..ff00c1d4dd25a8 --- /dev/null +++ b/srcpkgs/kodi/patches/fmt-10.patch @@ -0,0 +1,108 @@ +From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak +Date: Tue, 27 Jun 2023 11:21:50 -0700 +Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging + +Signed-off-by: Lukas Rusak +--- + xbmc/windows/GUIWindowHome.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp +index c42e073c48ced..abc6cfc94d5a0 100644 +--- a/xbmc/windows/GUIWindowHome.cpp ++++ b/xbmc/windows/GUIWindowHome.cpp +@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag, + { + int ra_flag = 0; + +- CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message); ++ CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", ++ AnnouncementFlagToString(flag), sender, message); + + // we are only interested in library changes + if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0) + +From c82006b575b78efbb3f5aff40a159b90f245ea9d Mon Sep 17 00:00:00 2001 +From: Lukas Rusak +Date: Tue, 27 Jun 2023 11:22:32 -0700 +Subject: [PATCH 2/4] CGUIColorButtonControl: use explicit cast to + UTILS::COLOR::Color when formatting + +Signed-off-by: Lukas Rusak +--- + xbmc/guilib/GUIColorButtonControl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp +index 940834cb68852..67597d7ab504b 100644 +--- a/xbmc/guilib/GUIColorButtonControl.cpp ++++ b/xbmc/guilib/GUIColorButtonControl.cpp +@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText() + void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime) + { + CRect labelRenderRect = m_labelInfo.GetRenderRect(); +- bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor)); ++ bool changed = m_labelInfo.SetText( ++ StringUtils::Format("#{:08X}", static_cast(m_imgBoxColor))); + // Set Label X position based on image mask control position + float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX; + float textPosX = m_imgColorMask->GetXPosition() - textWidth; + +From e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak +Date: Tue, 27 Jun 2023 11:24:02 -0700 +Subject: [PATCH 3/4] CLog: allow using fmt::enums::format_as for explicit enum + conversion when using libfmt>=10 + +Signed-off-by: Lukas Rusak +--- + xbmc/utils/log.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h +index 9fc4aae36813e..adf46905a86c6 100644 +--- a/xbmc/utils/log.h ++++ b/xbmc/utils/log.h +@@ -46,6 +46,10 @@ class dist_sink; + } // namespace sinks + } // namespace spdlog + ++#if FMT_VERSION >= 100000 ++using fmt::enums::format_as; ++#endif ++ + class CLog : public ISettingsHandler, public ISettingCallback + { + public: + +From 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c Mon Sep 17 00:00:00 2001 +From: Lukas Rusak +Date: Tue, 27 Jun 2023 11:24:34 -0700 +Subject: [PATCH 4/4] CLog: add formatter for std::atomic for explicit atomic + conversion when using libfmt>=10 + +Signed-off-by: Lukas Rusak +--- + xbmc/utils/log.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h +index adf46905a86c6..1c42c888cb655 100644 +--- a/xbmc/utils/log.h ++++ b/xbmc/utils/log.h +@@ -48,6 +48,14 @@ class dist_sink; + + #if FMT_VERSION >= 100000 + using fmt::enums::format_as; ++ ++namespace fmt ++{ ++template ++struct formatter, Char> : formatter ++{ ++}; ++} // namespace fmt + #endif + + class CLog : public ISettingsHandler, public ISettingCallback diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index d37a5918cd6758..79fc3007db0d8d 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=19.4 -revision=9 +revision=10 _codename="Matrix" build_style=cmake configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF From 2a656c6b752c14d8606278011e61a046a8e68d7f Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:31 -0400 Subject: [PATCH 18/25] mkvtoolnix: rebuild for fmt-10 --- srcpkgs/mkvtoolnix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index be8653644a339c..c0396d32a69a8b 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,7 +1,7 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix version=78.0 -revision=3 +revision=4 build_style=gnu-configure build_helper=qmake configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt From 06694735f51fcf6e451fc0f9f79e23246a1bab0e Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:34 -0400 Subject: [PATCH 19/25] mpd: rebuild for fmt-10 --- srcpkgs/mpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index b8e2bd4c1b59c8..dc346997a9097e 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.23.15 -revision=2 +revision=3 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled From 00bebdb822fe56a10e3094185e01101082ea44f9 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:38 -0400 Subject: [PATCH 20/25] mtxclient: rebuild for fmt-10 --- srcpkgs/mtxclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index bcabd901a0b29c..c2237668986381 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,7 +1,7 @@ # Template file for 'mtxclient' pkgname=mtxclient version=0.9.2 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" hostmakedepends="pkg-config" From 0e1eeb75798a55418fffa5cc489e3962be36649f Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:41 -0400 Subject: [PATCH 21/25] nheko: rebuild for fmt-10 --- srcpkgs/nheko/patches/fmt-10.patch | 78 ++++++++++++++++++++++++++++++ srcpkgs/nheko/template | 2 +- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nheko/patches/fmt-10.patch diff --git a/srcpkgs/nheko/patches/fmt-10.patch b/srcpkgs/nheko/patches/fmt-10.patch new file mode 100644 index 00000000000000..6152f2a11060d5 --- /dev/null +++ b/srcpkgs/nheko/patches/fmt-10.patch @@ -0,0 +1,78 @@ +diff --git a/src/Cache.cpp b/src/Cache.cpp +index c575ebf7..0c5e879c 100644 +--- a/src/Cache.cpp ++++ b/src/Cache.cpp +@@ -438,7 +438,7 @@ Cache::loadSecretsFromStore( + if (job->error() && job->error() != QKeychain::Error::EntryNotFound) { + nhlog::db()->error("Restoring secret '{}' failed ({}): {}", + name.toStdString(), +- job->error(), ++ static_cast(job->error()), + job->errorString().toStdString()); + + fatalSecretError(); +diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp +index 12d83f49..61daacb5 100644 +--- a/src/ChatPage.cpp ++++ b/src/ChatPage.cpp +@@ -1248,7 +1248,7 @@ ChatPage::getBackupVersion() + nhlog::crypto()->info("Our backup key {} does not match the one " + "used in the online backup {}", + pubkey, +- auth_data["public_key"]); ++ auth_data["public_key"].get()); + cache::client()->deleteBackupVersion(); + return; + } +diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp +index 0e9043dd..7dee9e6b 100644 +--- a/src/encryption/DeviceVerificationFlow.cpp ++++ b/src/encryption/DeviceVerificationFlow.cpp +@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *, + , deviceIds(std::move(deviceIds_)) + , model_(model) + { +- nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this); ++ nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast(flow_type), (void *)this); + if (deviceIds.size() == 1) + deviceId = deviceIds.front(); + +diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp +index 94944337..1fb210d8 100644 +--- a/src/timeline/InputBar.cpp ++++ b/src/timeline/InputBar.cpp +@@ -948,14 +948,14 @@ MediaUpload::MediaUpload(std::unique_ptr source_, + this, + [mediaPlayer](QMediaPlayer::Error error) { + nhlog::ui()->debug("Media player error {} and errorStr {}", +- error, ++ static_cast(error), + mediaPlayer->errorString().toStdString()); + }); + connect(mediaPlayer, + &QMediaPlayer::mediaStatusChanged, + [mediaPlayer](QMediaPlayer::MediaStatus status) { + nhlog::ui()->debug( +- "Media player status {} and error {}", status, mediaPlayer->error()); ++ "Media player status {} and error {}", static_cast(status), static_cast(mediaPlayer->error())); + }); + connect(mediaPlayer, + qOverload(&QMediaPlayer::metaDataChanged), +diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp +index da5a2231..dbe63469 100644 +--- a/src/ui/MxcMediaProxy.cpp ++++ b/src/ui/MxcMediaProxy.cpp +@@ -37,11 +37,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent) + qOverload(&MxcMediaProxy::error), + [this](QMediaPlayer::Error error) { + nhlog::ui()->info("Media player error {} and errorStr {}", +- error, ++ static_cast(error), + this->errorString().toStdString()); + }); + connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) { +- nhlog::ui()->info("Media player status {} and error {}", status, this->error()); ++ nhlog::ui()->info("Media player status {} and error {}", static_cast(status), static_cast(this->error())); + }); + connect(this, + qOverload(&MxcMediaProxy::metaDataChanged), diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index 8bce950cf3c3ca..75f9b8f2cb48aa 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,7 +1,7 @@ # Template file for 'nheko' pkgname=nheko version=0.11.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel From 56a4e94cffab6900677e5becb515b39cb0f9068b Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:44 -0400 Subject: [PATCH 22/25] opendht: rebuild for fmt-10 --- srcpkgs/opendht/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template index b8f141f7a61e6e..b18ada2e756011 100644 --- a/srcpkgs/opendht/template +++ b/srcpkgs/opendht/template @@ -1,7 +1,7 @@ # Template file for 'opendht' pkgname=opendht version=2.6.0.4 -revision=1 +revision=2 build_style=cmake configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF -DOPENDHT_TESTS_NETWORK=OFF" From 764483601176d685a7b575f4a9702a94e540b9c6 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:48 -0400 Subject: [PATCH 23/25] paps: rebuild for fmt-10 --- srcpkgs/paps/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template index 460daaaae5486d..71a802089a7c14 100644 --- a/srcpkgs/paps/template +++ b/srcpkgs/paps/template @@ -1,7 +1,7 @@ # Template file for 'paps' pkgname=paps version=0.8.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config cmake" makedepends="fmt-devel freetype-devel pango-devel" From ab1243de4e363db6a929345706274aba0247e11d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:51 -0400 Subject: [PATCH 24/25] python3-syndom: rebuild for fmt-10 --- srcpkgs/python3-syndom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template index 2d1e037ddf3124..906c6a17c086ad 100644 --- a/srcpkgs/python3-syndom/template +++ b/srcpkgs/python3-syndom/template @@ -1,7 +1,7 @@ # Template file for 'python3-syndom' pkgname=python3-syndom version=1.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config python3-pybind11" makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11" From a93031ef5b0a56be264486bcc782d2e29a1d91ff Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 May 2024 18:29:54 -0400 Subject: [PATCH 25/25] vtk: rebuild for fmt-10 --- srcpkgs/vtk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index 189591d55725a7..5a3cae4dfb227e 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.2.6 -revision=3 +revision=4 build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" # Build only the core modules plus python bindings for now