Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
@ 2024-05-03 22:39 Calandracas606
  2024-05-04  4:24 ` [PR PATCH] [Updated] " Calandracas606
                   ` (24 more replies)
  0 siblings, 25 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-03 22:39 UTC (permalink / raw)
  To: ml

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

There is a new pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [ ] kodi
- [x] justbuild
- [ ] imhex
- [x] gnuradio
- [ ] gerbera
- [x] furnace
- [x] easyeffects 
- [ ] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 29634 bytes --]

From ec43f351be8f8a238061bcdc9f248f3014e87e6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <dem.procopiou@gmail.com>"
 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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<UTILS::COLOR::Color>(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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // 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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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 <danielmartinez@cock.li>
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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
@ 2024-05-04  4:24 ` Calandracas606
  2024-05-05  2:42 ` sgn
                   ` (23 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-04  4:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [ ] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [ ] imhex
- [x] gnuradio
- [ ] gerbera
- [x] furnace
- [x] easyeffects 
- [ ] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 37652 bytes --]

From ec43f351be8f8a238061bcdc9f248f3014e87e6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/26] 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 <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/26] 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 <dem.procopiou@gmail.com>"
 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 0264e5c141b5cf46a6286fcec7933f4dadc1f37d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/26] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 365052adcaaf28..524265e0017049 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,10 +4004,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From afbf85b16f12790b2c699ad7a5722eaca9228300 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/26] 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 f65c8deebd7c566c9438f233f0e423f8d60bad03 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/26] 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 17e9077cc9a6f10f94ec7ba93174d21edae0bb45 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/26] 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 046476df563b1406c5c5769d506f032444f29f26 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/26] 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 e3d7b28096da47cbe960bfcba5193c4a2a3fe1b7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/26] 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 1c825e96aa32bd80a41776c37186f4d3144c1b24 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/26] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 47db21131c1af464c6c394a1ea4167905d0fc508 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/26] 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 269d5c08a6e601d8e217dbc0c652a7e560ab6ca6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/26] 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 b984a0d38e2168b1c67c56f57a35465493ce460e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/26] 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 6d59dd819b7a2d2745ba10d34c704cbc664bb8af Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/26] 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 37f421e32c835ee2026a58aadf2dabfac47e8d5f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/26] 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 152c5cec5557091d467511ebb8213b6b016d847d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/26] 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 09c29ef6477f41af09bd0816a7f01f36bac2f79a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:21 -0400
Subject: [PATCH 16/26] 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 e8cf621d371a723d03c2589a447dddd50c19551e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 17/26] 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 71f60bf4d5220ac7378463fc83856967825328b9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 18/26] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 3a3e77e913f3901d95ba8b6402e31615a4dc7535 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 19/26] 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 3cf7889118f6ef847302974b54b23123c19b44fc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 20/26] 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 bdcec383ed1b510592c008754752e5f3a063ce58 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 21/26] 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 2e73c99e37c472b9fe767f1a5f5fcf5c377c0db3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 22/26] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 790470864c7963a701f87fa697c3cae3b1ecea63 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 23/26] 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 46c838326c35e073f5d0f964e1bf7c69c9772112 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 24/26] 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 0d604873a381b92c661d4d51d16ad09a431a2d83 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 25/26] 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 e94b1f91c12a12fa57ae22bb462451654dbd71ce Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:54 -0400
Subject: [PATCH 26/26] 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

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
  2024-05-04  4:24 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-05  2:42 ` sgn
  2024-05-05  3:00 ` sgn
                   ` (22 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2024-05-05  2:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [ ] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [ ] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [ ] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 39243 bytes --]

From ec43f351be8f8a238061bcdc9f248f3014e87e6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/26] 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 <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/26] 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 <dem.procopiou@gmail.com>"
 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 0264e5c141b5cf46a6286fcec7933f4dadc1f37d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/26] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 365052adcaaf28..524265e0017049 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,10 +4004,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From afbf85b16f12790b2c699ad7a5722eaca9228300 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/26] 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 f65c8deebd7c566c9438f233f0e423f8d60bad03 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/26] 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 17e9077cc9a6f10f94ec7ba93174d21edae0bb45 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/26] 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 046476df563b1406c5c5769d506f032444f29f26 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/26] 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 e3d7b28096da47cbe960bfcba5193c4a2a3fe1b7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/26] 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 1c825e96aa32bd80a41776c37186f4d3144c1b24 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/26] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 47db21131c1af464c6c394a1ea4167905d0fc508 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/26] 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 269d5c08a6e601d8e217dbc0c652a7e560ab6ca6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/26] 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 b984a0d38e2168b1c67c56f57a35465493ce460e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/26] 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 6d59dd819b7a2d2745ba10d34c704cbc664bb8af Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/26] 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 37f421e32c835ee2026a58aadf2dabfac47e8d5f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/26] 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 152c5cec5557091d467511ebb8213b6b016d847d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/26] 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 a816927ecb541957534579f3b84e225ece72d8e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/26] 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 2292231de89f9febee08cfd94a0ef63cf81cef5b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/26] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 b52519a8aeb2f2b7dce2e5d52c1e0317a8985ec4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/26] 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 507c6810b0cf0a05b5090c6278e403e25d0e0a1f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/26] 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 8a4291889d62cba79ed27692abc4f67cbd780ca3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/26] 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 4f805107ea5be8d8dc99859843a0c64947a3bdaf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/26] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 422a9e73c3599db1472e903ded829f31557daae2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/26] 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 9fce269c4adf0a08c679a1a225bff68e446c0671 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/26] 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 73bf7c5f75a677069e7d4d03de3104c12a67b251 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/26] 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 33ac7b9b7d4fbfd41a35eee0fbf2f0184ec134d1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:54 -0400
Subject: [PATCH 25/26] 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

From f50c3057a44743299bfd97203baff383a4bc20bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 26/26] imhex: update to 1.33.2.

---
 srcpkgs/imhex/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..a46418e69c55bb 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
  2024-05-04  4:24 ` [PR PATCH] [Updated] " Calandracas606
  2024-05-05  2:42 ` sgn
@ 2024-05-05  3:00 ` sgn
  2024-05-05  4:02 ` [PR PATCH] [Updated] " Calandracas606
                   ` (21 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2024-05-05  3:00 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2094562555

Comment:
For `devilutionX`, either use vendored fmt or use a non-free devilutionX https://github.com/void-linux/void-packages/pull/50195

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (2 preceding siblings ...)
  2024-05-05  3:00 ` sgn
