From 0eb223609e5643c6aab644ef7e5773c77bb8d377 Mon Sep 17 00:00:00 2001 From: kxxt Date: Wed, 13 Sep 2023 06:53:05 +0800 Subject: [PATCH] upgpatch: element.io - Fix rotten patches. - app-builder upstream merged my patch. Let's use upstream repo. But master branch is buggy, so I pinned it to the last good commit. --- element.io/element-desktop-riscv64-support.patch | 12 ++++++------ element.io/riscv64.patch | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/element.io/element-desktop-riscv64-support.patch b/element.io/element-desktop-riscv64-support.patch index b2d886818..8a2ce7046 100644 --- a/element.io/element-desktop-riscv64-support.patch +++ b/element.io/element-desktop-riscv64-support.patch @@ -1,6 +1,6 @@ ---- scripts/hak/target.ts.orig 2023-08-13 08:44:26.292841975 -0400 -+++ scripts/hak/target.ts 2023-08-13 08:50:33.362395808 -0400 -@@ -33,13 +33,14 @@ +--- scripts/hak/target.ts.orig 2023-08-29 06:29:26.000000000 -0400 ++++ scripts/hak/target.ts 2023-09-12 05:04:27.070581234 -0400 +@@ -36,13 +36,14 @@ | "aarch64-unknown-linux-musl" | "aarch64-unknown-linux-gnu" | "powerpc64le-unknown-linux-musl" @@ -9,7 +9,7 @@ + | "riscv64gc-unknown-linux-gnu"; // Values are expected to match those used in `process.platform`. - export type Platform = "darwin" | "linux" | "win32"; + export type Platform = "darwin" | "freebsd" | "linux" | "win32"; // Values are expected to match those used in `process.arch`. -export type Arch = "arm64" | "ia32" | "x64" | "ppc64" | "universal"; @@ -17,7 +17,7 @@ // Values are expected to match those used by Visual Studio's `vcvarsall.bat`. // See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax -@@ -162,6 +163,12 @@ +@@ -183,6 +184,12 @@ libC: MUSL, }; @@ -30,7 +30,7 @@ export const TARGETS: Record = { // macOS "aarch64-apple-darwin": aarch64AppleDarwin, -@@ -180,6 +187,7 @@ +@@ -205,6 +212,7 @@ "aarch64-unknown-linux-gnu": aarch64UnknownLinuxGnu, "powerpc64le-unknown-linux-musl": powerpc64leUnknownLinuxMusl, "powerpc64le-unknown-linux-gnu": powerpc64leUnknownLinuxGnu, diff --git a/element.io/riscv64.patch b/element.io/riscv64.patch index 8f5d2f508..3a4eb8a8b 100644 --- a/element.io/riscv64.patch +++ b/element.io/riscv64.patch @@ -16,18 +16,18 @@ - element-desktop.sh) + element-desktop.sh + element-desktop-riscv64-support.patch -+ git+https://github.com/kxxt/app-builder ++ git+https://github.com/develar/app-builder.git#commit=c92c3a2899b5887662321878a0a8681d122742bb + builder-util+24.4.0.patch + app-builder-lib+24.5.2.patch) - sha256sums=('3e92beb12f19b73a111d3481b275ce8600ed84f714f536a730d1ba37c520d85f' + sha256sums=('27fa94673d9376e18dd2e79879e6ec8b28381cb406b7eb30d5042f3b70584306' 'SKIP' - 'bde90a6ff893a46872845d4e04825087c05a05b42a859694548821c43d968a47' + '3a8abc638e952db009b02ae1643d9f386489e02520063c83659b52fd7f21b031' 'SKIP' '268485f35103d00a89be7f5c84703e3d393350c71f4f90932f7bcb5ea2fd094f' '0103f28a32fe31f698836516783c1c70a76a0117b5df7fd0af5c422c224220f9' - 'c1bd9ace215e3ec9af14d7f28b163fc8c8b42e23a2cf04ce6f4ce2fcc465feba') + 'c1bd9ace215e3ec9af14d7f28b163fc8c8b42e23a2cf04ce6f4ce2fcc465feba' -+ 'b2d5381ad4b6f406ea2edce11cbd013840bab6af09d6a2a067b214d85eb84ebf' ++ '362020117ec482dc165b276046705468106316a769e39bfa408586ea72fefe45' + 'SKIP' + '887a6c6e0f1ad5ceceef1e35582bd7498145406945d08ed036d98311cec35a89' + '96f0242d8071075b2f8d916b2f0eabeba660d7314a504792965ee2ff89965175')