From 40c598e91b4cc21df066e49a0777015354a686a6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 21 Apr 2023 12:37:58 +0200 Subject: [PATCH 1/8] llvm15 seems to be necessary for Fedora 38 with rust --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 279d43f..501c662 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION From 10a511228584d6e14cb1c0257946fb93bdf8ae3e Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 21 Apr 2023 12:47:41 +0200 Subject: [PATCH 2/8] ruby fpm also needs its dependencies for Fedora --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 501c662..21b905f 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION} RUN npm install -g n RUN npm install -g yarn RUN npm install -g node-gyp -RUN gem install --ignore-dependencies --no-user-install --no-document fpm +RUN gem install --no-user-install --no-document fpm COPY . /project WORKDIR /project From 979be00158bd0c211553d5bdce17663e34ad6c13 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 22 Apr 2023 10:10:55 +0200 Subject: [PATCH 3/8] Add script to completely reset repos from leftovers --- hard_reset_repos.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 hard_reset_repos.sh diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh new file mode 100755 index 0000000..4e17e2a --- /dev/null +++ b/hard_reset_repos.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +cd "$mydir" + +source ./merge_helpers.sh + +# Note: this doesn't delete files starting with a dot, +# and in particular not the '.git' directory, which we +# want to keep +forall_repos bash -c 'rm -rf *' +forall_repos git reset HEAD --hard From 0eb99a6a606c6917f6676c2d4abcecaf1848d0f4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 22 Apr 2023 10:11:16 +0200 Subject: [PATCH 4/8] Make fixup: also check if yarn cache is broken and clean it if necessary If `yarn cache list` fails, this can also lead to weird errors during fixup, like ``` error /schildichat-desktop/matrix-react-sdk/node_modules/cypress: Command failed. Exit code: 1 Command: node index.js --exec install Arguments: Directory: /schildichat-desktop/matrix-react-sdk/node_modules/cypress Output: node:internal/modules/cjs/loader:433 throw err; ^ Error: Cannot find module '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals/build/src/main.js'. Please verify that the package.json has a valid "main" entry at tryPackage (node:internal/modules/cjs/loader:425:19) at Function.Module._findPath (node:internal/modules/cjs/loader:638:18) at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1012:27) at Function.Module._load (node:internal/modules/cjs/loader:871:27) at Module.require (node:internal/modules/cjs/loader:1098:19) at require (node:internal/modules/cjs/helpers:108:18) at Object. (/schildichat-desktop/matrix-react-sdk/node_modules/execa/lib/error.js:2:25) at Module._compile (node:internal/modules/cjs/loader:1196:14) at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10) at Module.load (node:internal/modules/cjs/loader:1074:32) { code: 'MODULE_NOT_FOUND', path: '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals ``` --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c517e5b..205cea9 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ .PHONY: container-build-debian container-build-fedora .PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release .PHONY: clean undo_setup fixup +.PHONY: fix_yarn_cache CFGDIR ?= configs/sc @@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc ./build-bom.sh bom: bom.lock +fix_yarn_cache: + $(YARN) cache list || $(YARN) cache clean + clean: $(YARN) --cwd matrix-js-sdk clean $(YARN) --cwd matrix-react-sdk clean @@ -195,7 +199,7 @@ clean: undo_setup: rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak -fixup: undo_setup +fixup: undo_setup fix_yarn_cache make setup make clean make setup From 5122f0e870ed94d17f459c8cf0a13f1be501d147 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:23:03 +0200 Subject: [PATCH 5/8] Add missing string for freeform reactions --- i18n-overlays/matrix-react-sdk/en_EN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 7732df7..2c59706 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -49,5 +49,6 @@ "Mixed": "Mixed", "Sound pack": "Sound pack", "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety", - "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element" + "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element", + "React with \"%(reaction)s\"": "React with \"%(reaction)s\"" } From 64557e1da945d6c85db3d4f9bd95c7931bdfa2c8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:25:37 +0200 Subject: [PATCH 6/8] New test release v1.11.29-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index 46a18d2..ba31f4b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4 +Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754 diff --git a/element-web b/element-web index a21fcb8..2e5ba06 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743 +Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1d04bb0..d53a6e0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d +Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023 From 1a485faf72af8aa6316e6c7194b7ae18ebe0d051 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 22 Apr 2023 12:30:03 +0200 Subject: [PATCH 7/8] New test release v1.11.29-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index ba31f4b..ca3c38e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754 +Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca diff --git a/element-web b/element-web index 2e5ba06..d8643e4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999 +Subproject commit d8643e4983b11a87831af1729037976d14641454 diff --git a/matrix-react-sdk b/matrix-react-sdk index d53a6e0..21ecba2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023 +Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341 From f9ab1ef2e02d3aaa58ff74cb1b71d4cf5d7509b4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 22:59:51 +0200 Subject: [PATCH 8/8] New release v1.11.30-sc.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index ca3c38e..a8b266d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca +Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4 diff --git a/element-web b/element-web index d8643e4..2ca5291 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d8643e4983b11a87831af1729037976d14641454 +Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5 diff --git a/matrix-js-sdk b/matrix-js-sdk index af4413b..c0ab637 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1 +Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27 diff --git a/matrix-react-sdk b/matrix-react-sdk index 21ecba2..d8cf78a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341 +Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2