From 9e03657ec40eec0be48c549f2af56b93185cd107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lynn=20Nakanishi=20Lin=EF=BC=88=E6=9E=97=E4=B8=AD=E8=A5=BF?= =?UTF-8?q?=EF=BC=89?= Date: Sat, 4 Dec 2021 20:05:56 +0000 Subject: [PATCH 01/37] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (41 of 41 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/zh_Hans/ --- i18n-overlays/matrix-react-sdk/zh_Hans.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index 280875e..6702566 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -36,5 +36,8 @@ "Show message bubbles on one side only": "仅在一侧显示消息气泡", "Room list style": "聊天室列表样式", "Show message bubbles depending on the width either on both sides or only on one side": "根据窗口大小智能切换消息气泡的显示样式", - "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).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。" + "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).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。", + "Mark as read": "标记为已读", + "Mark rooms as unread": "允许将聊天记录标记为未读", + "Mark as unread": "标记为未读" } From 5abd379edb41c873ee5af38c2ca976b7e0781c26 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 10 Dec 2021 13:27:45 +0100 Subject: [PATCH 02/37] Update Debian dependencies for bullseye --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fde8f7..20b0099 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,11 @@ Development happens in the `sc` branch, which might be **broken at any time**! Since Debian is usually slow to update packages on its stable releases, some dependencies might not be recent enough to build SchildiChat. -The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10: +The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye): ``` -# apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar +# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools + # curl -sL https://deb.nodesource.com/setup_14.x | bash - # apt update # apt install nodejs From 718c2a57bda1bf203d78cf1cb0e0ff74810dfac9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 12 Dec 2021 17:19:12 +0100 Subject: [PATCH 03/37] New test release v1.9.6-sc.0.test.2 --- 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 981210c..47363ff 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 981210ca0ad0f837db9be9f4e2279abc162b6484 +Subproject commit 47363ff0bff98bba31bbad60064fa18f89596eed diff --git a/element-web b/element-web index 7807594..1161ffc 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 780759464826720559e78059f4bf8586a785bb47 +Subproject commit 1161ffc3335a5b734357aab0ac53cf63017d9817 diff --git a/matrix-js-sdk b/matrix-js-sdk index b3aa5e5..e44bbcf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit b3aa5e524ea88940d37050ef2bd5c2d6bc029023 +Subproject commit e44bbcf0abc7c0c98c56ffaa7d6fcfba72c011ae diff --git a/matrix-react-sdk b/matrix-react-sdk index 15b9ad8..13887a8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 15b9ad85533136b11cfb70d269ba383ee55d898a +Subproject commit 13887a82b74439c59f92ddb12472e94c82a99179 From 5a04ec7c3c10475f06611e3e2b294563bb91faae Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 13 Dec 2021 16:15:38 +0100 Subject: [PATCH 04/37] New test release v1.9.6-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 47363ff..91fe210 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 47363ff0bff98bba31bbad60064fa18f89596eed +Subproject commit 91fe21016df03076c3a1486a65660873924da817 diff --git a/element-web b/element-web index 1161ffc..82e69f8 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1161ffc3335a5b734357aab0ac53cf63017d9817 +Subproject commit 82e69f87f6df6829285357ab26882081d70af39b diff --git a/matrix-react-sdk b/matrix-react-sdk index 13887a8..e6a2950 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 13887a82b74439c59f92ddb12472e94c82a99179 +Subproject commit e6a2950b0affb0be211af651c0aa2a616fa3d800 From a03a0dd01e1ef6b3e5e1cf11c44fb070c7931feb Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 13 Dec 2021 16:55:54 +0100 Subject: [PATCH 05/37] New release v1.9.7-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 91fe210..c79ee48 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 91fe21016df03076c3a1486a65660873924da817 +Subproject commit c79ee48015a3c3cfaac6eb21e004c2f3d65be733 diff --git a/element-web b/element-web index 82e69f8..94895de 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 82e69f87f6df6829285357ab26882081d70af39b +Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc diff --git a/matrix-js-sdk b/matrix-js-sdk index e44bbcf..09fc7b8 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e44bbcf0abc7c0c98c56ffaa7d6fcfba72c011ae +Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85 diff --git a/matrix-react-sdk b/matrix-react-sdk index e6a2950..2fd5a96 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit e6a2950b0affb0be211af651c0aa2a616fa3d800 +Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f From 5aaedf0f19ba337fcc837955eb6171f7c6ebc311 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 13 Dec 2021 17:05:52 +0100 Subject: [PATCH 06/37] Update submodules --- element-desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/element-desktop b/element-desktop index c79ee48..a074ede 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c79ee48015a3c3cfaac6eb21e004c2f3d65be733 +Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234 From 8ada69cbcd2a25c4bf2248fa31b9a6c1bb592090 Mon Sep 17 00:00:00 2001 From: Shahed Hosseini Date: Sat, 18 Dec 2021 23:46:13 +0000 Subject: [PATCH 07/37] Translated using Weblate (Persian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/fa/ --- i18n-overlays/element-desktop/fa.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/element-desktop/fa.json b/i18n-overlays/element-desktop/fa.json index 0967ef4..1cb3a76 100644 --- a/i18n-overlays/element-desktop/fa.json +++ b/i18n-overlays/element-desktop/fa.json @@ -1 +1,3 @@ -{} +{ + "Show": "نشان دادن" +} From 50dde2a6837376305322f097dc2f5305508260a7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:29:13 +0100 Subject: [PATCH 08/37] Revert "Every build after a merge is a new test build" This reverts commit 31c746c5d22e260e919ab4afb099d025bc0499b8. --- merge_helpers.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 8c97abf..4b7aed3 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -238,9 +238,6 @@ automatic_packagejson_reversion() { automatic_packagejson_adjustment() { local versions get_current_versions - - # every build after a merge is a new test build - versions[2]=$((versions[2] + 1)) forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json" forelement_repos write_version "package.json" From 5dfc14099363a70589c0a3438a55acaa316e53eb Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:29:51 +0100 Subject: [PATCH 09/37] Let version bumps autocommit everything --- bump_release_version.sh | 8 ++++++++ bump_test_version.sh | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/bump_release_version.sh b/bump_release_version.sh index fc69cf7..3fc5346 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -17,4 +17,12 @@ forall_repos check_clean_git bump_release_version +# Get version string +get_current_versions +get_versions_string + +# Add everything +git add -A +git commit --allow-empty -m "New release v$versions_string" + popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index 35c3efc..979ed48 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -17,4 +17,12 @@ forall_repos check_clean_git bump_test_version +# Get version string +get_current_versions +get_versions_string + +# Add everything +git add -A +git commit --allow-empty -m "New test release v$versions_string" + popd > /dev/null From 52bfca57fbeb862677aa383638e1d86638d4874c Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:30:13 +0100 Subject: [PATCH 10/37] New test release v1.9.8-sc.0.test.2 --- 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 a074ede..8de9fa8 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234 +Subproject commit 8de9fa89ce509f08d036106af7eeea672f68d764 diff --git a/element-web b/element-web index 94895de..d657fea 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc +Subproject commit d657fea221e85df3b53d95b8058c99ca70e45b7d diff --git a/matrix-js-sdk b/matrix-js-sdk index 09fc7b8..a71dd32 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85 +Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d diff --git a/matrix-react-sdk b/matrix-react-sdk index 2fd5a96..e08a81f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f +Subproject commit e08a81f74f45e3f1e54c33194a815a90867c04ca From fd8bca4d20c642877546e00f7a45fe0bf3af13a3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:35:40 +0100 Subject: [PATCH 11/37] Try Element nightly AUR search in encrypted rooms fix https://aur.archlinux.org/cgit/aur.git/commit/?h=element-desktop-nightly-bin&id=ca89fc1f025d30512c53abbe87cff61c7739c69b --- local-pkgbuild-template/schildichat-desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh index 99168a8..8e25e12 100644 --- a/local-pkgbuild-template/schildichat-desktop.sh +++ b/local-pkgbuild-template/schildichat-desktop.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec "/opt/---productName---/---appName---" "$@" +LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@" From 764f0767c736fb15d6cc47079ea795dbb961c0f5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 00:39:06 +0100 Subject: [PATCH 12/37] sc update announcement room toast now uses hardcoded alias --- configs/sc/config.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 3a229d0..dfc32f4 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -26,12 +26,5 @@ "url": "https://schildi.chat/desktop/privacy", "text": "Privacy Policy" } - ], - "sc_update_announcement_room": { - "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org", - "via_servers": [ - "supercable.onl", - "spiritcroc.de" - ] - } + ] } From c27c617d145b23096392a606c10ac2528e728ee6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 00:39:29 +0100 Subject: [PATCH 13/37] New test release v1.9.8-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 8de9fa8..c04da6b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 8de9fa89ce509f08d036106af7eeea672f68d764 +Subproject commit c04da6b811d9489a9d5a369104e97cb45554090f diff --git a/element-web b/element-web index d657fea..6b05e97 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d657fea221e85df3b53d95b8058c99ca70e45b7d +Subproject commit 6b05e972b06f277c845d50a6d39c282895e4d9db diff --git a/matrix-react-sdk b/matrix-react-sdk index e08a81f..7edaf5b 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit e08a81f74f45e3f1e54c33194a815a90867c04ca +Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9 From 4a52399ec2c05bd131d343e884c822b420c4a247 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 01:20:07 +0100 Subject: [PATCH 14/37] Always run setup to get yarn links in place (again) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fbb47a2..e2f261b 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ CSC_NAME ?= -include release.mk setup: - if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi + ./setup.sh element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*) From 3c9487541b9e3b4f385a0f16170fe4551523ecfa Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 31 Dec 2021 03:48:23 +0100 Subject: [PATCH 15/37] New release v1.9.8-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index c04da6b..15cd24d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c04da6b811d9489a9d5a369104e97cb45554090f +Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8 diff --git a/element-web b/element-web index 6b05e97..661bfae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6b05e972b06f277c845d50a6d39c282895e4d9db +Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91 From c4e17a1bc4fe0200dcf5ba71a0a6ce2a2ed0de09 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 17 Jan 2022 21:27:44 +0100 Subject: [PATCH 16/37] Let sc.0.test.0 be the initial version after a merge --- merge_helpers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 4b7aed3..3808eab 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -162,7 +162,8 @@ get_current_versions() { get_versions_string() { versions_string="${versions[0]}-sc.${versions[1]}" - if [[ ${versions[2]} -gt 0 ]]; then + # both zero means the initial version after a merge + if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then versions_string+=".test.${versions[2]}" fi } From 9d595d608743b41b3627f0a4e765f2c31f5ebec5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 26 Jan 2022 23:47:11 +0100 Subject: [PATCH 17/37] Allow react sdk theme.sh being run without commit --- merge_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_upstream.sh b/merge_upstream.sh index c3fef9c..cfbea1f 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -46,7 +46,7 @@ automatic_packagejson_adjustment # Automatic theme update pushd "matrix-react-sdk" > /dev/null -./theme.sh +./theme.sh y popd > /dev/null popd > /dev/null From 47e56badc48a0dbb431a067ccbbad22ddf22c79b Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 26 Jan 2022 23:47:55 +0100 Subject: [PATCH 18/37] New test release v1.9.9-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 15cd24d..d8cd4c9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8 +Subproject commit d8cd4c90f1305136d1050f8b6763c3df30576651 diff --git a/element-web b/element-web index 661bfae..d0ded24 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91 +Subproject commit d0ded2417da49ea370cb458c6cd0222f22370125 diff --git a/matrix-js-sdk b/matrix-js-sdk index a71dd32..5c6b029 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d +Subproject commit 5c6b029158b7adbe14cf8d09c5f7473be4389ea9 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7edaf5b..f3da66a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9 +Subproject commit f3da66ac6aec0e726f37dc114466642e907b9cf5 From 57be42182bfd35626195ab73369194ab96f9e9ff Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jan 2022 23:19:40 +0100 Subject: [PATCH 19/37] New test release v1.10.0-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 d8cd4c9..dcfe7af 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d8cd4c90f1305136d1050f8b6763c3df30576651 +Subproject commit dcfe7af262d15296bc477748b20e115d474a437f diff --git a/element-web b/element-web index d0ded24..94802b9 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d0ded2417da49ea370cb458c6cd0222f22370125 +Subproject commit 94802b9b79dbb750f3c5c4a1478e80558dd9440f diff --git a/matrix-js-sdk b/matrix-js-sdk index 5c6b029..0e30159 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5c6b029158b7adbe14cf8d09c5f7473be4389ea9 +Subproject commit 0e30159abcad792241ef4c46713938d2abc57490 diff --git a/matrix-react-sdk b/matrix-react-sdk index f3da66a..93424f1 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f3da66ac6aec0e726f37dc114466642e907b9cf5 +Subproject commit 93424f14ca35109c2f1f172d0a731a018a49eee4 From 867ca2ceaa470535abfebad1e8b596bd47f732e7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jan 2022 23:52:13 +0100 Subject: [PATCH 20/37] local-pkgbuild: Actually fix search in encrypted rooms --- local-pkgbuild-template/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index df4c516..ffa8052 100644 --- a/local-pkgbuild-template/PKGBUILD +++ b/local-pkgbuild-template/PKGBUILD @@ -22,4 +22,5 @@ package() { msg2 "Extracting the data.tar.xz..." bsdtar -xf data.tar.xz -C "$pkgdir/" install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName--- + sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop } From 7a96f32c3f0cf5e1ab98db49f0b9d1e0db238c91 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 1 Feb 2022 19:52:34 +0100 Subject: [PATCH 21/37] New test release v1.10.1-sc.0.test.1 --- 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 dcfe7af..a64352b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dcfe7af262d15296bc477748b20e115d474a437f +Subproject commit a64352b037301ac75771ec238a1cd623fcca36a5 diff --git a/element-web b/element-web index 94802b9..f1bbaed 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 94802b9b79dbb750f3c5c4a1478e80558dd9440f +Subproject commit f1bbaedf70fd7968f1328ecd3e05cc9475d9b0dc diff --git a/matrix-react-sdk b/matrix-react-sdk index 93424f1..f750149 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 93424f14ca35109c2f1f172d0a731a018a49eee4 +Subproject commit f75014957fa461d8aef9b5a9934f3bf2e606b45d From a689c01b0e4cef10df32e89d772b5806728dece9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Feb 2022 00:50:29 +0100 Subject: [PATCH 22/37] Add map_style_url to sc config --- configs/sc/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index dfc32f4..2916dee 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -26,5 +26,6 @@ "url": "https://schildi.chat/desktop/privacy", "text": "Privacy Policy" } - ] + ], + "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } From 3a8eecb023c832acc4390d3a51c0940eafb2b3bd Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Feb 2022 01:36:47 +0100 Subject: [PATCH 23/37] New test release v1.10.3-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 a64352b..27c5ba2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a64352b037301ac75771ec238a1cd623fcca36a5 +Subproject commit 27c5ba2c9a2dcbe68dba30525871cfe39698e372 diff --git a/element-web b/element-web index f1bbaed..c60ffc6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f1bbaedf70fd7968f1328ecd3e05cc9475d9b0dc +Subproject commit c60ffc68c623854c95132525743a0cec40c96853 diff --git a/matrix-js-sdk b/matrix-js-sdk index 0e30159..252d90f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0e30159abcad792241ef4c46713938d2abc57490 +Subproject commit 252d90f72deb33b68f6bb4526409046536bddd76 diff --git a/matrix-react-sdk b/matrix-react-sdk index f750149..24a7a40 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f75014957fa461d8aef9b5a9934f3bf2e606b45d +Subproject commit 24a7a40116b28c8a042e0bc8042dd8c1cd1bf87f From 74bb7087968309b017a89e9b86c49d18458853f7 Mon Sep 17 00:00:00 2001 From: mezysinc Date: Wed, 16 Feb 2022 20:16:15 +0000 Subject: [PATCH 24/37] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (41 of 41 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/pt_BR/ --- i18n-overlays/matrix-react-sdk/pt_BR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index c27b526..5bac536 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/i18n-overlays/matrix-react-sdk/pt_BR.json @@ -37,5 +37,8 @@ "Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha", "Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha", "Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas", - "Room list style": "Estilo da lista de salas" + "Room list style": "Estilo da lista de salas", + "Mark rooms as unread": "Permitir markar conversas como não lidos", + "Mark as unread": "Markar como não lido", + "Mark as read": "Markar como lido" } From db1d3e4e8a2d8b32fb97ccc8984622624fff5f5c Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 26 Feb 2022 11:39:22 +0100 Subject: [PATCH 25/37] Reset AUR bin pkgrel --- deploy/update-aur-bin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/update-aur-bin.sh b/deploy/update-aur-bin.sh index 81b999d..f5d2213 100755 --- a/deploy/update-aur-bin.sh +++ b/deploy/update-aur-bin.sh @@ -21,6 +21,7 @@ git fetch git reset --hard origin/master sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD +sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD makepkg --printsrcinfo > .SRCINFO From 605966fc32cd68741e81cd0de8d063ce6b34e78b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:24:46 +0100 Subject: [PATCH 26/37] Revert "Try Element nightly AUR search in encrypted rooms fix" This reverts commit fd8bca4d20c642877546e00f7a45fe0bf3af13a3. --- local-pkgbuild-template/schildichat-desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh index 8e25e12..99168a8 100644 --- a/local-pkgbuild-template/schildichat-desktop.sh +++ b/local-pkgbuild-template/schildichat-desktop.sh @@ -1,3 +1,3 @@ #!/bin/sh -LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@" +exec "/opt/---productName---/---appName---" "$@" From cf10ad78933a045a1d08b4febd0ceb96162318c4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:37:37 +0100 Subject: [PATCH 27/37] Add string for YouTube embed player option --- 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 4ec4a1e..3fbe2a8 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -39,5 +39,6 @@ "Font size and typeface": "Font size and typeface", "Mark rooms as unread": "Allow marking chats as unread", "Mark as unread": "Mark as unread", - "Mark as read": "Mark as read" + "Mark as read": "Mark as read", + "Enable YouTube embed player": "Enable YouTube embed player" } From c655803783940f794e3782b371b1dbdbcf0e1199 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:45:35 +0100 Subject: [PATCH 28/37] New release v1.10.4-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 27c5ba2..592337d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 27c5ba2c9a2dcbe68dba30525871cfe39698e372 +Subproject commit 592337db774fe9fd186243d3eaac1780229b459d diff --git a/element-web b/element-web index c60ffc6..f64fa1e 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit c60ffc68c623854c95132525743a0cec40c96853 +Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 diff --git a/matrix-js-sdk b/matrix-js-sdk index 252d90f..07619ca 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 252d90f72deb33b68f6bb4526409046536bddd76 +Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a diff --git a/matrix-react-sdk b/matrix-react-sdk index 24a7a40..b616808 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 24a7a40116b28c8a042e0bc8042dd8c1cd1bf87f +Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb From 84be27839c85d02fd6a226d3471f1baae86ed7ab Mon Sep 17 00:00:00 2001 From: joshua Date: Mon, 28 Feb 2022 08:24:29 +0000 Subject: [PATCH 29/37] Translated using Weblate (Swedish) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 8990c52..94b8219 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -39,5 +39,6 @@ "Room list style": "Rumslista stil", "Mark as unread": "markera som oläst", "Mark as read": "markera som läst", - "Mark rooms as unread": "Tillåt att chattar markeras som olästa" + "Mark rooms as unread": "Tillåt att chattar markeras som olästa", + "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare" } From 7228bf7fee70a2c6cf4f47e2d8052a53ba6b1140 Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 27 Feb 2022 23:02:27 +0000 Subject: [PATCH 30/37] Translated using Weblate (Indonesian) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 1e42805..cd66942 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -39,5 +39,6 @@ "Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris", "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca", "Mark as unread": "Tandai sebagai belum dibaca", - "Mark as read": "Tandai sebagai dibaca" + "Mark as read": "Tandai sebagai dibaca", + "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat" } From 909043215f1ff684785e158f33b6273268c2d75a Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Tue, 1 Mar 2022 16:14:25 +0000 Subject: [PATCH 31/37] Translated using Weblate (Czech) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 f9fa215..8f37a96 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -40,5 +40,6 @@ "Hide advanced theme settings": "Skrýt pokročilá nastavení motivu", "Mark rooms as unread": "Povolit označování chatů jako nepřečtených", "Mark as unread": "Označit jako nepřečtené", - "Mark as read": "Označit jako přečtené" + "Mark as read": "Označit jako přečtené", + "Enable YouTube embed player": "Povolí vložený přehrávač YouTube" } From 768b6489816a027e664f0a44b954051a2d08d9cb Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:32:50 +0100 Subject: [PATCH 32/37] New test release v1.10.6-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 592337d..1dad2e2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 592337db774fe9fd186243d3eaac1780229b459d +Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 diff --git a/element-web b/element-web index f64fa1e..9c949f1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 +Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 diff --git a/matrix-js-sdk b/matrix-js-sdk index 07619ca..8502dd1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a +Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30 diff --git a/matrix-react-sdk b/matrix-react-sdk index b616808..4387b1f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb +Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914 From 602d6bcc91baafb1c53b879ad66ac814197094aa Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:36:42 +0100 Subject: [PATCH 33/37] Add string --- 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 3fbe2a8..dda71e0 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -40,5 +40,6 @@ "Mark rooms as unread": "Allow marking chats as unread", "Mark as unread": "Mark as unread", "Mark as read": "Mark as read", - "Enable YouTube embed player": "Enable YouTube embed player" + "Enable YouTube embed player": "Enable YouTube embed player", + "Collapse additional buttons": "Collapse additional buttons" } From 5a232a27db80ff8bb1a225ccf67ba902b680ac65 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:40:52 +0100 Subject: [PATCH 34/37] New test release v1.10.6-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 1dad2e2..1544670 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 +Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 diff --git a/element-web b/element-web index 9c949f1..9fd930c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 +Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 From 40694fb207745e5780b229de967dd35f18da0816 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:34:07 +0100 Subject: [PATCH 35/37] sqlcipher now statically linked --- local-pkgbuild-template/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index ffa8052..ff49e1f 100644 --- a/local-pkgbuild-template/PKGBUILD +++ b/local-pkgbuild-template/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional arch=('x86_64') url="https://schildi.chat" license=('Apache') -depends=('sqlcipher') +depends=() provides=('---appName---') conflicts=('---appName---') source=("---debName---" From d0b9a59e5923fd8db9f94755f87b0d538381dec9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:55:58 +0100 Subject: [PATCH 36/37] Let version bump scripts add tags --- bump_release_version.sh | 1 + bump_test_version.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/bump_release_version.sh b/bump_release_version.sh index 3fc5346..a322d61 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New release v$versions_string" +git tag -a "v$versions_string" -m "New release v$versions_string" popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index 979ed48..847af31 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New test release v$versions_string" +git tag -a "v$versions_string" -m "New test release v$versions_string" popd > /dev/null From 3957463f72c7f0d5481ea93859da2a370f146e88 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:57:07 +0100 Subject: [PATCH 37/37] New test release v1.10.6-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 1544670..f9a3d9d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 +Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df diff --git a/element-web b/element-web index 9fd930c..6c6eba1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 +Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3