@ 2024-05-05  4:02 ` Calandracas606
  2024-05-05  4:03 ` Calandracas606
                   ` (20 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05  4:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [ ] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [ ] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 42502 bytes --]

From ec43f351be8f8a238061bcdc9f248f3014e87e6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 <dem.procopiou@gmail.com>"
 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 0264e5c141b5cf46a6286fcec7933f4dadc1f37d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 365052adcaaf28..524265e0017049 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,10 +4004,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From afbf85b16f12790b2c699ad7a5722eaca9228300 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 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 f65c8deebd7c566c9438f233f0e423f8d60bad03 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 17e9077cc9a6f10f94ec7ba93174d21edae0bb45 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 046476df563b1406c5c5769d506f032444f29f26 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 e3d7b28096da47cbe960bfcba5193c4a2a3fe1b7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 1c825e96aa32bd80a41776c37186f4d3144c1b24 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 47db21131c1af464c6c394a1ea4167905d0fc508 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 269d5c08a6e601d8e217dbc0c652a7e560ab6ca6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 b984a0d38e2168b1c67c56f57a35465493ce460e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 6d59dd819b7a2d2745ba10d34c704cbc664bb8af Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 37f421e32c835ee2026a58aadf2dabfac47e8d5f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 152c5cec5557091d467511ebb8213b6b016d847d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 a816927ecb541957534579f3b84e225ece72d8e9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 2292231de89f9febee08cfd94a0ef63cf81cef5b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 b52519a8aeb2f2b7dce2e5d52c1e0317a8985ec4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 507c6810b0cf0a05b5090c6278e403e25d0e0a1f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8a4291889d62cba79ed27692abc4f67cbd780ca3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 4f805107ea5be8d8dc99859843a0c64947a3bdaf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 422a9e73c3599db1472e903ded829f31557daae2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 9fce269c4adf0a08c679a1a225bff68e446c0671 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 73bf7c5f75a677069e7d4d03de3104c12a67b251 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 33ac7b9b7d4fbfd41a35eee0fbf2f0184ec134d1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:54 -0400
Subject: [PATCH 25/28] 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

From f50c3057a44743299bfd97203baff383a4bc20bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 26/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..a46418e69c55bb 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 6af7c50c4eeec0fe1cfaacd9185f6c81f17a1a6c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 27/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 1bdaa05a8d14c87bad3dcf1395e561df3a2775d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 28/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (3 preceding siblings ...)
  2024-05-05  4:02 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-05  4:03 ` Calandracas606
  2024-05-05 16:40 ` [PR PATCH] [Updated] " Calandracas606
                   ` (19 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05  4:03 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2094572833

Comment:
> For `devilutionX`, either use vendored fmt or use a non-free devilutionX #50195

cherry picked your commit using non-free devilutionX

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (4 preceding siblings ...)
  2024-05-05  4:03 ` Calandracas606
@ 2024-05-05 16:40 ` Calandracas606
  2024-05-05 17:09 ` Calandracas606
                   ` (18 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05 16:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [ ] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 44872 bytes --]

From ef31b29cf4e2dd7b474067507fa640e30b58822d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 97d9664b9da84e..7ff77c985b2611 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 fce911d9f3a38f9d17744e33b1e0c3bf8710a2ee Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 7ff77c985b2611..b86ab79c92a8cd 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 <dem.procopiou@gmail.com>"
 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 a85e7d4f9df3c6e78a9f6607f2e5536bd1ccebc0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index b86ab79c92a8cd..8849e9e59e8062 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,10 +4004,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 538f6b83ad88d2532eb77b8a5d69ecacc93d62c3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 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 802e5bfc24d935093853f6ada04675dccf6b7e93 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 61eea1155c83e7510ae78256c8e4b1efc4192268 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 68a943e4b11d91aa5393fe2e7277b2efb93cd31e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 ad910e8f17fe88335cc9ff6208963c9d78ed9486 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 54b85d7745db79f0639c2588ad6c0bfdfd9e4522 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 c0e97efbb796ba662a795b3a6ca45f5b169e49d3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 209755df61196766c9286bdadbcc6087868838f9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 b41c2a7476d612070401916c9bda8343cf5f6ef1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 771eb283d448db2b9d32e9079333e4ca2b561f75 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 316420de44a3da1c00faaac15e2fb9293a2e7e76 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 1f2e88725c9d65ee17c231721d6e7fad1b25a7bd Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 04397fc1f9385a978339e77f209b5627b020db4c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 404e8a88337fcd50d5b9ddce4d4e6d325aed3037 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 586016dd7764f2111fefebab6316777aaf6d313d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 a78ea494f27f96b4384749ec18bfa209c4305ea5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 316b3bbadee6ca46a94d8f13b7af69092f728adc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 bf043ac702786932ccb264be189f5881fb6d7465 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 d8239969e1aa56b6915813df0bf6efceadf43001 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 dfe6b5c0326ec200afb93017fca7d5b5b842b052 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 4383542ee8695a1b6262904541124b883dc02119 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 4b1e24008366c56216907e405945cdc89e9b1b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..a46418e69c55bb 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 7d0423da0d1cd56ba5d5889238823f53f506fa0f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 9bcfe858c6edbe2024567759fa297d0b732e2925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 93922b966f872c23d9148e7f8570209fa284ee8c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (5 preceding siblings ...)
  2024-05-05 16:40 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-05 17:09 ` Calandracas606
  2024-05-05 17:11 ` Calandracas606
                   ` (17 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05 17:09 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [ ] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 46434 bytes --]

From ef31b29cf4e2dd7b474067507fa640e30b58822d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 97d9664b9da84e..7ff77c985b2611 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 fce911d9f3a38f9d17744e33b1e0c3bf8710a2ee Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 7ff77c985b2611..b86ab79c92a8cd 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 <dem.procopiou@gmail.com>"
 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 a85e7d4f9df3c6e78a9f6607f2e5536bd1ccebc0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index b86ab79c92a8cd..8849e9e59e8062 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,10 +4004,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From cd58d46dbe7802a389f1a9287caf1b915b3a2275 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 20ae10d0ab301799fc0ea171ea770b3be838e01b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 a41dc68cf3fc6869cb286c56e7494e9405ce8d51 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ad1a22adea39c20b67b5f915415e7a4fa0a1c973 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 21e35f67d1a0bbb601a0232891593db79f63f882 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 9da4098545f1accafc606c92f1707fcad9ac841b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 470990eeb581bbcbeafc6d60adb17276bb5df2b7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 ce38f244e78a459e07987e9b9cafc0cd7a1ed65a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 e0d3e268b9940e52811dca03b3a1c050e3ed0eff Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 4e52f8ff0910be1acede8a97c793b0d3464c7a9a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 9477284330a6104a1b26d6c6eac2c240b1ddb6af Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 7673d2a24c5260f9ed4e8da4c62ee75836e7fd39 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 39eebdd5eae8fff0d9aac0861301f5cf3b59178a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 2a8e41c5f47bc789119e5ad5ea5c26112885a3cc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 6aa4c7c62ecdf71168dcafa1336cdb40b37941cc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 281bbf8f3493769d403896985066d8cb28ac9fc5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8b30cfac506a356e99e0d902865ad3d48003336e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 65baebc4051e3cdef5fcd8a04f3d409f8841521c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 3be6c167a45c37a72f64c2e04675d26cef81143e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 b5d6127df8b9523fd763a14843ab97949fa161ad Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 51fc57127410421a4a1ef3c74a96a41fe4393945 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 78c8a9ea43cc5b1247a578bd791e50bdd44c98c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..a46418e69c55bb 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 9ac0f182304b038b09c2c6f0897149d984ad0e0e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From dc5c10b90fded1520bf61ec35c419baa2ecb17f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 39ea6110a008d30b008dde8e8748da9064780bce Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (6 preceding siblings ...)
  2024-05-05 17:09 ` Calandracas606
@ 2024-05-05 17:11 ` Calandracas606
  2024-05-05 23:08 ` Calandracas606
                   ` (16 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05 17:11 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2094881424

Comment:
all packages patched/updated to build with new fmt on x86_64-glibc

Now doing build tests for all other archs 

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (7 preceding siblings ...)
  2024-05-05 17:11 ` Calandracas606
@ 2024-05-05 23:08 ` Calandracas606
  2024-05-14 11:26 ` [PR PATCH] [Updated] " Calandracas606
                   ` (15 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-05 23:08 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2094987370

Comment:
everything is building except for imhex which fails on musl and aarch64

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (8 preceding siblings ...)
  2024-05-05 23:08 ` Calandracas606
@ 2024-05-14 11:26 ` Calandracas606
  2024-05-28 14:58 ` Calandracas606
                   ` (14 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-14 11:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 46434 bytes --]

From b2fe95da3a30bb299894b2e06f16dd53a1ac3d5d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 4c28bef160ed5f..3195b17c8c6d7a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3626,7 +3626,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 d732270927597794c4e5d129ac737e7891cf41d5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 3195b17c8c6d7a..9173c87a5a671c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4130,7 +4130,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 <dem.procopiou@gmail.com>"
 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 1ddca5ee16642755236a75bc33d948a0a6e5944d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 9173c87a5a671c..ceaae8d5e658f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4126,10 +4126,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 68896c3f8bb8e09b5166e87e990bf09de5547dc8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 705d3be4ef2c979be239e4ea437968d535559c6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 4662cdd24e83466c0151fb8cf0f19bcd6600446b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 e60cc355ee961fee412654a8f52ceb15916e2aa5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From a36b780e78d98a56a6186c32cdbc411701acb436 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 1dc94881ad53d5c494e062d87897537375f96962 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 60d9864f96c26b1261edd308a02e7d75761441cc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 7495a8dc3f172e8cc7cc39374ae59a891ffdb64a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 4eb5e8cd72312d5f444c606f0f11fe36976bf554 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 2c43a0a2c505d13004f495fd5308b9007e3bf4b7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 7a71e2080038f072f3e9a42830e2c37f9ba48b17 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 8cd6a87a03ccef2188270c3157f7b101c09aa6a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 faf99286aaeba6f0c8dda1afe20c17df37a3ad48 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 acb12449509501..68550256c3b895 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.0
-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 6a6c115596b294eb75e5e662cbed8ef230d16467 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 453b490f672ffee5f60d4258f8dbc47673f69a78 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 3bddab48ccec76aca219bb770f53b582582c43a0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 ad9758c1abe6ba78b08228cc69293dcb51b5f72e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 6029bbbbb294a683e879af1027cc4a9325d537f3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 e3c25a4f4ec76399b89875d940698b74cf75e44d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 f65e3c193db7601104fd534154ce50e34e219dac Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 a7fd3c5724019d3d0f9a4b191c1105ce317f9f54 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 68fdc42c06df1c96a238caed24a781b81894274f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..a46418e69c55bb 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From d0c7fd8d544fe58351b19da2b7b62bdadbc6d26a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From d01178248bc336ca3ffa75d7cb8685b7447eb1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From d35016abf6f221f4f55a24560713fdf50d7b52f6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (9 preceding siblings ...)
  2024-05-14 11:26 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-28 14:58 ` Calandracas606
  2024-05-28 15:00 ` Calandracas606
                   ` (13 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 14:58 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci skip]


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 47718 bytes --]

