qiurui
/
freebsd-ports
mirror of https://git.FreeBSD.org/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

games/openmw: fix patch line terminators after 13a36f14c8 

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
This commit is contained in:
Dimitry Andric 2025-06-17 11:41:41 +02:00
parent 938c8d60ba
commit 15734f35f9
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
games/openmw/files/patch-components_myguiplatform_myguiloglistener.cpp
View File

@ -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())
{

18
games/openmw/files/patch-components_myguiplatform_myguiloglistener.hpp
View File

@ -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; }