Control: tags -1 + patch

Please find the attached patch to fix the FTBFS issue.

Best,
Aron
Description: Include fmt/format.h for fmt::format
 fmt 12.2's fmt/core.h no longer includes fmt/format.h. Include the
 formatting header directly in each translation unit that calls fmt::format.
Bug-Debian: https://bugs.debian.org/1151526
Forwarded: no
Index: blockattack/source/code/DialogBox.cpp
===================================================================
--- blockattack.orig/source/code/DialogBox.cpp
+++ blockattack/source/code/DialogBox.cpp
@@ -28,7 +28,7 @@ http://www.blockattack.net
 #include "utf8.h"
 #include "MenuSystem.h"
 #include <unordered_map>
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include "sago/SagoLogicalResize.hpp"
 
 static void setButtonFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {
Index: blockattack/source/code/HelpAboutState.cpp
===================================================================
--- blockattack.orig/source/code/HelpAboutState.cpp
+++ blockattack/source/code/HelpAboutState.cpp
@@ -30,7 +30,7 @@ https://blockattack.net
 #include "sstream"
 #include "version.h"
 #include "sago/SagoMisc.hpp"
-#include "fmt/core.h"
+#include "fmt/format.h"
 
 
 template <class T>
Index: blockattack/source/code/ScoresDisplay.cpp
===================================================================
--- blockattack.orig/source/code/ScoresDisplay.cpp
+++ blockattack/source/code/ScoresDisplay.cpp
@@ -26,7 +26,7 @@ http://www.blockattack.net
 #include "common.h"
 #include "stats.h"
 #include "MenuSystem.h"
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 
 static void setButtonFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {
Index: blockattack/source/code/ShowFileState.cpp
===================================================================
--- blockattack.orig/source/code/ShowFileState.cpp
+++ blockattack/source/code/ShowFileState.cpp
@@ -22,7 +22,7 @@ https://blockattack.net
 #include "global.hpp"
 #include "common.h"
 #include "MenuSystem.h"
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 ShowFileState::ShowFileState() {
 	setHelp30FontThinOutline(&globalData.spriteHolder->GetDataHolder(), titleField, "");
Index: blockattack/source/code/highscore.cpp
===================================================================
--- blockattack.orig/source/code/highscore.cpp
+++ blockattack/source/code/highscore.cpp
@@ -28,7 +28,7 @@ https://blockattack.net
 #include "sago/SagoMisc.hpp"
 #include <algorithm>
 #include "common.h"
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 using json = nlohmann::json;
 
Index: blockattack/source/code/levelselect.cpp
===================================================================
--- blockattack.orig/source/code/levelselect.cpp
+++ blockattack/source/code/levelselect.cpp
@@ -28,7 +28,7 @@ https://blockattack.net
 #include "puzzlehandler.hpp"
 #include "stageclearhandler.hpp"
 #include "MenuSystem.h"
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 
 static bool bMouseUp;              //true if the mouse(1) is unpressed
Index: blockattack/source/code/main.cpp
===================================================================
--- blockattack.orig/source/code/main.cpp
+++ blockattack/source/code/main.cpp
@@ -30,7 +30,7 @@ https://blockattack.net
 #include "os.hpp"
 
 #include <string.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "version.h"
 
Index: blockattack/source/code/menudef.cpp
===================================================================
--- blockattack.orig/source/code/menudef.cpp
+++ blockattack/source/code/menudef.cpp
@@ -30,7 +30,7 @@ http://blockattack.net
 #include "HelpGamepadState.hpp"
 #include "HelpAboutState.hpp"
 #include "ShowFileState.hpp"
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include "menudef_themes.hpp"
 
 
Index: blockattack/source/code/menudef_themes.cpp
===================================================================
--- blockattack.orig/source/code/menudef_themes.cpp
+++ blockattack/source/code/menudef_themes.cpp
@@ -24,7 +24,7 @@ http://blockattack.net
 #include "menudef_themes.hpp"
 #include "MenuSystem.h"
 #include "BlockGameSdl.hpp"
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 static void switchTheme() {
 	globalData.theme = ThemesGetNext();
Index: blockattack/source/code/puzzle_editor/PuzzleEditorState.cpp
===================================================================
--- blockattack.orig/source/code/puzzle_editor/PuzzleEditorState.cpp
+++ blockattack/source/code/puzzle_editor/PuzzleEditorState.cpp
@@ -24,7 +24,7 @@ https://blockattack.net
 #include "PuzzleEditorState.hpp"
 
 #include <unistd.h>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "imgui.h"
 #include "imgui_internal.h"
Index: blockattack/source/code/puzzlehandler.cpp
===================================================================
--- blockattack.orig/source/code/puzzlehandler.cpp
+++ blockattack/source/code/puzzlehandler.cpp
@@ -28,7 +28,7 @@ http://blockattack.net
 #include <sstream>
 #include "stats.h"
 #include <physfs.h>         //Abstract file system. To use containers
-#include <fmt/core.h>
+#include <fmt/format.h>
 #include "sago/SagoMisc.hpp"
 
 using json = nlohmann::json;
Index: blockattack/source/code/themes.cpp
===================================================================
--- blockattack.orig/source/code/themes.cpp
+++ blockattack/source/code/themes.cpp
@@ -31,7 +31,7 @@ https://www.blockattack.net
 #include <iostream>
 #include "global.hpp"
 #include <boost/algorithm/string/predicate.hpp>
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 using json = nlohmann::json;
 

Reply via email to