From 04032e74d105c87ec881a1e6afee9e1781ec00e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 b925ee1407471f0c4a274a3b653b27fd2be0cc42 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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 <dem.procopiou@gmail.com>"
 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 3ce881de1b20f2c5d0d4e6bc59ac80d2d759a00c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 63d65d0eed27196da81bae7b96df0cb2fc68e9e1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 adedb9bffa945109cd2bed575ecf19232cb6132b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 e295750219e1443aa5508f6499eb0ab98120fba1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ed2e2428f44224..b6a8d8ee785256 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 e0df6208e223554f4f07f13f0724df1593d1927e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From d02bcd74ef9dc37c30c8972fc36a25c576706706 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 09511094d50b485532c0b24002ceeef898f6c602 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 15bf7c7ccb3d2a74040746c347f394e9bd30700a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 3de3e0369d2057c574250dab2acbd0874fa02944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 04774740e4f56cddffdca3d4429922246e33b3f5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 817e5067034c8251b8034d2006cc56f8300157be Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 70be8181d02c90383c3bd83fee690ab4267a1318 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 afa4e93cad1ca9acc17af9a34a6629e30b95d3bc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 6c8fd8e54b0dfa70368593d2bb282c25fb4d008f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 e5b85d66224dbed846fb3be033925ab3ba185738 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 8424ccb6b6f75ecf4bb186947691962b71bfe8b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 12ec6b070517f599510aeb9489f9ead42e9c060a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 652240e91899df22def2ee2028a0fea19b7bf7df Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 2b2c9007450b5af15b73e2965040c30acc20f8fc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 2dbeb1314e67ab186afcb4a104c7987c05bd7651 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 81fe9dbf98bb79508a71bb8ef159382bc73d9e64 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 1c520e265965588e9c2d58f99fa9a167f163302d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 7773435f2c0d3bb00635df8e45a1085939fe9364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 2e84dcb554d9053106c068ad9ce9668b211342e7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From d0a2b6ffad1faf7fa14669398811e3f83300d5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 41dc6ca260a903298b3ef0b57ce3ab887162502d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (10 preceding siblings ...)
  2024-05-28 14:58 ` Calandracas606
@ 2024-05-28 15:00 ` Calandracas606
  2024-05-28 19:18 ` meator
                   ` (12 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 15:00 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2135451341

Comment:
after several hours, i can't figure out how to fix cross compilation for `imhex`

please help

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (11 preceding siblings ...)
  2024-05-28 15:00 ` Calandracas606
@ 2024-05-28 19:18 ` meator
  2024-05-28 19:37 ` [PR PATCH] [Updated] " Calandracas606
                   ` (11 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: meator @ 2024-05-28 19:18 UTC (permalink / raw)
  To: ml

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

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2135947149

Comment:
> after several hours, i can't figure out how to fix cross compilation for `imhex`
> 
> please help

Worry not, I come to the rescue!

Here's a patch:

```patch
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,12 @@
 set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
 include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
 
+# Void Linux flags for cross compiling libromfs
+set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
+set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
+set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
+set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
+
 # Setup project
 loadVersion(IMHEX_VERSION)
 setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
```

This is what's causing problems: https://github.com/WerWolv/libromfs/blob/master/generator/CMakeLists.txt#L5-L12 (`libromfs` isn't a part of `imhex`, it gets downloaded during the configure step[^1])

`ld` prints warnings about skipping aarch libraries when looking for libs. I believe that these warnings are harmless.

<details><summary>Here are the ld warnings.</summary>
<p>

```
...
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.so when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.a when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.so when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.a when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.so when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.a when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
[141/369] Linking CXX executable plugins/builtin/libromfs/generator/generator-builtin
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.so when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.a when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.so when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.a when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.so when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.a when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
[142/369] Linking CXX executable main/gui/main/gui/libromfs/generator/generator-imhex
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.so when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libstdc++.a when searching for -lstdc++
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.so when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libm.a when searching for -lm
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.so when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libc.a when searching for -lc
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
/usr/bin/ld: skipping incompatible /usr/aarch64-linux-gnu/usr/lib/libgcc_s.so.1 when searching for libgcc_s.so.1
...
```

</p>
</details>

These flags could be theoretically set through `$configure_args`, but the variable expansion gets pretty funky with `$CFLAGS_host` and `$CXXFLAGS_host`. `libromfs`'s build system disregards the relevant `NATIVE_CMAKE_` variables when set through the environment, so the only two solutions I see is passing `-DNATIVE_CMAKE_` to cmake (impossible to do [because of parameter expansion](https://github.com/void-linux/void-packages/blob/master/common/build-style/cmake.sh#L78)) or modifying the build system like my patch does.

[^1]: This is bad for obvious reasons, I believe that it pulls https://github.com/WerWolv/libromfs directly from master. This should probably be fixed.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (12 preceding siblings ...)
  2024-05-28 19:18 ` meator
@ 2024-05-28 19:37 ` Calandracas606
  2024-05-28 19:38 ` Calandracas606
                   ` (10 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 19:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 48585 bytes --]

From 04032e74d105c87ec881a1e6afee9e1781ec00e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 b925ee1407471f0c4a274a3b653b27fd2be0cc42 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] 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 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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 <dem.procopiou@gmail.com>"
 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 3ce881de1b20f2c5d0d4e6bc59ac80d2d759a00c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 63d65d0eed27196da81bae7b96df0cb2fc68e9e1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 adedb9bffa945109cd2bed575ecf19232cb6132b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 e295750219e1443aa5508f6499eb0ab98120fba1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ed2e2428f44224..b6a8d8ee785256 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 e0df6208e223554f4f07f13f0724df1593d1927e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From d02bcd74ef9dc37c30c8972fc36a25c576706706 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 09511094d50b485532c0b24002ceeef898f6c602 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 15bf7c7ccb3d2a74040746c347f394e9bd30700a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 3de3e0369d2057c574250dab2acbd0874fa02944 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 04774740e4f56cddffdca3d4429922246e33b3f5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 817e5067034c8251b8034d2006cc56f8300157be Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 70be8181d02c90383c3bd83fee690ab4267a1318 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 afa4e93cad1ca9acc17af9a34a6629e30b95d3bc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 6c8fd8e54b0dfa70368593d2bb282c25fb4d008f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 e5b85d66224dbed846fb3be033925ab3ba185738 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 8424ccb6b6f75ecf4bb186947691962b71bfe8b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 12ec6b070517f599510aeb9489f9ead42e9c060a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 652240e91899df22def2ee2028a0fea19b7bf7df Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 2b2c9007450b5af15b73e2965040c30acc20f8fc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 2dbeb1314e67ab186afcb4a104c7987c05bd7651 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 81fe9dbf98bb79508a71bb8ef159382bc73d9e64 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 1c520e265965588e9c2d58f99fa9a167f163302d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 92d1c240427f04f54f2946050d8b34d4346222e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From a63dcbf53d8b30e222051db1bd289ad38e2f7204 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 2f87662a0872c03ab7c4a5c6bb9ec651f14f61a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 07e29e7dc238b306a9f11ff66159574ce29771c4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (13 preceding siblings ...)
  2024-05-28 19:37 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-28 19:38 ` Calandracas606
  2024-05-28 19:48 ` [PR PATCH] [Updated] " Calandracas606
                   ` (9 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 19:38 UTC (permalink / raw)
  To: ml

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

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50183#issuecomment-2135978231

Comment:
> > after several hours, i can't figure out how to fix cross compilation for `imhex`
> > please help
> 
> Worry not, I come to the rescue!
> 
Thanks! the patch works

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (14 preceding siblings ...)
  2024-05-28 19:38 ` Calandracas606
@ 2024-05-28 19:48 ` Calandracas606
  2024-05-28 22:03 ` Calandracas606
                   ` (8 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 19:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 48646 bytes --]

From 04032e74d105c87ec881a1e6afee9e1781ec00e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 d24c3935bebbf6642834aee645ae5df8ecabcd20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From 56d038cc893ab3169ef353548e5a007ed7b14c7f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From e2f0bb151a11439df403ea7db05cb9961b248ef2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 e4933c210d120eb8bfa1731b9f433a6fb40c2fd4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 5f374a73c8ada84218b4ed0f7519545353a7d5d0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ed2e2428f44224..b6a8d8ee785256 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 57c7a433e1a2c8da9117ed5e3604786300b9d063 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From be52d7f7efdf7ff1199ca6fc7eac03a87ea836e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 595aec44f083536ce82b6cfb390698de43ac2ead Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 c6366c63b4e7abf9a99186433d5c285ba4e207ac Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 2de656187c854b1185a80323716a5cc2bf0e01a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 d224a7dc03e011a4c50442e85ba3075e0353655d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 bb856f4cea83cdf5649d5c3f7a9b87b6b1a5a4da Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 a245975ef80a122283dfec6f09f91bc8b2f13be7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 8264a112710db278a398088e49cfc2ab112a8c64 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 45fb76b83fe18b3649a40f8beb15bd79866339a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 16b391fb344b3fcc033b22225db7a5da321e5b2a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 f0bbd467bd51947a72f8dc0ccd0eca4609f0dc63 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 34ac5f4f844193ebad40aebbfaefed9c559061c5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8298dbd959a42b48c81804d222f5421b267cf7f0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 7b94d18532ae79ab54b1d55ff8fcf021aa6c8a8b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 0cd284e62d35310a186d7fe10a80565187adcff5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 d4dd85cfe4c8bda36f766fab59d369bbb17f96a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 e4b637f465e9d96ce28eef7caa6fcc396cae95c4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 eef3e8efc80f19bc8f271b2bde82ddcff98acda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From ee63b1ca300a7b64ac274a936ebb95250ee34aae Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From e49b2ebe6068958b2517f949e3d5be2beb036375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 821ed095f8b09e0bd47fc67385cc35d003a5d4c3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (15 preceding siblings ...)
  2024-05-28 19:48 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-05-28 22:03 ` Calandracas606
  2024-05-28 22:36 ` Calandracas606
                   ` (7 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 22:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci-skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 48646 bytes --]

