From 0678403d9c7218138c2bc5cbf1bd92cc4d450adc Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Wed, 29 Sep 2021 15:29:03 -0400 Subject: Bunch of fixes --- .../files/patch-launcher_DesktopServices.cpp | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 games/multimc/files/patch-launcher_DesktopServices.cpp (limited to 'games/multimc/files/patch-launcher_DesktopServices.cpp') diff --git a/games/multimc/files/patch-launcher_DesktopServices.cpp b/games/multimc/files/patch-launcher_DesktopServices.cpp new file mode 100644 index 0000000..0bc36b6 --- /dev/null +++ b/games/multimc/files/patch-launcher_DesktopServices.cpp @@ -0,0 +1,56 @@ +--- launcher/DesktopServices.cpp.orig 2021-09-08 22:27:46 UTC ++++ launcher/DesktopServices.cpp +@@ -7,7 +7,7 @@ + /** + * This shouldn't exist, but until QTBUG-9328 and other unreported bugs are fixed, it needs to be a thing. + */ +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + + #include + #include +@@ -83,7 +83,7 @@ bool openDirectory(const QString &path, bool ensureExi + { + return QDesktopServices::openUrl(QUrl::fromLocalFile(dir.absolutePath())); + }; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + return IndirectOpen(f); + #else + return f(); +@@ -97,7 +97,7 @@ bool openFile(const QString &path) + { + return QDesktopServices::openUrl(QUrl::fromLocalFile(path)); + }; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + return IndirectOpen(f); + #else + return f(); +@@ -107,7 +107,7 @@ bool openFile(const QString &path) + bool openFile(const QString &application, const QString &path, const QString &workingDirectory, qint64 *pid) + { + qDebug() << "Opening file" << path << "using" << application; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave + return IndirectOpen([&]() + { +@@ -121,7 +121,7 @@ bool openFile(const QString &application, const QStrin + bool run(const QString &application, const QStringList &args, const QString &workingDirectory, qint64 *pid) + { + qDebug() << "Running" << application << "with args" << args.join(' '); +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + // FIXME: the pid here is fake. So if something depends on it, it will likely misbehave + return IndirectOpen([&]() + { +@@ -139,7 +139,7 @@ bool openUrl(const QUrl &url) + { + return QDesktopServices::openUrl(url); + }; +-#if defined(Q_OS_LINUX) ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + return IndirectOpen(f); + #else + return f(); -- cgit v1.2.3-56-ge451