From 0678403d9c7218138c2bc5cbf1bd92cc4d450adc Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Wed, 29 Sep 2021 15:29:03 -0400
Subject: Bunch of fixes

---
 .../files/patch-launcher_java_JavaUtils.cpp        | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 games/multimc/files/patch-launcher_java_JavaUtils.cpp

(limited to 'games/multimc/files/patch-launcher_java_JavaUtils.cpp')

diff --git a/games/multimc/files/patch-launcher_java_JavaUtils.cpp b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
new file mode 100644
index 0000000..156841e
--- /dev/null
+++ b/games/multimc/files/patch-launcher_java_JavaUtils.cpp
@@ -0,0 +1,38 @@
+--- launcher/java/JavaUtils.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/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
-- 
cgit v1.2.3