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

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

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

diff --git a/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
new file mode 100644
index 0000000..eb49eba
--- /dev/null
+++ b/games/multimc/files/patch-launcher_minecraft_launch_ExtractNatives.cpp
@@ -0,0 +1,17 @@
+--- launcher/minecraft/launch/ExtractNatives.cpp.orig	2021-09-08 22:27:46 UTC
++++ launcher/minecraft/launch/ExtractNatives.cpp
+@@ -23,6 +23,14 @@
+ #include "FileSystem.h"
+ #include <QDir>
+ 
++//C library defines interfere with Java version check
++#ifdef major
++    #undef major
++#endif
++#ifdef minor
++    #undef minor
++#endif
++
+ static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement)
+ {
+     if (!target.endsWith(suffix))
-- 
cgit v1.2.3-56-ge451