diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2025-06-17 11:41:41 +0200 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2025-06-17 11:42:19 +0200 |
| commit | 15734f35f92c2423614ae03e1a82c99e8379f3d0 (patch) | |
| tree | 83741b8388814cee29f3b6bb635f6b3f20bf7499 | |
| parent | sysutils/p5-Ubic: update to 1.60 (diff) | |
games/openmw: fix patch line terminators after 13a36f14c8a5
The files components/myguiplatform/myguiloglistener.[ch]pp are with DOS
line terminators, so the patch files will have a mix of CRLF and LF line
terminators. This got lost when applying the patch in the PR.
PR: 284814
| -rw-r--r-- | games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp | 18 | ||||
| -rw-r--r-- | games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp index 939b73380527..dcc078307c8d 100644 --- a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp +++ b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp @@ -1,11 +1,11 @@ --- components/myguiplatform/myguiloglistener.cpp.orig 2023-08-08 09:23:20 UTC +++ components/myguiplatform/myguiloglistener.cpp -@@ -25,7 +25,7 @@ namespace osgMyGUI - mStream.flush(); - } - -- void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line) -+ void CustomLogListener::log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line) - { - if (mStream.is_open()) - { +@@ -25,7 +25,7 @@ namespace osgMyGUI
+ mStream.flush();
+ }
+
+- void CustomLogListener::log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line)
++ void CustomLogListener::log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line)
+ {
+ if (mStream.is_open())
+ {
diff --git a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp index 635c624f0140..acf183aec108 100644 --- a/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp +++ b/games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp @@ -1,11 +1,11 @@ --- components/myguiplatform/myguiloglistener.hpp.orig 2023-08-08 09:23:20 UTC +++ components/myguiplatform/myguiloglistener.hpp -@@ -28,7 +28,7 @@ namespace osgMyGUI - void close() override; - void flush() override; - -- void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line) override; -+ void log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line) override; - - const std::string& getFileName() const { return mFileName; } - +@@ -28,7 +28,7 @@ namespace osgMyGUI
+ void close() override;
+ void flush() override;
+
+- void log(const std::string& _section, MyGUI::LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line) override;
++ void log(std::string_view _section, MyGUI::LogLevel _level, const struct tm* _time, std::string_view _message, std::string_view _file, int _line) override;
+
+ const std::string& getFileName() const { return mFileName; }
+
|