From 04032e74d105c87ec881a1e6afee9e1781ec00e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 d24c3935bebbf6642834aee645ae5df8ecabcd20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From 56d038cc893ab3169ef353548e5a007ed7b14c7f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From e2f0bb151a11439df403ea7db05cb9961b248ef2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 e4933c210d120eb8bfa1731b9f433a6fb40c2fd4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 5f374a73c8ada84218b4ed0f7519545353a7d5d0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ed2e2428f44224..b6a8d8ee785256 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 57c7a433e1a2c8da9117ed5e3604786300b9d063 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From be52d7f7efdf7ff1199ca6fc7eac03a87ea836e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 595aec44f083536ce82b6cfb390698de43ac2ead Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 c6366c63b4e7abf9a99186433d5c285ba4e207ac Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 2de656187c854b1185a80323716a5cc2bf0e01a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 d224a7dc03e011a4c50442e85ba3075e0353655d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 bb856f4cea83cdf5649d5c3f7a9b87b6b1a5a4da Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 a245975ef80a122283dfec6f09f91bc8b2f13be7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 8264a112710db278a398088e49cfc2ab112a8c64 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 45fb76b83fe18b3649a40f8beb15bd79866339a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 16b391fb344b3fcc033b22225db7a5da321e5b2a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 f0bbd467bd51947a72f8dc0ccd0eca4609f0dc63 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 34ac5f4f844193ebad40aebbfaefed9c559061c5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8298dbd959a42b48c81804d222f5421b267cf7f0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 7b94d18532ae79ab54b1d55ff8fcf021aa6c8a8b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 0cd284e62d35310a186d7fe10a80565187adcff5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 d4dd85cfe4c8bda36f766fab59d369bbb17f96a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 e4b637f465e9d96ce28eef7caa6fcc396cae95c4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 eef3e8efc80f19bc8f271b2bde82ddcff98acda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From ee63b1ca300a7b64ac274a936ebb95250ee34aae Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From e49b2ebe6068958b2517f949e3d5be2beb036375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From f3d372e7527517e11aec175396ab813375c375a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (16 preceding siblings ...)
  2024-05-28 22:03 ` Calandracas606
@ 2024-05-28 22:36 ` Calandracas606
  2024-05-28 22:39 ` Calandracas606
                   ` (6 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 22:36 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci-skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 49001 bytes --]

From 04032e74d105c87ec881a1e6afee9e1781ec00e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/29] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 d24c3935bebbf6642834aee645ae5df8ecabcd20 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/29] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From 56d038cc893ab3169ef353548e5a007ed7b14c7f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/29] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From e2f0bb151a11439df403ea7db05cb9961b248ef2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/29] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 e4933c210d120eb8bfa1731b9f433a6fb40c2fd4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/29] 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 5f374a73c8ada84218b4ed0f7519545353a7d5d0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/29] 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 ed2e2428f44224..b6a8d8ee785256 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 57c7a433e1a2c8da9117ed5e3604786300b9d063 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/29] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From be52d7f7efdf7ff1199ca6fc7eac03a87ea836e3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/29] 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 595aec44f083536ce82b6cfb390698de43ac2ead Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/29] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 c6366c63b4e7abf9a99186433d5c285ba4e207ac Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/29] 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 2de656187c854b1185a80323716a5cc2bf0e01a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/29] 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 d224a7dc03e011a4c50442e85ba3075e0353655d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/29] 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 bb856f4cea83cdf5649d5c3f7a9b87b6b1a5a4da Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/29] 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 a245975ef80a122283dfec6f09f91bc8b2f13be7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/29] 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 8264a112710db278a398088e49cfc2ab112a8c64 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/29] 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 45fb76b83fe18b3649a40f8beb15bd79866339a7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/29] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 16b391fb344b3fcc033b22225db7a5da321e5b2a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/29] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 f0bbd467bd51947a72f8dc0ccd0eca4609f0dc63 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/29] 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 34ac5f4f844193ebad40aebbfaefed9c559061c5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/29] 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 8298dbd959a42b48c81804d222f5421b267cf7f0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/29] 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 7b94d18532ae79ab54b1d55ff8fcf021aa6c8a8b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/29] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 0cd284e62d35310a186d7fe10a80565187adcff5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/29] 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 d4dd85cfe4c8bda36f766fab59d369bbb17f96a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/29] 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 e4b637f465e9d96ce28eef7caa6fcc396cae95c4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/29] 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 eef3e8efc80f19bc8f271b2bde82ddcff98acda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/29] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From ee63b1ca300a7b64ac274a936ebb95250ee34aae Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/29] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From e49b2ebe6068958b2517f949e3d5be2beb036375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/29] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From f3d372e7527517e11aec175396ab813375c375a6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/29] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 47ca04a81a833752206a4bc85eab890dae5015aa Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 28 May 2024 18:36:38 -0400
Subject: [PATCH 29/29] force

---
 foo | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 foo

diff --git a/foo b/foo
new file mode 100644
index 00000000000000..e69de29bb2d1d6

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (17 preceding siblings ...)
  2024-05-28 22:36 ` Calandracas606
@ 2024-05-28 22:39 ` Calandracas606
  2024-06-13 23:34 ` [PR PATCH] [Updated] " Calandracas606
                   ` (5 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-05-28 22:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci-skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 48646 bytes --]

From dad89ffa9abbbd423c983c4486b96727af64c778 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 279bf10d77d26e..50dd5492c32110 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3609,7 +3609,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 dd68ae1a3876397332a03a85fcbd6eb2e8790059 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 50dd5492c32110..8e36e2f5f65c94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4192,7 +4192,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From 429932a333d9507b20e66687d2aab2f285ce7a15 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 8e36e2f5f65c94..58bf8679cc9712 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4188,10 +4188,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 698d99c0c30b1ceecb89fa4518df1a05e84df117 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 91f3a7cbd0b6d69a4f5688d1d7ac2332eab5f9f6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 37942e7bbae94d8052afc2514751f582db639e46 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 ed2e2428f44224..b6a8d8ee785256 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 016839d8e03d8bb6223fd48b89ef53092b669923 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From 239be2995b92762fafaf20bcc4a22def5287823a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 e1093903cdead4785ce4b14e5035a12301b51e34 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 404d29e8bf5b60666b4e199b109047f8313868ae Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 f6f82ac3cee333028114691bcc95d472203ba372 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 6df0539be310442761e743c136a81b56c483289d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 9bfd1ca342d7b04075a008183ce3fcf06e6e931b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 51d9c2eff010c17bae0b095c4919b38dd55bc3ca Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 a62e3addc1a99783b39d19959c095fa69734e481 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 ba1af7f9a7ff5246c66d3767365f70201cdacc63 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 f453a1f05094aaca31a3812f17e2ce474005aafa Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 857ad33661410960aedb66fcb8e0a9ce1b4717f8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 04a02da7536175153689381da34a301843f8e194 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 afd4d297ffcb5e18a29a1c4b35af23a579de6614 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 4bade50a5f338552ff2e84f993a23ae0cd62fb4b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 5a6860379ef4eb2406d679873e4048df96f2813e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 69b6903a8affe982a3299042e24a538c207fd870 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 869dc2fe90514caa7e49c1a8b27e1ad0b8947961 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 ad1fd422307c6ca1a8c70032a4d8d68807373ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 289c9f0a87d088e3146fdef4d41ee4ab651c0091 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From 80cef34977e5a340ca63d301eec39178cb69414b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 6c8bf7590e108b38ec1d9dbca3c98ec248725750 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (18 preceding siblings ...)
  2024-05-28 22:39 ` Calandracas606
@ 2024-06-13 23:34 ` Calandracas606
  2024-07-05 16:08 ` [PR PATCH] [Updated] [WIP] " Calandracas606
                   ` (4 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-06-13 23:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci-skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 48646 bytes --]

From a01d80de09f76af9369543a1040b1a4401905ac4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 a33bb85772e392..a9ff3a2b14e93e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3608,7 +3608,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 7062bbe5799cb2db9e80b78c312a72b3b03d5ec0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a9ff3a2b14e93e..0ab0a0827378d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4191,7 +4191,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From 556727a94afaf38bd08ff3f062d26c0ff900af36 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index 0ab0a0827378d4..2d9a85fb000f7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4187,10 +4187,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From 9987e062ae709a45c6787224bcc9f7ba256155f1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 993723f6959466abc1e49b53880f7adcfbdd1dff Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 3dcfa6a35360fe85be14e92ac768254c70c76d8e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 9e5796a3ffe40f..11502f57bcba8a 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
 version=0.7.2
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_xnvctrl=disabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled"

