From 7a0bfbd3a880fccfe786a8d3e8117dcf25ab921b Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Wed, 25 Jun 2025 00:54:14 +0800 Subject: [PATCH] kate*: undefine HAVE_FDATASYNC on Apple --- kate/part/buffer/katetextbuffer.cpp | 4 ++++ kate/part/swapfile/kateswapfile.cpp | 4 ++++ kate/src/app/katesession.cpp | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/kate/part/buffer/katetextbuffer.cpp b/kate/part/buffer/katetextbuffer.cpp index 0fbd8a2b..113578ad 100644 --- a/kate/part/buffer/katetextbuffer.cpp +++ b/kate/part/buffer/katetextbuffer.cpp @@ -34,6 +34,10 @@ #include #include +#ifdef __APPLE__ +#undef HAVE_FDATASYNC +#endif + #if 0 #define EDIT_DEBUG kDebug() #else diff --git a/kate/part/swapfile/kateswapfile.cpp b/kate/part/swapfile/kateswapfile.cpp index bd7439d1..3aec08d2 100644 --- a/kate/part/swapfile/kateswapfile.cpp +++ b/kate/part/swapfile/kateswapfile.cpp @@ -37,6 +37,10 @@ #include #include +#ifdef __APPLE__ +#undef HAVE_FDATASYNC +#endif + // swap file version header const static char * const swapFileVersionString = "Kate Swap File 2.0"; diff --git a/kate/src/app/katesession.cpp b/kate/src/app/katesession.cpp index 971d9588..d38238a9 100644 --- a/kate/src/app/katesession.cpp +++ b/kate/src/app/katesession.cpp @@ -53,12 +53,16 @@ #include #include +#ifdef __APPLE__ +#undef HAVE_FDATASYNC +#endif + bool katesessions_compare_sessions_ptr(const KateSession::Ptr &s1, const KateSession::Ptr &s2) { return KStringHandler::naturalCompare(s1->sessionName(),s2->sessionName())==-1; } -//BEGIN KateSession +// BEGIN KateSession KateSession::KateSession (KateSessionManager *manager, const QString &fileName) : m_sessionFileRel (fileName) @@ -68,7 +72,7 @@ KateSession::KateSession (KateSessionManager *manager, const QString &fileName) , m_writeConfig (0) { m_sessionName = QUrl::fromPercentEncoding(QFile::encodeName(fileName)); - m_sessionName.chop(12);//.katesession==12 + m_sessionName.chop(12); //.katesession==12 init (); }