update toxcore to current master

fix autoaccept build
update subs
2026-01-11 14:32:40 +01:00 · 2026-01-10 17:21:00 +01:00
5 changed files with 14 additions and 9 deletions
--- a/external/solanaceae_ngc_ft1
+++ b/external/solanaceae_ngc_ft1
--- a/external/solanaceae_util
+++ b/external/solanaceae_util
--- a/external/toxcore/CMakeLists.txt
+++ b/external/toxcore/CMakeLists.txt
@@ -53,16 +53,21 @@ configure_file(
 	${CMAKE_CURRENT_BINARY_DIR}/include/tox/tox_private.h
 	@ONLY
 )
+configure_file(
+	./c-toxcore/toxcore/attributes.h # for tox_private.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/attributes.h
+	@ONLY
+)
 configure_file(
 	./c-toxcore/toxencryptsave/toxencryptsave.h
 	${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxencryptsave.h
 	@ONLY
 )
-#configure_file(
-#    ./c-toxcore/toxav/toxav.h
-#    ${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxav.h
-#    @ONLY
-#)
+configure_file(
+	./c-toxcore/toxav/toxav.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/tox/toxav.h
+	@ONLY
+)

 target_include_directories(toxcore INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include/)

--- a/external/toxcore/c-toxcore
+++ b/external/toxcore/c-toxcore
--- a/plugins/transfer_auto_accept.cpp
+++ b/plugins/transfer_auto_accept.cpp
@@ -78,7 +78,7 @@ void TransferAutoAccept::checkObj(ObjectHandle o) {
 		return;
 	}

-	const auto save_dir_path = _conf.get_string("TransferAutoAccept", "save_path").value_or("tmp_save_dir");
+	const std::string save_dir_path = _conf.get_string("TransferAutoAccept", "save_path").value_or("tmp_save_dir");
 	uint64_t total_size {0u};
 	if (const auto* si = o.try_get<ObjComp::F::SingleInfo>(); si != nullptr) {
 		if (si->file_name.empty()) {
Author	SHA1	Message	Date
Green Sky	df759bc426	update toxcore to current master Some checks failed ContinuousDelivery / linux-ubuntu (push) Has been cancelled Details ContinuousDelivery / linux-debian12 (push) Has been cancelled Details ContinuousDelivery / windows (windows-2022, ) (push) Has been cancelled Details ContinuousDelivery / windows (windows-2022, asan) (push) Has been cancelled Details ContinuousIntegration / linux-ubuntu-latest (push) Has been cancelled Details ContinuousIntegration / linux-debian12 (push) Has been cancelled Details ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled Details ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled Details ContinuousIntegration / macos-latest (push) Has been cancelled Details ContinuousIntegration / windows-latest (push) Has been cancelled Details ContinuousDelivery / release (push) Has been cancelled Details	2026-01-11 14:32:40 +01:00
Green Sky	d0dc242b13	fix autoaccept build Some checks failed ContinuousDelivery / linux-ubuntu (push) Has been cancelled Details ContinuousDelivery / linux-debian12 (push) Has been cancelled Details ContinuousDelivery / windows (windows-2022, ) (push) Has been cancelled Details ContinuousDelivery / windows (windows-2022, asan) (push) Has been cancelled Details ContinuousDelivery / release (push) Has been cancelled Details ContinuousIntegration / linux-ubuntu-latest (push) Has been cancelled Details ContinuousIntegration / linux-debian12 (push) Has been cancelled Details ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled Details ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled Details ContinuousIntegration / macos-latest (push) Has been cancelled Details ContinuousIntegration / windows-latest (push) Has been cancelled Details update subs	2026-01-10 17:21:00 +01:00