configs/sc/config.json

@@ -26,6 +26,5 @@
             "url": "https://schildi.chat/desktop/privacy",
             "text": "Privacy Policy"
         }
-    ],
-    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
+    ]
 }

deploy/update-aur-bin.sh

@@ -21,7 +21,6 @@ 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

element-desktop

@@ -1 +1 @@
-Subproject commit 592337db774fe9fd186243d3eaac1780229b459d
+Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8

element-web

@@ -1 +1 @@
-Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030
+Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91

i18n-overlays/matrix-react-sdk/en_EN.json

@@ -39,6 +39,5 @@
     "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",
-    "Enable YouTube embed player": "Enable YouTube embed player"
+    "Mark as read": "Mark as read"
 }

i18n-overlays/matrix-react-sdk/pt_BR.json

@@ -37,8 +37,5 @@
     "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",
-    "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"
+    "Room list style": "Estilo da lista de salas"
 }

local-pkgbuild-template/PKGBUILD

@@ -22,5 +22,4 @@ 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
 }

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---" "$@"

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a
+Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb
+Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9

merge_helpers.sh

@@ -162,8 +162,7 @@ get_current_versions() {
 get_versions_string() {
     versions_string="${versions[0]}-sc.${versions[1]}"
 
-    # both zero means the initial version after a merge
-    if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
+    if [[ ${versions[2]} -gt 0 ]]; then
         versions_string+=".test.${versions[2]}"
     fi
 }

merge_upstream.sh

@@ -46,7 +46,7 @@ automatic_packagejson_adjustment
 
 # Automatic theme update
 pushd "matrix-react-sdk" > /dev/null
-./theme.sh y
+./theme.sh
 popd > /dev/null
 
 popd > /dev/null