From 14e546894a5446cb3cc0b7d516df03244aec9fe1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From 67cfd0255edbfb29b4d3b07cf923a2be3f01172b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 5b0dd53bd6b4e789208bf5a3c9a371d6901e62e5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 e6c23b23df601b422517c42c8934a6d8d1e44386 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 f7d4ac6c75b0b24a728879dc4e61f56dfb06aa6f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 4dbe3ab1da4cbb9852f9777ef7a1ea5f599cf499 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 0c7e7148090421f081bd291a223ecdd45791304d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 651962a0165726e8e88ed32848e4c0babd3536f1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 fc244d3d9304bb46f9b159f53782af55ca650413 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 bcf98c63e19f6d7ef10b6fc6dcf2d08d4f6e11f6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 d190a7923f83b7f6329643eb18e897844d4f0a91 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 1225de6306c70a788472fb7a89b18a3192616b3f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 67b987b2e636147bfa0be2556e560be413f3f60c Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 39fc036e15bb130bb813412a6f0ad9470473c19f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 f81bc938c8ba35ff44bb5e19692b5345e4c0b2d6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] 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<int>(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<std::string>());
+                       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<int>(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<QIODevice> source_,
+                 this,
+                 [mediaPlayer](QMediaPlayer::Error error) {
+                     nhlog::ui()->debug("Media player error {} and errorStr {}",
+-                                       error,
++                                       static_cast<int>(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<int>(status), static_cast<int>(mediaPlayer->error()));
+                 });
+         connect(mediaPlayer,
+                 qOverload<const QString &, const QVariant &>(&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<QMediaPlayer::Error>(&MxcMediaProxy::error),
+             [this](QMediaPlayer::Error error) {
+                 nhlog::ui()->info("Media player error {} and errorStr {}",
+-                                  error,
++                                  static_cast<int>(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<int>(status), static_cast<int>(this->error()));
+     });
+     connect(this,
+             qOverload<const QString &, const QVariant &>(&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 b55d375923be2be135fc138dd316b61dca2d072b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 715bcc7fd065838d6af8b401956b93973570a1d4 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 22395fddc1eba8bf1ea68cc02c2508775ea85d58 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 876b53537e9fa77630f6661f24a4712c84d93401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From 0fc4f5001d31eb96a350f0c9360603a52f2185dc Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From df6d9dd8329ef4da0d42dd07e3c590e305b3c26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From 4125e9bd62335e2cce1dab2b13c75cf365243248 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (19 preceding siblings ...)
  2024-06-13 23:34 ` [PR PATCH] [Updated] " Calandracas606
@ 2024-07-05 16:08 ` Calandracas606
  2024-07-05 17:49 ` Calandracas606
                   ` (3 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-07-05 16:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 44396 bytes --]

From 01883342959a57d9b8a97bfa20d8185be80ad849 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 7c13e616340dc9..dd199382a26e15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3621,7 +3621,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 6d73e552e8a3f9db767ed2eb161b89aadb8d2464 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd199382a26e15..f0410d029d12bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From a49cbe1dce675b8b281c9da4ec3fd396c923f0b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index f0410d029d12bf..f53a79ccebaa8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,10 +4202,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From c6c99ce87a10290c78df183ad5bcda4d6bdc23b1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 fd77f678dce5d496d3c6e99c00d2073eab1c8961 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 81edd7fe83ad5ab3ff5bef2eda5a678b0e5c9e16 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 9e5796a3ffe40f..11502f57bcba8a 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
 version=0.7.2
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_xnvctrl=disabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled"

From 574fa2ec6f17476e6c3d50e8ea3662e76c723a6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From 18e45f2c1b536141f2e9c6f48b63692245c38dc7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 cf8793176d8b9a..d5c78cb8b8358d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=1.1.3
-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 d03ae8daa05025aa0c4fddbb138b33a61882e051 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 da82af820aedc1d8ddb14fcce19ce7819dc33746 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 f07cfc545a8b1c39f4ca3748be037e4ebed05be1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 c06dc27da400d987bc8f96e89b6ecd3b1e6d2c6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 82f11b0a9a9dd99eb082c8ae7f09049fa6a299ab Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 da55f262777fcd..3411ca5dfbeae2 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
 # Template file for 'furnace'
 pkgname=furnace
 version=0.6.5
-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 538eec2f1cfd3bc041b2fdbfc18e6ef5be8a0b33 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 c19090eec3238681feac56f99a74e107639a20c2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 9a52d90bb5f2fac24e7fc5a2aef85e4c20171122 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 b67ce8d64aa721cc4ea4d85ede21a5a1b7c51f4a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 fb1a38164e651915660f9d4487fe9c3a47469415 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 f0a54058327a68..7a3e21ed5d0b54 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=85.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="qmake6"
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"

From ca4180e5cd5f040e11c55483f0dc285a66251efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8be53063656f6669497ccf97ac5cb1c42e0fd4db Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.10.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"

From ad59d91ce0a874070c0521d1786a48bb88e16f72 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] nheko: rebuild for fmt-10

---
 srcpkgs/nheko/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f9c7044b609174..50abcd64443e32 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,10 +1,10 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.12.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
-makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
+makedepends="qt6-base-private-devel qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
  xcb-util-wm-devel re2-devel KDSingleApplication"

From 7ce75e95b27428a4d60cff5e7297d9ebc88680b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 f669607379a9ad8ca136dd5bbb7cad14098f202d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 8619a3997d7158ef347df3de30d7fd3d168d208d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 59e7f069107165910bb489aaa66163f2ce8e50ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From c6353c9f9a5d39dc168f6ad7f97e66b22aeaec0b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From b6e7af2e01d248e3ddfd41beb6031b1beda3c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From acced2e369d0c70a27da7d049c7f3cecb861f1a5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (20 preceding siblings ...)
  2024-07-05 16:08 ` [PR PATCH] [Updated] [WIP] " Calandracas606
@ 2024-07-05 17:49 ` Calandracas606
  2024-07-05 17:52 ` Calandracas606
                   ` (2 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-07-05 17:49 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 44396 bytes --]

From 01883342959a57d9b8a97bfa20d8185be80ad849 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 7c13e616340dc9..dd199382a26e15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3621,7 +3621,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 6d73e552e8a3f9db767ed2eb161b89aadb8d2464 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd199382a26e15..f0410d029d12bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From a49cbe1dce675b8b281c9da4ec3fd396c923f0b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index f0410d029d12bf..f53a79ccebaa8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,10 +4202,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From c6c99ce87a10290c78df183ad5bcda4d6bdc23b1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 fd77f678dce5d496d3c6e99c00d2073eab1c8961 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 81edd7fe83ad5ab3ff5bef2eda5a678b0e5c9e16 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 9e5796a3ffe40f..11502f57bcba8a 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
 version=0.7.2
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_xnvctrl=disabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled"

From 574fa2ec6f17476e6c3d50e8ea3662e76c723a6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From 18e45f2c1b536141f2e9c6f48b63692245c38dc7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 cf8793176d8b9a..d5c78cb8b8358d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=1.1.3
-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 d03ae8daa05025aa0c4fddbb138b33a61882e051 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 da82af820aedc1d8ddb14fcce19ce7819dc33746 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 f07cfc545a8b1c39f4ca3748be037e4ebed05be1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 c06dc27da400d987bc8f96e89b6ecd3b1e6d2c6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 82f11b0a9a9dd99eb082c8ae7f09049fa6a299ab Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 da55f262777fcd..3411ca5dfbeae2 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
 # Template file for 'furnace'
 pkgname=furnace
 version=0.6.5
-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 538eec2f1cfd3bc041b2fdbfc18e6ef5be8a0b33 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 c19090eec3238681feac56f99a74e107639a20c2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 9a52d90bb5f2fac24e7fc5a2aef85e4c20171122 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 b67ce8d64aa721cc4ea4d85ede21a5a1b7c51f4a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 fb1a38164e651915660f9d4487fe9c3a47469415 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 f0a54058327a68..7a3e21ed5d0b54 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=85.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="qmake6"
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"

From ca4180e5cd5f040e11c55483f0dc285a66251efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8be53063656f6669497ccf97ac5cb1c42e0fd4db Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.10.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"

From ad59d91ce0a874070c0521d1786a48bb88e16f72 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] nheko: rebuild for fmt-10

---
 srcpkgs/nheko/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f9c7044b609174..50abcd64443e32 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,10 +1,10 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.12.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
-makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
+makedepends="qt6-base-private-devel qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
  xcb-util-wm-devel re2-devel KDSingleApplication"

From 7ce75e95b27428a4d60cff5e7297d9ebc88680b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 f669607379a9ad8ca136dd5bbb7cad14098f202d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 8619a3997d7158ef347df3de30d7fd3d168d208d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 59e7f069107165910bb489aaa66163f2ce8e50ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From c6353c9f9a5d39dc168f6ad7f97e66b22aeaec0b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From b6e7af2e01d248e3ddfd41beb6031b1beda3c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From acced2e369d0c70a27da7d049c7f3cecb861f1a5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (21 preceding siblings ...)
  2024-07-05 17:49 ` Calandracas606
@ 2024-07-05 17:52 ` Calandracas606
  2024-07-09 13:22 ` [PR PATCH] [Updated] " Calandracas606
  2024-07-09 13:42 ` Calandracas606
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-07-05 17:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

[WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 44396 bytes --]

From 01883342959a57d9b8a97bfa20d8185be80ad849 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/28] 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 7c13e616340dc9..dd199382a26e15 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3621,7 +3621,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 6d73e552e8a3f9db767ed2eb161b89aadb8d2464 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/28] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd199382a26e15..f0410d029d12bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4206,7 +4206,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From a49cbe1dce675b8b281c9da4ec3fd396c923f0b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/28] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index f0410d029d12bf..f53a79ccebaa8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4202,10 +4202,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From c6c99ce87a10290c78df183ad5bcda4d6bdc23b1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/28] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 fd77f678dce5d496d3c6e99c00d2073eab1c8961 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/28] 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 81edd7fe83ad5ab3ff5bef2eda5a678b0e5c9e16 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:48 -0400
Subject: [PATCH 06/28] 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 9e5796a3ffe40f..11502f57bcba8a 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,7 +1,7 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
 version=0.7.2
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwith_xnvctrl=disabled
  -Dwith_nvml=disabled -Duse_system_spdlog=enabled"

