You've already forked AstralRinth
forked from didirus/AstralRinth
fix(daedalus-client): backport new Mojang MC version library patches from PrismLauncher (#4493)
While researching and fixing other issue, it caught my attention that we are embedding a library patches JSON file from the PrismLauncher meta repository. However, since we copied that file, a new revision of it was published with patches that improve compatibility with Apple Silicon macOS platforms. These changes update such a file and, perhaps most importantly, add a comment explaining the provenance and licensing of such a file.
This commit is contained in:
committed by
GitHub
parent
5db5bf4c4c
commit
e719ae2f42
@@ -2762,10 +2762,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"_comment": "Replace glfw from 3.3.1 with version from 3.3.2 to prevent stack smashing",
|
"_comment": "Replace glfw from 3.3.1 with version from 3.3.2 to prevent stack smashing",
|
||||||
"match": [
|
"match": ["org.lwjgl:lwjgl-glfw-natives-linux:3.3.1"],
|
||||||
"org.lwjgl:lwjgl-glfw-natives-linux:3.3.1",
|
|
||||||
"org.lwjgl:lwjgl-glfw:3.3.1:natives-linux"
|
|
||||||
],
|
|
||||||
"override": {
|
"override": {
|
||||||
"downloads": {
|
"downloads": {
|
||||||
"artifact": {
|
"artifact": {
|
||||||
@@ -2776,5 +2773,115 @@
|
|||||||
},
|
},
|
||||||
"name": "org.lwjgl:lwjgl-glfw-natives-linux:3.3.2-lwjgl.1"
|
"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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -186,6 +186,8 @@ pub struct LibraryPatch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn fetch_library_patches() -> Result<Vec<LibraryPatch>, Error> {
|
fn fetch_library_patches() -> Result<Vec<LibraryPatch>, Error> {
|
||||||
|
// The file below is a copy of https://github.com/PrismLauncher/meta/blob/main/meta/common/mojang-library-patches.json.
|
||||||
|
// That file belongs to a repository licensed under the Microsoft Public License (Ms-PL)
|
||||||
let patches = include_bytes!("../library-patches.json");
|
let patches = include_bytes!("../library-patches.json");
|
||||||
Ok(serde_json::from_slice(patches)?)
|
Ok(serde_json::from_slice(patches)?)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user