diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /x11/oscar/files/patch-SleepLib_common.cpp | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'x11/oscar/files/patch-SleepLib_common.cpp')
| -rw-r--r-- | x11/oscar/files/patch-SleepLib_common.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/oscar/files/patch-SleepLib_common.cpp b/x11/oscar/files/patch-SleepLib_common.cpp index fb5de5c17145..3a6e7aec67e1 100644 --- a/x11/oscar/files/patch-SleepLib_common.cpp +++ b/x11/oscar/files/patch-SleepLib_common.cpp @@ -1,10 +1,10 @@ ---- SleepLib/common.cpp -+++ SleepLib/common.cpp -@@ -248,7 +248,7 @@ QString appResourcePath() - // This one will be used if the Html and Translations folders +--- SleepLib/common.cpp 2025-07-20 16:34:44.000000000 +0200 ++++ SleepLib/common.cpp 2025-10-25 02:20:32.076356000 +0200 +@@ -285,7 +285,7 @@ + // This one will be used if the Html and Translations folders // are in the same folder as the OSCAR executable paths.append( QCoreApplication::applicationDirPath() ); --#ifdef Q_OS_LINUX +-#ifdef Q_OS_LINUX +#if defined (Q_OS_LINUX) || defined (Q_OS_FREEBSD) QString appName = QCoreApplication::applicationName(); if (appName != QString("OSCAR")) |