From 574fa2ec6f17476e6c3d50e8ea3662e76c723a6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 07/28] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From 18e45f2c1b536141f2e9c6f48b63692245c38dc7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 08/28] 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 cf8793176d8b9a..d5c78cb8b8358d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=1.1.3
-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 d03ae8daa05025aa0c4fddbb138b33a61882e051 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 09/28] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 da82af820aedc1d8ddb14fcce19ce7819dc33746 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 10/28] 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 f07cfc545a8b1c39f4ca3748be037e4ebed05be1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 11/28] 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 c06dc27da400d987bc8f96e89b6ecd3b1e6d2c6d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 12/28] 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 82f11b0a9a9dd99eb082c8ae7f09049fa6a299ab Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 13/28] 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 da55f262777fcd..3411ca5dfbeae2 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
 # Template file for 'furnace'
 pkgname=furnace
 version=0.6.5
-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 538eec2f1cfd3bc041b2fdbfc18e6ef5be8a0b33 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 14/28] 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 c19090eec3238681feac56f99a74e107639a20c2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 15/28] 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 9a52d90bb5f2fac24e7fc5a2aef85e4c20171122 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 16/28] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 b67ce8d64aa721cc4ea4d85ede21a5a1b7c51f4a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 17/28] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644
+--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
++++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
+@@ -446,7 +446,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       // password entry and re-entry succeeded, write out the lock data
+       share->m_iHasLock = LOCK_STATE_LOCKED;
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockcode", strNewPassword);
+-      strNewPassword = StringUtils::Format("%i", share->m_iLockMode);
++      strNewPassword = StringUtils::Format("%i", static_cast<int>(share->m_iLockMode));
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "lockmode", strNewPassword);
+       CMediaSourceSettings::GetInstance().UpdateSource(type, share->strName, "badpwdcount", "0");
+       CMediaSourceSettings::GetInstance().Save();
+@@ -519,7 +519,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
+       std::string strNewPW;
+       std::string strNewLockMode;
+       if (CGUIDialogLockSettings::ShowAndGetLock(share->m_iLockMode,strNewPW))
+-        strNewLockMode = StringUtils::Format("%i",share->m_iLockMode);
++        strNewLockMode = StringUtils::Format("%i",static_cast<int>(share->m_iLockMode));
+       else
+         return false;
+       // password ReSet and re-entry succeeded, write out the lock data
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 fb1a38164e651915660f9d4487fe9c3a47469415 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:31 -0400
Subject: [PATCH 18/28] 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 f0a54058327a68..7a3e21ed5d0b54 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
 version=85.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="qmake6"
 configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"

From ca4180e5cd5f040e11c55483f0dc285a66251efb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:34 -0400
Subject: [PATCH 19/28] 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 8be53063656f6669497ccf97ac5cb1c42e0fd4db Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:38 -0400
Subject: [PATCH 20/28] 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 99d61932d3b56b..07e471e1753ca8 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
 version=0.10.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"

From ad59d91ce0a874070c0521d1786a48bb88e16f72 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:41 -0400
Subject: [PATCH 21/28] nheko: rebuild for fmt-10

---
 srcpkgs/nheko/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f9c7044b609174..50abcd64443e32 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,10 +1,10 @@
 # Template file for 'nheko'
 pkgname=nheko
 version=0.12.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt6-base qt6-tools qt6-declarative-host-tools pkg-config asciidoc"
-makedepends="qt6-multimedia-devel qt6-svg-devel qt6-declarative-devel fmt-devel
+makedepends="qt6-base-private-devel qt6-multimedia-devel qt6-svg-devel qt6-declarative-private-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  qtkeychain-qt6-devel gst-plugins-bad1-devel gst-plugins-base1-devel
  xcb-util-wm-devel re2-devel KDSingleApplication"

From 7ce75e95b27428a4d60cff5e7297d9ebc88680b3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:44 -0400
Subject: [PATCH 22/28] 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 f669607379a9ad8ca136dd5bbb7cad14098f202d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:48 -0400
Subject: [PATCH 23/28] 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 8619a3997d7158ef347df3de30d7fd3d168d208d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:51 -0400
Subject: [PATCH 24/28] 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 59e7f069107165910bb489aaa66163f2ce8e50ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:12:58 +0700
Subject: [PATCH 25/28] imhex: update to 1.33.2.

---
 srcpkgs/imhex/patches/cross.patch      | 15 +++++++++++++++
 srcpkgs/imhex/patches/musl-ioctl.patch | 22 ++++++++++++++++++++++
 srcpkgs/imhex/template                 | 13 +++++++------
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/imhex/patches/cross.patch
 create mode 100644 srcpkgs/imhex/patches/musl-ioctl.patch

diff --git a/srcpkgs/imhex/patches/cross.patch b/srcpkgs/imhex/patches/cross.patch
new file mode 100644
index 00000000000000..8f33f7e6416a65
--- /dev/null
+++ b/srcpkgs/imhex/patches/cross.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,12 @@
+ set(CMAKE_MODULE_PATH "${IMHEX_BASE_FOLDER}/cmake/modules")
+ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake")
+ 
++# Void Linux flags for cross compiling libromfs
++set(NATIVE_CMAKE_C_COMPILER "$ENV{CC_host}")
++set(NATIVE_CMAKE_CXX_COMPILER "$ENV{CXX_host}")
++set(NATIVE_CMAKE_C_FLAGS "$ENV{CFLAGS_host}")
++set(NATIVE_CMAKE_CXX_FLAGS "$ENV{CXXFLAGS_host}")
++
+ # Setup project
+ loadVersion(IMHEX_VERSION)
+ setVariableInParent(IMHEX_VERSION ${IMHEX_VERSION})
diff --git a/srcpkgs/imhex/patches/musl-ioctl.patch b/srcpkgs/imhex/patches/musl-ioctl.patch
new file mode 100644
index 00000000000000..a8f9225502eebd
--- /dev/null
+++ b/srcpkgs/imhex/patches/musl-ioctl.patch
@@ -0,0 +1,22 @@
+commit b1d6c7031fab0d7302f17f5f9658cc941bdd4391
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date:   Tue May 28 10:48:10 2024 -0400
+
+    fix built on musl
+    
+    musl libc defined iocl as `int ioctl (int, int, ...);` meaning that
+    passing BLKGETSIZE64 will cause an integer overflow.
+
+diff --git a/plugins/builtin/source/content/providers/disk_provider.cpp b/plugins/builtin/source/content/providers/disk_provider.cpp
+index b9409808..7ffdd7ad 100644
+--- a/plugins/builtin/source/content/providers/disk_provider.cpp
++++ b/plugins/builtin/source/content/providers/disk_provider.cpp
+@@ -102,7 +102,7 @@ namespace hex::plugin::builtin {
+         }
+     #endif
+ 
+-    #ifdef BLKGETSIZE64
++    #if defined(BLKGETSIZE64) && defined(__GLIBC__)
+         int blkdev_get_size(int fd, u64 *bytes) {
+             if (ioctl(fd, BLKGETSIZE64, bytes) < 0)
+                 return -1;
diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template
index 72af581ce9d128..34a53733d042d5 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
+version=1.33.2
+revision=1
 build_wrksrc="ImHex"
 build_style=cmake
 build_helper=qemu
@@ -9,9 +9,9 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF
  -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON
  -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON"
 hostmakedepends="pkg-config clang-tools-extra"
-makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++
+makedepends="libcurl-devel fmt-devel jansson-devel yara-devel json-c++
  freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel
- clang-tools-extra capstone-devel"
+ clang-tools-extra capstone-devel llvm17-devel libomp-devel"
 short_desc="Hex editor for reverse engineers and programmers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -19,9 +19,10 @@ homepage="https://imhex.werwolv.net/"
 changelog="https://github.com/WerWolv/ImHex/releases"
 distfiles="https://github.com/WerWolv/ImHex/releases/download/v${version}/Full.Sources.tar.gz>imhex-${version}.tar.gz
  https://github.com/WerWolv/ImHex-Patterns/archive/refs/tags/ImHex-v${version}.tar.gz>imhex-patterns-${version}.tar.gz"
-checksum="edf164996ba3a960b7b022acb1441aef2960c60e7a46409b01d9ff164cd99e7a
- 8f38ca5ea73298e104231276026f50d350f350626bcefc11a3935528be34581c"
+checksum="c126ecebb639f68050a47d1f9ea0e060c6ae25bfade87237cb54f2e584cfa252
+ 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb"
 patch_args="-Np1 -d $build_wrksrc"
+python_version=3
 
 if [ "$XBPS_TARGET_WORDSIZE" = 32 ]; then
 	broken="uses i128"

From c6353c9f9a5d39dc168f6ad7f97e66b22aeaec0b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sat, 4 May 2024 14:43:47 -0400
Subject: [PATCH 26/28] gerbera: update to 2.1.0.

---
 srcpkgs/gerbera/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 2dc0ac0ce03b55..3782c8d4dbeab6 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
 # Template file for 'gerbera'
 pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.1.0
+revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
 hostmakedepends="pkg-config"
 makedepends="duktape-devel expat-devel ffmpeg-devel file-devel libcurl-devel
  libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
 short_desc="UPnP Media Server based on MediaTomb"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://gerbera.io/"
 changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
 distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=50af65e5570930b543176d6a2906ba2bd36fd548716818024285d79eb4977a1d
 
 # libupnp uses large file support, so users must do that, too
 CXXFLAGS="-D_FILE_OFFSET_BITS=64"

From b6e7af2e01d248e3ddfd41beb6031b1beda3c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 5 May 2024 09:58:10 +0700
Subject: [PATCH 27/28] devilutionX: update to 1.5.2.

---
 srcpkgs/devilutionX/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 6c253537baf770..67c335f5e4002d 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,7 +1,7 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.4.1
-revision=4
+version=1.5.2
+revision=1
 build_style=cmake
 configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON"
 hostmakedepends="pkg-config"
@@ -9,12 +9,13 @@ makedepends="SDL2-devel SDL2_image-devel bzip2-devel libsodium-devel
  gtest-devel fmt-devel zlib-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
-license="Unlicense"
+license="custom:Sustainable Use License"
 homepage="https://github.com/diasurgical/devilutionX"
 changelog="https://raw.githubusercontent.com/diasurgical/devilutionX/master/docs/CHANGELOG.md"
-distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz"
-checksum=f80a5414bb7b5a5ae9f6dbc69cec4ae080c29dd0a8a553cedd405d631011da9f
+distfiles="https://github.com/diasurgical/devilutionX/releases/download/${version}/devilutionx-src.tar.xz>devilutionX-${version}.tar.xz"
+checksum=27dc99cb8b40cb6fccbb5935aac7ce0c906664cc3815bcf9e27195747db46ed3
+repository=nonfree
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md
 }

