summaryrefslogtreecommitdiffstats
path: root/games/multimc/files/patch-api_logic_java_JavaUtils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'games/multimc/files/patch-api_logic_java_JavaUtils.cpp')
-rw-r--r--games/multimc/files/patch-api_logic_java_JavaUtils.cpp38
1 files changed, 0 insertions, 38 deletions
diff --git a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp b/games/multimc/files/patch-api_logic_java_JavaUtils.cpp
deleted file mode 100644
index 4bad181..0000000
--- a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- api/logic/java/JavaUtils.cpp.orig 2021-07-16 14:03:58 UTC
-+++ api/logic/java/JavaUtils.cpp
-@@ -31,7 +31,7 @@ JavaUtils::JavaUtils()
- {
- }
-
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
- {
- QDir mmcBin(QCoreApplication::applicationDirPath());
-@@ -83,7 +83,7 @@ QProcessEnvironment CleanEnviroment()
- qDebug() << "Env: ignoring" << key << value;
- continue;
- }
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- // Do not pass LD_* variables to java. They were intended for MultiMC
- if(key.startsWith("LD_"))
- {
-@@ -112,7 +112,7 @@ QProcessEnvironment CleanEnviroment()
- // qDebug() << "Env: " << key << value;
- env.insert(key, value);
- }
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
- // HACK: Workaround for QTBUG42500
- if(!env.contains("LD_LIBRARY_PATH"))
- {
-@@ -142,6 +142,8 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
- javaVersion->arch = "unknown";
- #if defined(Q_OS_WIN32)
- javaVersion->path = "javaw";
-+#elif defined(Q_OS_FREEBSD)
-+ javaVersion->path = "multimc-minecraft-runtime";
- #else
- javaVersion->path = "java";
- #endif