diff options
| author |   Cameron Katri <me@cameronkatri.com> | 2021-09-29 15:29:03 -0400 |
|---|---|---|
| committer | Cameron Katri <me@cameronkatri.com> | 2021-09-29 15:39:40 -0400 |
| commit | 0678403d9c7218138c2bc5cbf1bd92cc4d450adc (patch) | |
| tree | e0dbd058bc63ec028cd5ecca412759d410c36f82 /games/multimc/files/patch-launcher_java_JavaUtils.cpp | |
| parent | d2542bf926bbae3289282f0866f312104abcfb09 (diff) | |
| download | freebsd-ports-0678403d9c7218138c2bc5cbf1bd92cc4d450adc.tar.gz freebsd-ports-0678403d9c7218138c2bc5cbf1bd92cc4d450adc.tar.zst freebsd-ports-0678403d9c7218138c2bc5cbf1bd92cc4d450adc.zip | |
Bunch of fixes
Diffstat (limited to 'games/multimc/files/patch-launcher_java_JavaUtils.cpp')
| -rw-r--r-- | games/multimc/files/patch-launcher_java_JavaUtils.cpp | 38 |
1 files changed, 38 insertions, 0 deletions
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 |