From acced2e369d0c70a27da7d049c7f3cecb861f1a5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 5 May 2024 12:39:47 -0400
Subject: [PATCH 28/28] vtk: update to 9.3.0.

---
 srcpkgs/vtk/patches/gcc13.patch          | 13 -------------
 srcpkgs/vtk/patches/vtkioss-unistd.patch |  6 +++---
 srcpkgs/vtk/template                     |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/vtk/patches/gcc13.patch

diff --git a/srcpkgs/vtk/patches/gcc13.patch b/srcpkgs/vtk/patches/gcc13.patch
deleted file mode 100644
index d0ba2017b70ca0..00000000000000
--- a/srcpkgs/vtk/patches/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/vtk/blob/1a12f28665b2f24537b98fcf4b3fb3a176fa7fba/f/vtk-include.patch
-
-diff -up VTK-9.2.5/IO/Image/vtkSEPReader.h.include VTK-9.2.5/IO/Image/vtkSEPReader.h
---- VTK-9.2.5/IO/Image/vtkSEPReader.h.include	2023-01-05 08:51:35.000000000 -0700
-+++ VTK-9.2.5/IO/Image/vtkSEPReader.h	2023-01-17 07:43:41.988095734 -0700
-@@ -26,6 +26,7 @@
- #include "vtkNew.h" // for ivars
- 
- #include <array>  // for std::array
-+#include <cstdint> // for std::uint8_t
- #include <string> // for std::string
- 
- namespace details
diff --git a/srcpkgs/vtk/patches/vtkioss-unistd.patch b/srcpkgs/vtk/patches/vtkioss-unistd.patch
index df43a1fe5bba9c..d07abb59fe5edd 100644
--- a/srcpkgs/vtk/patches/vtkioss-unistd.patch
+++ b/srcpkgs/vtk/patches/vtkioss-unistd.patch
@@ -11,9 +11,9 @@ index ca5f15de..99c2bbdd 100644
  #else
 -#include <sys/unistd.h>
 +#include <unistd.h>
- #endif
- 
- #ifdef SEACAS_HAVE_MPI
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
 @@ -35,9 +35,6 @@
  
  #include <cstdio>
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 189591d55725a7..86a9821c4f965c 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
+version=9.3.0
+revision=1
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
 # Build only the core modules plus python bindings for now
@@ -14,6 +14,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -DVTK_FORBID_DOWNLOADS=ON
  -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
  -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF
+ -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF
  -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3"
 # vtk forks libharu, bumps to v2.4.0, and requires libharu>=2.4.0
 makedepends="zlib-devel freetype-devel liblz4-devel expat-devel MesaLib-devel
@@ -26,7 +27,7 @@ maintainer="Piraty <mail@piraty.dev>"
 license="BSD-3-Clause"
 homepage="https://www.vtk.org"
 distfiles="https://www.vtk.org/files/release/${version:0:3}/VTK-${version}.tar.gz"
-checksum=06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12
+checksum=fdc7b9295225b34e4fdddc49cd06e66e94260cb00efee456e0f66568c9681be9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] fmt: update to 10.2.1, spdlog: update to 1.14.1.
  2024-05-03 22:39 [PR PATCH] [WIP] fmt: update to 10.2.1, spdlog: update to 1.14.1 Calandracas606
                   ` (22 preceding siblings ...)
  2024-07-05 17:52 ` Calandracas606
@ 2024-07-09 13:22 ` Calandracas606
  2024-07-09 13:42 ` Calandracas606
  24 siblings, 0 replies; 26+ messages in thread
From: Calandracas606 @ 2024-07-09 13:22 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Calandracas606/void-packages fmt-and-spdlog-update
https://github.com/void-linux/void-packages/pull/50183

fmt: update to 10.2.1, spdlog: update to 1.14.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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
-->

Build status (x86_64-glibc):

- [x] spdlog 
- [x] coeurl
- [x] mtxclient
- [x] vtk
- [x] python3-syndom
- [x] paps
- [x] opendht
- [x] nheko
- [x] mpd
- [x] mkvtoolnix
- [x] kodi
- [x] justbuild
- [x] imhex
- [x] gnuradio
- [x] gerbera
- [x] furnace
- [x] easyeffects 
- [x] devilutionX
- [x] cryfs
- [x] cherrytree
- [x] Waybar
- [x] MangoHud
- [x] Bear
- [x] 0ad

[ci skip]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-and-spdlog-update-50183.patch --]
[-- Type: text/x-diff, Size: 41285 bytes --]

From 2a89c5b15c4eb0e8f94a5b7508d85a1219fd6cb2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:25:37 -0400
Subject: [PATCH 01/27] 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 a61fee85bfe1d3..a6903acd59dd3e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3619,7 +3619,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 b3f5bac6150b71459c8df4bfc271e1e6824adf13 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:26:06 -0400
Subject: [PATCH 02/27] spdlog: update to 1.14.1.

---
 common/shlibs           | 2 +-
 srcpkgs/spdlog/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a6903acd59dd3e..e9e96de22809d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4204,7 +4204,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..fb073f81fceca4 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,10 +13,11 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 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"
