$NetBSD: patch-2840,v 1.1 2023/08/07 10:05:20 adam Exp $ buildfix: support fmtlib 10 https://github.com/gerbera/gerbera/pull/2840 --- src/config/setup/config_setup_array.cc +++ src/config/setup/config_setup_array.cc @@ -137,11 +137,11 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o std::vector result; if (initArray) { if (!initArray(optValue, result, ConfigDefinition::mapConfigOption(nodeOption))) { - throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); + throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name()); } } else { if (!createOptionFromNode(optValue, result)) { - throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue); + throw_std_runtime_error("Invalid {} array value '{}'", xpath, optValue.name()); } } if (result.empty()) { @@ -150,7 +150,7 @@ std::vector ConfigArraySetup::getXmlContent(const pugi::xml_node& o result = defaultEntries; } if (notEmpty && result.empty()) { - throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue); + throw_std_runtime_error("Invalid array {} empty '{}'", xpath, optValue.name()); } return result; } --- src/config/setup/config_setup_autoscan.cc +++ src/config/setup/config_setup_autoscan.cc @@ -245,7 +245,7 @@ std::shared_ptr ConfigAutoscanSetup::newOption(const pugi::xml_nod { auto result = std::vector(); if (!createOptionFromNode(optValue, result)) { - throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} autoscan failed '{}'", xpath, optValue.name()); } optionValue = std::make_shared(result); return optionValue; --- src/config/setup/config_setup_client.cc +++ src/config/setup/config_setup_client.cc @@ -183,7 +183,7 @@ std::shared_ptr ConfigClientSetup::newOption(const pugi::xml_node& auto result = std::make_shared(); if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { - throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} client config failed '{}'", xpath, optValue.name()); } optionValue = std::make_shared(result); return optionValue; --- src/config/setup/config_setup_dictionary.cc +++ src/config/setup/config_setup_dictionary.cc @@ -163,11 +163,11 @@ std::map ConfigDictionarySetup::getXmlContent(const pu std::map result; if (initDict) { if (!initDict(optValue, result)) { - throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name()); } } else { if (!createOptionFromNode(optValue, result) && required) { - throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} dictionary failed '{}'", xpath, optValue.name()); } } if (result.empty()) { @@ -176,7 +176,7 @@ std::map ConfigDictionarySetup::getXmlContent(const pu result = defaultEntries; } if (notEmpty && result.empty()) { - throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue); + throw_std_runtime_error("Invalid dictionary {} empty '{}'", xpath, optValue.name()); } return result; } --- src/config/setup/config_setup_dynamic.cc +++ src/config/setup/config_setup_dynamic.cc @@ -192,7 +192,7 @@ std::shared_ptr ConfigDynamicContentSetup::newOption(const pugi::x auto result = std::make_shared(); if (!createOptionFromNode(optValue, result)) { - throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} DynamicContentList failed '{}'", xpath, optValue.name()); } optionValue = std::make_shared(result); return optionValue; --- src/config/setup/config_setup_transcoding.cc +++ src/config/setup/config_setup_transcoding.cc @@ -501,7 +501,7 @@ std::shared_ptr ConfigTranscodingSetup::newOption(const pugi::xml_ auto result = std::make_shared(); if (!createOptionFromNode(isEnabled ? optValue : pugi::xml_node(nullptr), result)) { - throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} transcoding failed '{}'", xpath, optValue.name()); } optionValue = std::make_shared(result); return optionValue; --- src/config/setup/config_setup_tweak.cc +++ src/config/setup/config_setup_tweak.cc @@ -257,7 +257,7 @@ std::shared_ptr ConfigDirectorySetup::newOption(const pugi::xml_no auto result = std::make_shared(); if (!createOptionFromNode(optValue, result)) { - throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} DirectoryConfigList failed '{}'", xpath, optValue.name()); } optionValue = std::make_shared(result); return optionValue; --- src/config/setup/config_setup_vector.cc +++ src/config/setup/config_setup_vector.cc @@ -181,7 +181,7 @@ std::vector>> ConfigVectorSetup: { std::vector>> result; if (!createOptionFromNode(optValue, result) && required) { - throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue); + throw_std_runtime_error("Init {} vector failed '{}'", xpath, optValue.name()); } if (result.empty()) { log_debug("{} assigning {} default values", xpath, defaultEntries.size()); @@ -189,7 +189,7 @@ std::vector>> ConfigVectorSetup: result = defaultEntries; } if (notEmpty && result.empty()) { - throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue); + throw_std_runtime_error("Invalid vector {} empty '{}'", xpath, optValue.name()); } return result; }