From 0e19d4a800ec9cf72812fe64af2db0594471d6cb Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Mon, 21 Nov 2022 18:11:29 -0500 Subject: [PATCH] remove unnecessary patches for ARM platforms - switch to using mojang's hosted jarfiles (when identical) - remove patching text2speech on linux arm systems (unnecessary) Signed-off-by: theofficialgman <28281419+theofficialgman@users.noreply.github.com> --- static/mojang/library-patches.json | 36 +++++------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/static/mojang/library-patches.json b/static/mojang/library-patches.json index 71f12d6..e8fd2a6 100644 --- a/static/mojang/library-patches.json +++ b/static/mojang/library-patches.json @@ -109,7 +109,7 @@ } }, { - "_comment": "Use a newer version on osx-arm64, linux-arm64, and linux-arm32", + "_comment": "Use a newer version on osx-arm64", "match": [ "com.mojang:text2speech:1.0.10", "com.mojang:text2speech:1.5", @@ -131,18 +131,6 @@ "os": { "name": "osx-arm64" } - }, - { - "action": "disallow", - "os": { - "name": "linux-arm64" - } - }, - { - "action": "disallow", - "os": { - "name": "linux-arm32" - } } ] }, @@ -162,18 +150,6 @@ "os": { "name": "osx-arm64" } - }, - { - "action": "allow", - "os": { - "name": "linux-arm64" - } - }, - { - "action": "allow", - "os": { - "name": "linux-arm32" - } } ] } @@ -182,7 +158,6 @@ { "_comment": "Use a newer version on osx-arm64, linux-arm64, and linux-arm32", "match": [ - "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209", "org.lwjgl.lwjgl:lwjgl:2.9.3", "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131120", "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017", @@ -220,10 +195,10 @@ "artifact": { "sha1": "697517568c68e78ae0b4544145af031c81082dfe", "size": 1047168, - "url": "https://github.com/theofficialgman/lwjgl3-binaries-arm64/raw/lwjgl-2.9.4/lwjgl-2.9.4-nightly-20150209.jar" + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar" } }, - "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209-gman64.1", + "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209", "rules": [ { "action": "allow", @@ -250,7 +225,6 @@ { "_comment": "Use a newer version on osx-arm64, linux-arm64, and linux-arm32", "match": [ - "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209", "org.lwjgl.lwjgl:lwjgl_util:2.9.3", "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131120", "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017", @@ -288,10 +262,10 @@ "artifact": { "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0", "size": 173887, - "url": "https://github.com/theofficialgman/lwjgl3-binaries-arm64/raw/lwjgl-2.9.4/lwjgl_util-2.9.4-nightly-20150209.jar" + "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar" } }, - "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209-gman64.1", + "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209", "rules": [ { "action": "allow",