summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2025-04-16 04:38:14 -0700
committerGitHub <noreply@github.com>2025-04-16 04:38:14 -0700
commitb4cddae1296d5b2664cad7f42533542c746ae674 (patch)
tree9b1fe757c3d3fdd1bb31bd3b086a6ec22d99da76 /meta
parentffad31ee784125846e86c6db381fb043265aee37 (diff)
parent44fb68430174f1db81332fef1c8abb507201654e (diff)
downloadProject-Tick-b4cddae1296d5b2664cad7f42533542c746ae674.tar.gz
Project-Tick-b4cddae1296d5b2664cad7f42533542c746ae674.zip
Merge pull request #81 from kthchew/fix/jna-crash
Update JNA 5.* to at least 5.13.0 to fix faulty assertion crash on macOS
Diffstat (limited to 'meta')
-rw-r--r--meta/common/mojang-library-patches.json110
1 files changed, 110 insertions, 0 deletions
diff --git a/meta/common/mojang-library-patches.json b/meta/common/mojang-library-patches.json
index 74d4d26c4b..3370a6f894 100644
--- a/meta/common/mojang-library-patches.json
+++ b/meta/common/mojang-library-patches.json
@@ -2875,5 +2875,115 @@
},
"name": "org.lwjgl:lwjgl-glfw-natives-linux:3.3.2-lwjgl.1"
}
+ },
+ {
+ "_comment": "Use newer JNA on macOS to prevent crashes due to faulty assertion",
+ "match": [
+ "net.java.dev.jna:jna:5.6.0",
+ "net.java.dev.jna:jna:5.8.0",
+ "net.java.dev.jna:jna:5.9.0",
+ "net.java.dev.jna:jna:5.10.0",
+ "net.java.dev.jna:jna:5.12.1"
+ ],
+ "override": {
+ "rules": [
+ {
+ "action": "allow"
+ },
+ {
+ "action": "disallow",
+ "os": {
+ "name": "osx"
+ }
+ },
+ {
+ "action": "disallow",
+ "os": {
+ "name": "osx-arm64"
+ }
+ }
+ ]
+ },
+ "additionalLibraries": [
+ {
+ "downloads": {
+ "artifact": {
+ "sha1": "1200e7ebeedbe0d10062093f32925a912020e747",
+ "size": 1879325,
+ "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar"
+ }
+ },
+ "name": "net.java.dev.jna:jna:5.13.0",
+ "rules": [
+ {
+ "action": "allow",
+ "os": {
+ "name": "osx"
+ }
+ },
+ {
+ "action": "allow",
+ "os": {
+ "name": "osx-arm64"
+ }
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "_comment": "Use newer JNA on macOS to prevent crashes due to faulty assertion",
+ "match": [
+ "net.java.dev.jna:jna-platform:5.6.0",
+ "net.java.dev.jna:jna-platform:5.8.0",
+ "net.java.dev.jna:jna-platform:5.9.0",
+ "net.java.dev.jna:jna-platform:5.10.0",
+ "net.java.dev.jna:jna-platform:5.12.1"
+ ],
+ "override": {
+ "rules": [
+ {
+ "action": "allow"
+ },
+ {
+ "action": "disallow",
+ "os": {
+ "name": "osx"
+ }
+ },
+ {
+ "action": "disallow",
+ "os": {
+ "name": "osx-arm64"
+ }
+ }
+ ]
+ },
+ "additionalLibraries": [
+ {
+ "downloads": {
+ "artifact": {
+ "sha1": "88e9a306715e9379f3122415ef4ae759a352640d",
+ "size": 1363209,
+ "url": "https://libraries.minecraft.net/net/java/dev/jna/jna-platform/5.13.0/jna-platform-5.13.0.jar"
+ }
+ },
+ "name": "net.java.dev.jna:jna-platform:5.13.0",
+ "rules": [
+ {
+ "action": "allow",
+ "os": {
+ "name": "osx"
+ }
+ },
+ {
+ "action": "allow",
+ "os": {
+ "name": "osx-arm64"
+ }
+ }
+ ]
+ }
+ ]
}
]