From 06d0390e79161e5da815159cf20237b018278850 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 29 May 2024 17:33:11 +0200
Subject: [PATCH] fix: add new LWJGL variant

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 meta/common/mojang-library-patches.json | 15 +++++++++++++++
 meta/run/generate_mojang.py             |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/meta/common/mojang-library-patches.json b/meta/common/mojang-library-patches.json
index 74d4d26..7ea3be2 100644
--- a/meta/common/mojang-library-patches.json
+++ b/meta/common/mojang-library-patches.json
@@ -2875,5 +2875,20 @@
       },
       "name": "org.lwjgl:lwjgl-glfw-natives-linux:3.3.2-lwjgl.1"
     }
+  },
+  {
+    "match": [
+      "org.lwjgl:lwjgl-freetype-natives-macos-patch:3.3.3"
+    ],
+    "override": {
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "osx"
+          }
+        }
+      ]
+    }
   }
 ]
diff --git a/meta/run/generate_mojang.py b/meta/run/generate_mojang.py
index e0068c2..9631a6c 100755
--- a/meta/run/generate_mojang.py
+++ b/meta/run/generate_mojang.py
@@ -90,8 +90,7 @@ LOG4J_HASHES = {
 # We want versions that contain natives for all platforms. If there are multiple, pick the latest one
 # LWJGL versions we want
 PASS_VARIANTS = [
-    # TODO: needs arm64 for Linux?
-    "8a9b08f11271eb4de3b50e5d069949500b2c7bc1",  # 3.3.3 (2024-04-03 11:49:39+00:00)
+    "6f32ef730d05562ede7db0b845b72ea16dd239d5",  # 3.3.3 (2024-05-29 12:04:43+00:00)
     "765b4ab443051d286bdbb1c19cd7dc86b0792dce",  # 3.3.2 (2024-01-17 13:19:20+00:00)
     "54c4fb1d6a96ac3007c947bf310c8bcf94a862be",  # 3.3.1 (2023-04-20 11:55:19+00:00) split natives, with WoA natives
     "ea4973ebc9eadf059f30f0958c89f330898bff51",  # 3.2.2 (2019-07-04 14:41:05+00:00) will be patched, missing tinyfd
@@ -107,6 +106,7 @@ PASS_VARIANTS = [
 
 # LWJGL versions we def. don't want!
 BAD_VARIANTS = [
+    "8a9b08f11271eb4de3b50e5d069949500b2c7bc1",  # 3.3.3 (2024-04-03 11:49:39+00:00) seems to have a broken libfreetype for macOS x86_64
     "79bde9e46e9ad9accebda11e8293ed08d80dbdc3",  # 3.3.2 (2023-08-30 11:24:35+00:00) does not have lwjgl-freetype
     "8836c419f90f69a278b97d945a34af165c24ff60",  # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, with workaround, replaced by 23w26a
     "3c624b94c06dbc4abae08fe6156d74abe4a2cca5",  # 3.3.1 (2022-05-04 14:41:35+00:00) we already have a nice 3.3.1