+	hostmakedepends+=" catch2"
 fi
 
 libspdlog_package() {

From c8d99616cb99d2b961d2d233a88d5f77d6a742dd Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 23:58:46 -0400
Subject: [PATCH 03/27] libwaylandpp: update to 1.0.0.

---
 common/shlibs                              |  8 +--
 srcpkgs/libwaylandpp/patches/cstdint.patch | 57 ++++++++++++++++++++++
 srcpkgs/libwaylandpp/template              |  4 +-
 3 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libwaylandpp/patches/cstdint.patch

diff --git a/common/shlibs b/common/shlibs
index e9e96de22809d3..6937a9726924c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4200,10 +4200,10 @@ libec.so.10 eclib-20220621_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
 liblrcalc.so.2 lrcalc-2.1_1
-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
+libwayland-client++.so.1 libwaylandpp-1.0.0_1
+libwayland-cursor++.so.1 libwaylandpp-1.0.0_1
+libwayland-egl++.so.1 libwaylandpp-1.0.0_1
+libwayland-client-extra++.so.1 libwaylandpp-1.0.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
diff --git a/srcpkgs/libwaylandpp/patches/cstdint.patch b/srcpkgs/libwaylandpp/patches/cstdint.patch
new file mode 100644
index 00000000000000..b2d3755cf80910
--- /dev/null
+++ b/srcpkgs/libwaylandpp/patches/cstdint.patch
@@ -0,0 +1,57 @@
+From 3c441910aa25f57df2a4db55f75f5d99cea86620 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 8 Jan 2023 18:24:53 +0000
+Subject: [PATCH] add missing <cstdint> include
+
+Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>`
+implicitly anymore. As a result build fails without the change as:
+
+    [  2%] Building CXX object CMakeFiles/wayland-scanner++.dir/scanner/scanner.cpp.o
+    scanner/scanner.cpp:378:3: error: 'uint32_t' does not name a type
+      378 |   uint32_t width = 0;
+          |   ^~~~~~~~
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..37cf7ff 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <cctype>
+ #include <cmath>
++#include <cstdint>
+ #include <stdexcept>
+ 
+ #include "pugixml.hpp"
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
diff --git a/srcpkgs/libwaylandpp/template b/srcpkgs/libwaylandpp/template
index 99d1d50cdbe980..aea51d152a30c3 100644
--- a/srcpkgs/libwaylandpp/template
+++ b/srcpkgs/libwaylandpp/template
@@ -1,6 +1,6 @@
 # Template file for 'libwaylandpp'
 pkgname=libwaylandpp
-version=0.2.8
+version=1.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SCANNER=TRUE -DBUILD_LIBRARIES=TRUE
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/NilsBrause/waylandpp"
 distfiles="https://github.com/NilsBrause/waylandpp/archive/${version}.tar.gz"
-checksum=e7f486165d3568c3558b5c7099133aea4a285b82820eeafad329fc10271c654d
+checksum=b20b45917382c6b87e9380130c9a1a1c563da2f498de5830df12fbce326dd9f5
 subpackages="libwaylandpp-doc wayland-scanner++ libwaylandpp-devel"
 
 if [ "$CROSS_BUILD" ]; then

From a0f08ae726417ba616b14cb5f58c31f860cf1b90 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:41 -0400
Subject: [PATCH 04/27] 0ad: rebuild for fmt-10

---
 srcpkgs/0ad/patches/fmt-10.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/0ad/template             |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/0ad/patches/fmt-10.patch

diff --git a/srcpkgs/0ad/patches/fmt-10.patch b/srcpkgs/0ad/patches/fmt-10.patch
new file mode 100644
index 00000000000000..ada783ac3c2239
--- /dev/null
+++ b/srcpkgs/0ad/patches/fmt-10.patch
@@ -0,0 +1,26 @@
+diff --git a/source/network/NetMessage.cpp b/source/network/NetMessage.cpp
+index 61126d8..8945175 100644
+--- a/source/network/NetMessage.cpp
++++ b/source/network/NetMessage.cpp
+@@ -216,7 +216,7 @@ CNetMessage* CNetMessageFactory::CreateMessage(const void* pData,
+ 		break;
+ 
+ 	default:
+-		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
++		LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", static_cast<int>(header.GetType()));
+ 		break;
+ 	}
+ 
+diff --git a/source/simulation2/serialization/BinarySerializer.cpp b/source/simulation2/serialization/BinarySerializer.cpp
+index 6a0b4e4..7d30c5b 100644
+--- a/source/simulation2/serialization/BinarySerializer.cpp
++++ b/source/simulation2/serialization/BinarySerializer.cpp
+@@ -52,7 +52,7 @@ static u8 GetArrayType(js::Scalar::Type arrayType)
+ 	case js::Scalar::Uint8Clamped:
+ 		return SCRIPT_TYPED_ARRAY_UINT8_CLAMPED;
+ 	default:
+-		LOGERROR("Cannot serialize unrecognized typed array view: %d", arrayType);
++		LOGERROR("Cannot serialize unrecognized typed array view: %d", static_cast<int>(arrayType));
+ 		throw PSERROR_Serialize_InvalidScriptValue();
+ 	}
+ }
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 4ec05c7c70f32be20acafdea4f9efdf24fc99869 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:44 -0400
Subject: [PATCH 05/27] 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 79d48cd1c559a44c07c008e6375648724d37faa9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:51 -0400
Subject: [PATCH 06/27] 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 650e9dc132d307..58ad9ccf03f625 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
 version=0.10.3
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled

From f94816305068db020bb6584954568f6f30f1def8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:54 -0400
Subject: [PATCH 07/27] 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 cf8793176d8b9a..d5c78cb8b8358d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
 version=1.1.3
-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 d891493c72f163b272a6ca85743abfbb5a690b0b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:28:58 -0400
Subject: [PATCH 08/27] 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 <nicolas.werner@hotmail.de>
+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 <thread>
+ 
+ #include "coeurl/request.hpp"
++#include "coeurl/errors.hpp"
+ 
+ namespace coeurl {
+ std::shared_ptr<spdlog::logger> 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 ed06e420141cb3e35e1c046a72e1a07fc1ce1401 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:01 -0400
Subject: [PATCH 09/27] 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 1aa6c4c00b3a035ce88b23625c7daf5b048ca607 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:04 -0400
Subject: [PATCH 10/27] 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 7bfded15b1412608e7582ccfd8155cfc8357b721 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:08 -0400
Subject: [PATCH 11/27] 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 17db237147e70697bf57edca262759af0ed36651 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:11 -0400
Subject: [PATCH 12/27] 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 da55f262777fcd..3411ca5dfbeae2 100644
--- a/srcpkgs/furnace/template
+++ b/srcpkgs/furnace/template
@@ -1,7 +1,7 @@
 # Template file for 'furnace'
 pkgname=furnace
 version=0.6.5
-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 96f78757d77b4e3d10d7bd2e1d9bedfcdfe1dc12 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:14 -0400
Subject: [PATCH 13/27] 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 c1ddfb643b31921abe9c8b856d586d02bd0021e8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:18 -0400
Subject: [PATCH 14/27] 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 5ed4e2d6fa0d589722bd29bb16f45c73ba720418 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:24 -0400
Subject: [PATCH 15/27] 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 e9b03509c08398..74d03063cfa329 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'justbuild'
 pkgname=justbuild
 version=1.3.1
-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 6e02330d1f5c0460a46435e57b0b55175be7b307 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 May 2024 18:29:28 -0400
Subject: [PATCH 16/27] kodi: rebuild for fmt-10

---
 srcpkgs/kodi/patches/cstdint.patch |  98 +++++++++++++++++++++++++++
 srcpkgs/kodi/patches/fmt-10.patch  | 104 +++++++++++++++++++++++++++++
 srcpkgs/kodi/template              |   2 +-
 3 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/kodi/patches/cstdint.patch
 create mode 100644 srcpkgs/kodi/patches/fmt-10.patch

diff --git a/srcpkgs/kodi/patches/cstdint.patch b/srcpkgs/kodi/patches/cstdint.patch
new file mode 100644
index 00000000000000..14874505f5adea
--- /dev/null
+++ b/srcpkgs/kodi/patches/cstdint.patch
@@ -0,0 +1,98 @@
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+index 3fae32c023..b30d1a615c 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.h
+@@ -12,6 +12,7 @@
+ #include <lcms2.h>
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ 
+ extern "C"
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+index 0342c5441a..264cf79cae 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
+@@ -12,6 +12,7 @@
+ #include "utils/EGLUtils.h"
+ #include "utils/log.h"
+ 
++#include <cstdint>
+ #include <drm_fourcc.h>
+ #include <va/va_drmcommon.h>
+ 
+diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+index 66d1bf0200..10d54f3d7a 100644
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ 
+ #if defined(HAS_GL)
+diff --git a/xbmc/pictures/Picture.h b/xbmc/pictures/Picture.h
+index 5495cabc53..3017628b32 100644
+--- a/xbmc/pictures/Picture.h
++++ b/xbmc/pictures/Picture.h
+@@ -11,6 +11,7 @@
+ #include "pictures/PictureScalingAlgorithm.h"
+ #include "utils/Job.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/xbmc/platform/Filesystem.h b/xbmc/platform/Filesystem.h
+index 3e6b7ec52b..732be9294c 100644
+--- a/xbmc/platform/Filesystem.h
++++ b/xbmc/platform/Filesystem.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <system_error>
+ namespace KODI
+diff --git a/xbmc/windowing/X11/GLContext.h b/xbmc/windowing/X11/GLContext.h
+index e3c68807b8..1082fb0236 100644
+--- a/xbmc/windowing/X11/GLContext.h
++++ b/xbmc/windowing/X11/GLContext.h
+@@ -8,6 +8,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include <X11/Xlib.h>
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
+index 6d07197bc7..3cace0954b 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
++++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "WinSystemWayland.h"
+ 
++#include <cstdint>
++
+ #include "Application.h"
+ #include "CompileInfo.h"
+ #include "Connection.h"
+diff --git a/xbmc/windowing/wayland/WinSystemWayland.h b/xbmc/windowing/wayland/WinSystemWayland.h
+index 9f93d4bd46..e7caf6c227 100644
+--- a/xbmc/windowing/wayland/WinSystemWayland.h
++++ b/xbmc/windowing/wayland/WinSystemWayland.h
+@@ -8,6 +8,8 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Connection.h"
+ #include "Output.h"
+ #include "Seat.h"
diff --git a/srcpkgs/kodi/patches/fmt-10.patch b/srcpkgs/kodi/patches/fmt-10.patch
new file mode 100644
index 00000000000000..f9c4c9e4860f8f
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-10.patch
@@ -0,0 +1,104 @@
+From 3a20f5b67ff32cc3663e0ccd72941e666e8756a4 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+Date: Tue, 27 Jun 2023 11:21:50 -0700
+Subject: [PATCH 1/4] CGUIWindowHome: use AnnouncementFlagToString when logging
+
+Signed-off-by: Lukas Rusak <lorusak@gmail.com>
+---
+ 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 e4b1aa8450fabfb41379953c8ccec0a512421531 Mon Sep 17 00:00:00 2001
+From: Lukas Rusak <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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 <lorusak@gmail.com>
+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 <lorusak@gmail.com>
+---
+ 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<typename T, typename Char>
++struct formatter<std::atomic<T>, Char> : formatter<T, Char>
++{
++};
++} // namespace fmt
+ #endif
+ 
+ class CLog : public ISettingsHandler, public ISettingCallback
+diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
+index 9039db4c2a..ee02b2917a 100644