bump(main/fmt): 11.0.2 + revbump revdeps

packages/aapt/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 _TAG_VERSION=13.0.0
 _TAG_REVISION=6
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=15
+TERMUX_PKG_REVISION=16
 TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/frameworks/base
                    https://android.googlesource.com/platform/system/core
                    https://android.googlesource.com/platform/system/libbase
@@ -25,8 +25,8 @@ TERMUX_PKG_SHA256=(SKIP_CHECKSUM
                    SKIP_CHECKSUM)
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_DEPENDS="libc++, libexpat, libpng, libzopfli, zlib"
-TERMUX_PKG_BUILD_DEPENDS="fmt, googletest"
+TERMUX_PKG_DEPENDS="fmt, libc++, libexpat, libpng, libzopfli, zlib"
+TERMUX_PKG_BUILD_DEPENDS="googletest"
 
 termux_step_post_get_source() {
 	# FIXME: We would like to enable checksums when downloading

packages/fmt/build.sh

@@ -1,12 +1,24 @@
 TERMUX_PKG_HOMEPAGE=https://fmt.dev/latest/index.html
 TERMUX_PKG_DESCRIPTION="Open-source formatting library for C++"
 TERMUX_PKG_LICENSE="BSD"
-TERMUX_PKG_LICENSE_FILE="LICENSE.rst"
+TERMUX_PKG_LICENSE_FILE="LICENSE"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1:9.1.0
+TERMUX_PKG_VERSION=1:11.0.2
 TERMUX_PKG_SRCURL=https://github.com/fmtlib/fmt/archive/${TERMUX_PKG_VERSION#*:}.tar.gz
-TERMUX_PKG_SHA256=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
+TERMUX_PKG_SHA256=6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
 # Avoid silently breaking build of revdeps:
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DFMT_TEST=OFF"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DFMT_TEST=OFF -DBUILD_SHARED_LIBS=TRUE"
 TERMUX_PKG_NO_STATICSPLIT=true
+
+termux_step_post_massage() {
+	# Do not forget to bump revision of reverse dependencies and rebuild them
+	# after SONAME is changed.
+	local _EXPECTED_SOVERSION=11
+	local _FMT_VERSION=$(grep '#define FMT_VERSION' $TERMUX_PKG_SRCDIR/include/fmt/base.h  | cut -d ' ' -f 3)
+	# The fmt library version in the form major * 10000 + minor * 100 + patch:
+	local _ACTUAL_SOVERSION=$(( _FMT_VERSION / 10000 ))
+	if [ "$_EXPECTED_SOVERSION" != "$_ACTUAL_SOVERSION" ]; then
+		termux_error_exit "SONAME changed: expected=$_EXPECTED_SOVERSION, actual=$_ACTUAL_SOVERSION"
+	fi
+}

packages/libdart/build.sh

@@ -4,6 +4,7 @@ TERMUX_PKG_GROUPS="science"
 TERMUX_PKG_LICENSE="BSD 2-Clause"
 TERMUX_PKG_MAINTAINER="Pooya Moradi <[email protected]>"
 TERMUX_PKG_VERSION="6.14.5"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/dartsim/dart/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=eb89cc01f4f48c399b055d462d8ecd2a3f846f825a35ffc67f259186b362e136
 TERMUX_PKG_AUTO_UPDATE=true

packages/libspdlog/build.sh

@@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Very fast, header-only/compiled, C++ logging library"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.14.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/gabime/spdlog/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="libc++"
-TERMUX_PKG_BUILD_DEPENDS="fmt"
+TERMUX_PKG_DEPENDS="libc++, fmt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DSPDLOG_BUILD_SHARED=ON
+-DSPDLOG_BUILD_EXAMPLE=OFF
 -DSPDLOG_FMT_EXTERNAL=ON
 "

packages/libtiledb/build.sh

@@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="A powerful engine for storing and accessing dense and sp
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.26.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/TileDB-Inc/TileDB/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f90461850c6f87f63fe77788d7932fd53a4d1de7e2ba7263f5e8f2fd1df23e38
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="ca-certificates, file, libbz2, libc++, liblz4, libspdlog, openssl, zlib, zstd"
-TERMUX_PKG_BUILD_DEPENDS="clipp, fmt"
+TERMUX_PKG_DEPENDS="ca-certificates, file, fmt, libbz2, libc++, liblz4, libspdlog, openssl, zlib, zstd"
+TERMUX_PKG_BUILD_DEPENDS="clipp"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCOMPILER_SUPPORTS_AVX2=OFF
 -DTILEDB_DISABLE_AUTO_VCPKG=ON

packages/mpd/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.23.15"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=d2865d8f8ea79aa509b1465b99a2b8f3f449fe894521c97feadc2dca85a6ecd2
 TERMUX_PKG_AUTO_UPDATE=true

packages/mpd/fmt-11.patch

@@ -0,0 +1,102 @@
+From e380ae90ebb6325d1820b6f34e10bf3474710899 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <[email protected]>
+Date: Sun, 7 Jul 2024 10:09:08 +0200
+Subject: [PATCH] Log: add missing include for std::back_inserter()
+
+Closes https://github.com/MusicPlayerDaemon/MPD/issues/2071
+---
+ src/Log.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Log.cxx b/src/Log.cxx
+index d5a3db2aa6..78e0efb54a 100644
+--- a/src/Log.cxx
++++ b/src/Log.cxx
+@@ -8,6 +8,8 @@
+
+ #include <fmt/format.h>
+
++#include <iterator> // for std::back_inserter()
++
+ static constexpr Domain exception_domain("exception");
+
+ void
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <[email protected]>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <[email protected]>
+---
+ src/lib/ffmpeg/LibFmt.hxx            | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx   | 2 +-
+ src/lib/fmt/PathFormatter.hxx        | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ 	template<typename FormatContext>
+-	auto format(const AVSampleFormat format, FormatContext &ctx) {
++	auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ 		const char *name = av_get_sample_fmt_name(format);
+ 		if (name == nullptr)
+ 			name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ 	template<typename FormatContext>
+-	auto format(const SampleFormat format, FormatContext &ctx) {
++	auto format(const SampleFormat format, FormatContext &ctx) const {
+ 		return formatter<string_view>::format(sample_format_to_string(format),
+ 						      ctx);
+ 	}
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ 	template<typename FormatContext>
+-	auto format(const AudioFormat &af, FormatContext &ctx) {
++	auto format(const AudioFormat &af, FormatContext &ctx) const {
+ 		return formatter<string_view>::format(ToString(af).c_str(),
+ 						      ctx);
+ 	}
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ 	template<typename FormatContext>
+-	auto format(std::exception_ptr e, FormatContext &ctx) {
++	auto format(std::exception_ptr e, FormatContext &ctx) const {
+ 		return formatter<string_view>::format(GetFullMessage(e), ctx);
+ 	}
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<T> : formatter<string_view>
+ {
+ 	template<typename FormatContext>
+-	auto format(Path path, FormatContext &ctx) {
++	auto format(Path path, FormatContext &ctx) const {
+ 		return formatter<string_view>::format(path.ToUTF8(), ctx);
+ 	}
+ };

packages/poac/build.sh

@@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="A package manager and build system for C++"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.10.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/poac-dev/poac/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=4be4f9d80ee1b4b2dd489bc335d59b50d945ad2bff9458eba66b230247f5c8a6
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_BUILD_DEPENDS="fmt, nlohmann-json"
-TERMUX_PKG_DEPENDS="libc++, libcurl, libgit2, libtbb"
+TERMUX_PKG_BUILD_DEPENDS="nlohmann-json"
+TERMUX_PKG_DEPENDS="fmt, libc++, libcurl, libgit2, libtbb"
 TERMUX_PKG_SUGGESTS="clang, make, pkg-config"
 TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686"
 

packages/sysprop/build.sh

@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 _TAG_VERSION=13.0.0
 _TAG_REVISION=15
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/system/tools/sysprop
                    https://android.googlesource.com/platform/system/core
                    https://android.googlesource.com/platform/system/libbase)
@@ -16,8 +16,7 @@ TERMUX_PKG_SHA256=(SKIP_CHECKSUM
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 # aapt is for libandroid-base.so
-TERMUX_PKG_DEPENDS="aapt, libc++, libprotobuf"
-TERMUX_PKG_BUILD_DEPENDS="fmt"
+TERMUX_PKG_DEPENDS="aapt, fmt, libc++, libprotobuf"
 
 termux_step_post_get_source() {
 	# FIXME: We would like to enable checksums when downloading

x11-packages/cherrytree/build.sh

@@ -3,11 +3,12 @@ TERMUX_PKG_DESCRIPTION="A hierarchical note taking application"
 TERMUX_PKG_LICENSE="GPL-3.0, LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.1.4"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/giuspen/cherrytree/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4440dd39fdd637b82cf3abac82389fe30f4da81a79f5d61ffcdd64748b24465b
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="fribidi, glib, gspell, gtk3, gtkmm3, gtksourceview3, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libcurl, libglibmm-2.4, libgtksourceviewmm-3.0, libpangomm-1.4, libsigc++-2.0, libsqlite, libuchardet, libvte, libxml++-2.6, libxml2, pango"
-TERMUX_PKG_BUILD_DEPENDS="fmt, libspdlog"
+TERMUX_PKG_DEPENDS="fmt, fribidi, glib, gspell, gtk3, gtkmm3, gtksourceview3, libatkmm-1.6, libc++, libcairo, libcairomm-1.0, libcurl, libglibmm-2.4, libgtksourceviewmm-3.0, libpangomm-1.4, libsigc++-2.0, libsqlite, libuchardet, libvte, libxml++-2.6, libxml2, pango"
+TERMUX_PKG_BUILD_DEPENDS="libspdlog"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_TESTING=OFF
 -DUSE_NLS=OFF