From be44d4a1a651383b04e4e1e6f68b7f8b9524f9a2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 23:23:49 +0200 Subject: [PATCH 01/25] New release v1.11.30-sc.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 a8b266d..2f54ef6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4 +Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3 diff --git a/element-web b/element-web index 2ca5291..f3e6edb 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5 +Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd diff --git a/matrix-react-sdk b/matrix-react-sdk index d8cf78a..9e45813 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2 +Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96 From 0ba494e9559ab39a4dd0a936c3d33b9f09ac064b Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 25 Apr 2023 23:53:41 +0200 Subject: [PATCH 02/25] Use llvm instead llvm15 for Fedora --- Containerfile.fedora | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 21b905f..a61578c 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM fedora:latest -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 +RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION @@ -17,4 +17,4 @@ COPY . /project WORKDIR /project # There might be remnants of the host which break the build -RUN make fixup \ No newline at end of file +RUN make fixup From a8be3ffcde6d55a6388450ca84bb9b281cb37a6a Mon Sep 17 00:00:00 2001 From: misibacsi Date: Sat, 22 Apr 2023 05:07:41 +0000 Subject: [PATCH 03/25] Translated using Weblate (Hungarian) Currently translated at 50.9% (26 of 51 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/hu/ --- i18n-overlays/matrix-react-sdk/hu.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/hu.json b/i18n-overlays/matrix-react-sdk/hu.json index a048d36..cde030f 100644 --- a/i18n-overlays/matrix-react-sdk/hu.json +++ b/i18n-overlays/matrix-react-sdk/hu.json @@ -3,5 +3,27 @@ "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon", "Message bubbles": "Üzenet buborékok", "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon", - "Normal priority": "Normál prioritás" + "Normal priority": "Normál prioritás", + "Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában", + "Update notifications": "Értesítések frissítése", + "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).", + "System": "Rendszer", + "Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon", + "All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.", + "Mark as read": "Olvasottnak jelöl", + "Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért", + "Sound pack": "Hangcsomag", + "Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél", + "Don't ask again": "Ne kérdezze újra", + "Light theme": "Világos téma", + "Dark theme": "Sötét téma", + "Mark as unread": "Olvasatlannak jelöl", + "Collapse additional buttons": "További gombok összecsukása", + "Theme": "Téma", + "Room list": "Szobák listája", + "Font size and typeface": "Betűméret és betűtípus", + "Message layout": "Üzenetek elrendezése", + "Modern": "Modern" } From 9561c95bb6284bc579b6406e79853fcc9fc5e860 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Mon, 24 Apr 2023 06:40:18 +0000 Subject: [PATCH 04/25] Translated using Weblate (Czech) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index c07e3a1..a0816fc 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -50,5 +50,6 @@ "Mixed": "Smíšené", "Sound pack": "Balíček zvuků", "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti", - "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element" + "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element", + "React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\"" } From 3ac88b91326983e1e833398400fbb096533a3c64 Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 23 Apr 2023 16:40:27 +0000 Subject: [PATCH 05/25] Translated using Weblate (Indonesian) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index c0d5cbb..3324b6f 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -49,5 +49,6 @@ "Mixed": "Campur", "Sound pack": "Paket suara", "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan", - "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element" + "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element", + "React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\"" } From e68cd727722d1a5ddf20b611b45167e545c8c032 Mon Sep 17 00:00:00 2001 From: Xenine Date: Sun, 14 May 2023 22:13:08 +0000 Subject: [PATCH 06/25] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (52 of 52 strings) Translation: SchildiChat/schildichat-deskop/matrix-react-sdk Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/zh_Hans/ --- i18n-overlays/matrix-react-sdk/zh_Hans.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index aef112a..e3e332a 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -42,5 +42,13 @@ "Mark as unread": "标记为未读", "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。", "Enable YouTube embed player": "启用 YouTube 嵌入式播放器", - "Collapse additional buttons": "折叠额外的按钮" + "Collapse additional buttons": "折叠额外的按钮", + "Round": "圆角", + "React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动", + "Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑", + "Mixed": "混合", + "Extra round": "超圆角", + "Sound pack": "音频包", + "Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音", + "Corners": "边缘" } From 143bf7af1e749b39189a2e84eea2d0d971bcdd74 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jul 2023 15:11:53 +0200 Subject: [PATCH 07/25] merge-upstream.sh: Allow merging specific version --- merge_upstream.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/merge_upstream.sh b/merge_upstream.sh index cfbea1f..e772262 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -23,7 +23,13 @@ automatic_i18n_reversion automatic_packagejson_reversion # Merge upstream -get_latest_upstream_tag + +# Check if specific version to merge passed +if [ -z "$1" ]; then + get_latest_upstream_tag +else + latest_upstream_tag="$1" +fi forelement_repos git merge "$latest_upstream_tag" get_current_mxsdk_tags From 8a1b9ab40fed4e7993dbfdaf1ef3ea7dfa0224d3 Mon Sep 17 00:00:00 2001 From: Sebastian Walz Date: Tue, 7 Nov 2023 19:27:21 +0100 Subject: [PATCH 08/25] Update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 271a3d0..d010aa2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1633901457, - "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", + "lastModified": 1699380656, + "narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f358794824b4595d77fec93732485d329ed7b0e0", + "rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6", "type": "github" }, "original": { From 2c9f4caa8b7c667a3760cc7f06871ee1a55fc394 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 13 Dec 2023 02:27:35 +0100 Subject: [PATCH 09/25] New test release v1.11.33-sc.0.test.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 2f54ef6..16d3620 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3 +Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780 diff --git a/element-web b/element-web index f3e6edb..e5afedf 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd +Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c diff --git a/matrix-js-sdk b/matrix-js-sdk index c0ab637..255144e 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27 +Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f diff --git a/matrix-react-sdk b/matrix-react-sdk index 9e45813..9994f86 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96 +Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e From 8cf7414a857a47df0e2002105cb1e6e9a3173874 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 13 Dec 2023 02:28:15 +0100 Subject: [PATCH 10/25] New test release v1.11.33-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 16d3620..c221f6c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780 +Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64 diff --git a/element-web b/element-web index e5afedf..bfa6512 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c +Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06 From cb6f6d990154004fd20d6f215e13909d6c697342 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 22 Feb 2024 19:24:36 +0100 Subject: [PATCH 11/25] New test release v1.11.34-sc.0.test.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 c221f6c..000e503 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64 +Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16 diff --git a/element-web b/element-web index bfa6512..396585e 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06 +Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3 diff --git a/matrix-js-sdk b/matrix-js-sdk index 255144e..10fe11f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f +Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414 diff --git a/matrix-react-sdk b/matrix-react-sdk index 9994f86..6a3ee32 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e +Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34 From 2597454e9626fc4fe91737466c511ec932c7c3e2 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 22 Feb 2024 19:56:41 +0100 Subject: [PATCH 12/25] New test release v1.11.35-sc.0.test.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 000e503..f00d8f6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16 +Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75 diff --git a/element-web b/element-web index 396585e..8a4b06c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3 +Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745 diff --git a/matrix-js-sdk b/matrix-js-sdk index 10fe11f..5d086fe 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414 +Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0 diff --git a/matrix-react-sdk b/matrix-react-sdk index 6a3ee32..3442618 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34 +Subproject commit 344261869234925f01689eb575fe2bc7013c9547 From 5f41b4c654ca853db3a4c1b0b4c293a8d04940fd Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:21:05 +0100 Subject: [PATCH 13/25] New test release v1.11.36-sc.0.test.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 f00d8f6..738de77 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75 +Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb diff --git a/element-web b/element-web index 8a4b06c..ecf1586 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745 +Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894 diff --git a/matrix-js-sdk b/matrix-js-sdk index 5d086fe..9bbc329 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0 +Subproject commit 9bbc329635e1e31f5e72e93ef87ccd90b43de538 diff --git a/matrix-react-sdk b/matrix-react-sdk index 3442618..3638445 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 344261869234925f01689eb575fe2bc7013c9547 +Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10 From aae0f2868e8dcf0789dd9ba7290bdde92baca176 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:37:16 +0100 Subject: [PATCH 14/25] New test release v1.11.36-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 738de77..cbd51cb 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb +Subproject commit cbd51cb2e95298d1992bceaf1b7cd8d0e4fbc786 diff --git a/element-web b/element-web index ecf1586..ed6795a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894 +Subproject commit ed6795ae7a77235e547193011b9dd54c9e8412b8 diff --git a/matrix-react-sdk b/matrix-react-sdk index 3638445..361a49f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10 +Subproject commit 361a49f235d7e267958bfe8dc653e1e777a5861c From e9faf9ab15ad5e375e785b120e7643b273f675c8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 19:43:25 +0100 Subject: [PATCH 15/25] Bump node version from 16 to 18 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 205cea9..3c86970 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: web YARN ?= yarnpkg CONTAINER_ENGINE ?= podman -NODE_VERSION ?= 16 +NODE_VERSION ?= 18 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') From 90912a5d0700e82b514e5ff9afd468db58e583ec Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 24 Feb 2024 19:36:32 +0100 Subject: [PATCH 16/25] Fix debian container compile --- Containerfile.debian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile.debian b/Containerfile.debian index 041c64e..f079562 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION -FROM node:${NODE_VERSION} +FROM node:${NODE_VERSION}-buster RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ curl \ @@ -27,4 +27,4 @@ COPY . /project WORKDIR /project # There might be remnants of the host which break the build -RUN make fixup \ No newline at end of file +RUN make fixup From 1338cf06041b77b557f31f37b26a8c2066072c55 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 21:45:02 +0100 Subject: [PATCH 17/25] Fix containerbuilds, also always use host directory as project directory --- Containerfile.fedora | 13 +++++++------ Makefile | 17 ++++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index a61578c..2ac846d 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ -FROM fedora:latest +FROM docker.io/fedora:38 -RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat # node setup ARG NODE_VERSION @@ -13,8 +13,9 @@ RUN npm install -g yarn RUN npm install -g node-gyp RUN gem install --no-user-install --no-document fpm -COPY . /project -WORKDIR /project +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -# There might be remnants of the host which break the build -RUN make fixup +WORKDIR /project \ No newline at end of file diff --git a/Makefile b/Makefile index 3c86970..074b8fa 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns .PHONY: container-build-debian container-build-fedora -.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release +.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-local-pkgbuild .PHONY: clean undo_setup fixup .PHONY: fix_yarn_cache @@ -162,22 +162,25 @@ macos-mas-release: macos-mas cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR) container-build-debian: - $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . container-build-fedora: - $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . container-web-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release container-debian-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release container-rpm-release: container-build-fedora - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release container-appimage-release: container-build-debian - $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + +container-local-pkgbuild: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock ./build-bom.sh From 446b55792fd71650bfc5ac5c800861227a05969d Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 22:28:53 +0100 Subject: [PATCH 18/25] This got lost while rebasing --- Containerfile.debian | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Containerfile.debian b/Containerfile.debian index f079562..c8c75ba 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -23,8 +23,4 @@ ENV RUSTUP_HOME=/usr/local/rustup \ PATH=/usr/local/cargo/bin:$PATH RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal -COPY . /project -WORKDIR /project - -# There might be remnants of the host which break the build -RUN make fixup +WORKDIR /project \ No newline at end of file From 9241a6d044873acae993f6d1e2f9809d0624965d Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 24 Feb 2024 22:29:48 +0100 Subject: [PATCH 19/25] Use fully qualified name here as well --- Containerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.debian b/Containerfile.debian index c8c75ba..85222fc 100644 --- a/Containerfile.debian +++ b/Containerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION -FROM node:${NODE_VERSION}-buster +FROM docker.io/node:${NODE_VERSION}-buster RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ curl \ From ab496f797715fd2641a5045d2fa65f3478c80de7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:36:48 +0100 Subject: [PATCH 20/25] Fully containerized release builds --- Containerfile.windows | 13 +++++++++++++ Makefile | 15 +++++++++++++-- matrix-react-sdk | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 Containerfile.windows diff --git a/Containerfile.windows b/Containerfile.windows new file mode 100644 index 0000000..0c0776a --- /dev/null +++ b/Containerfile.windows @@ -0,0 +1,13 @@ +ARG CONTAINER_IMAGE_DEBIAN +FROM ${CONTAINER_IMAGE_DEBIAN}:latest + +RUN dpkg --add-architecture i386 && apt-get update && apt-get install --no-install-recommends -y \ + wine \ + wine32 \ + wine64 \ + libwine \ + libwine:i386 \ + fonts-wine \ + zip + +WORKDIR /project \ No newline at end of file diff --git a/Makefile b/Makefile index 074b8fa..7ac67c1 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns -.PHONY: container-build-debian container-build-fedora -.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-local-pkgbuild +.PHONY: container-build-debian container-build-fedora container-build-windows +.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release container-windows-release container-release container-local-pkgbuild .PHONY: clean undo_setup fixup .PHONY: fix_yarn_cache @@ -39,6 +39,7 @@ OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora +CONTAINER_IMAGE_WINDOWS := schildichat-desktop-containerbuild-windows RELEASE_DIR := release CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION) @@ -167,6 +168,9 @@ container-build-debian: container-build-fedora: $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . +container-build-windows: container-build-debian + $(CONTAINER_ENGINE) build --security-opt seccomp=unconfined --security-opt label=disable -t $(CONTAINER_IMAGE_WINDOWS) -f Containerfile.windows --build-arg CONTAINER_IMAGE_DEBIAN=$(CONTAINER_IMAGE_DEBIAN) . + container-web-release: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release @@ -179,6 +183,13 @@ container-rpm-release: container-build-fedora container-appimage-release: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release +container-windows-release: container-build-windows + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make windows-release + +container-release: container-build-windows container-build-fedora + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_WINDOWS):latest make web-release debian-release appimage-release windows-setup-release windows-portable-release + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + container-local-pkgbuild: container-build-debian $(CONTAINER_ENGINE) run --rm -ti -v $(PWD):/project --security-opt seccomp=unconfined --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make local-pkgbuild diff --git a/matrix-react-sdk b/matrix-react-sdk index 361a49f..7aca4ab 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 361a49f235d7e267958bfe8dc653e1e777a5861c +Subproject commit 7aca4ab6c0a0ab96382eeb4fe3470698f31b4d44 From 9f8bad4ea516f7b5380dc347e1fc55a55b937295 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:36:56 +0100 Subject: [PATCH 21/25] New release v1.11.36-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index cbd51cb..07a530e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit cbd51cb2e95298d1992bceaf1b7cd8d0e4fbc786 +Subproject commit 07a530ef7d811223c224520ad973aac0230ece67 diff --git a/element-web b/element-web index ed6795a..6e9a004 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ed6795ae7a77235e547193011b9dd54c9e8412b8 +Subproject commit 6e9a004b0d57cd1bbd26ff2624de45c259be0412 From 4dcd73f0839c0dd1cfd19c6b8ba8bfab0834e3db Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 20:56:48 +0100 Subject: [PATCH 22/25] Changed sqlcipher variable name --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ac67c1..472d391 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ web: setup desktop-common: web $(YARN) --cwd element-desktop run fetch --cfgdir '' - SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native + SQLCIPHER_BUNDLED=1 $(YARN) --cwd element-desktop run build:native macos-common: web icns $(YARN) --cwd element-desktop run fetch --cfgdir '' From 48fb86093a8702092e4954c1d4ee61f4da9cc3be Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 25 Feb 2024 21:01:22 +0100 Subject: [PATCH 23/25] New release v1.11.36-sc.2 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 07a530e..7252cf8 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07a530ef7d811223c224520ad973aac0230ece67 +Subproject commit 7252cf854ba614f7df7cbd20f8fa163316a6eb33 diff --git a/element-web b/element-web index 6e9a004..e625706 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6e9a004b0d57cd1bbd26ff2624de45c259be0412 +Subproject commit e6257065c1164f7e786d412050945626d834faac From 4b0435ef3b82d3c5a08ddc9526bfe8a872991d49 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:45:34 +0100 Subject: [PATCH 24/25] Fix fedora container build See: https://stackoverflow.com/a/74330717/4515820 --- Containerfile.fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.fedora b/Containerfile.fedora index 2ac846d..a886a89 100644 --- a/Containerfile.fedora +++ b/Containerfile.fedora @@ -1,6 +1,6 @@ FROM docker.io/fedora:38 -RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat +RUN dnf install -y openssl openssl-devel cargo llvm libsecret libsecret-devel sqlcipher sqlcipher-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat pkgconf perl # node setup ARG NODE_VERSION From a1458b136bc6577561787481ea0cedc824d8c607 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 26 Feb 2024 10:57:25 +0100 Subject: [PATCH 25/25] New release v1.11.36-sc.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 7252cf8..fb2931e 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 7252cf854ba614f7df7cbd20f8fa163316a6eb33 +Subproject commit fb2931eb808d99995a4cd5ef168e8d4697f39e3f diff --git a/element-web b/element-web index e625706..904c637 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit e6257065c1164f7e786d412050945626d834faac +Subproject commit 904c6378682d314fe91bf536b6207c6d5e320459 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7aca4ab..5a1c347 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7aca4ab6c0a0ab96382eeb4fe3470698f31b4d44 +Subproject commit 5a1c34750acf0c8da2a8ba25b6f79e9ac115230e