diff --git a/Makefile b/Makefile index fbb47a2..5a897e6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable +.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: clean @@ -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/*) @@ -60,12 +60,8 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns regenerate-i18n: setup ./regenerate_i18n.sh -reskindex: setup - $(YARN) --cwd matrix-react-sdk reskindex - $(YARN) --cwd element-web reskindex - web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION) -web: setup reskindex +web: setup cp $(CFGDIR)/config.json element-web/ $(YARN) --cwd element-web dist echo "$(VERSION)" > element-web/webapp/version diff --git a/README.md b/README.md index 20b0099..12a7bb2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,18 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we +
+Public key used to sign the Debian packages + +``` +pub rsa4096 2020-12-08 [SC] + 560BB70DA86A6633A39CEC6023358905FE294D01 +uid Super apt repo key +sub rsa4096 2020-12-08 [E] +``` + +
+ ## Building SchildiChat Web/Desktop diff --git a/bump_release_version.sh b/bump_release_version.sh index fc69cf7..92b5cac 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -17,4 +17,13 @@ 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" +git tag -s "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 35c3efc..bffb851 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -17,4 +17,13 @@ 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" +git tag -s "v$versions_string" -m "New test release v$versions_string" + popd > /dev/null diff --git a/configs/sc/config.json b/configs/sc/config.json index 3a229d0..2916dee 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -27,11 +27,5 @@ "text": "Privacy Policy" } ], - "sc_update_announcement_room": { - "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org", - "via_servers": [ - "supercable.onl", - "spiritcroc.de" - ] - } + "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } 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 diff --git a/element-desktop b/element-desktop index a074ede..aea9cef 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234 +Subproject commit aea9cefa5d59930a831e94104521b70619d6623b diff --git a/element-web b/element-web index 94895de..416913d 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc +Subproject commit 416913d12060244672c86cc175b6fbbcbfaf759b 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": "نشان دادن" +} diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f9fa215..f4e03bb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -40,5 +40,8 @@ "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", + "Collapse additional buttons": "Sbalit další tlačítka", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti." } diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index e65cb3d..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -141,5 +141,7 @@ "Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen", "Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren", "Mark as read": "Als gelesen markieren", - "Mark as unread": "Als ungelesen markieren" + "Mark as unread": "Als ungelesen markieren", + "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", + "Collapse additional buttons": "Zusätzliche Buttons einklappen" } diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 4ec4a1e..8d07295 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -39,5 +39,8 @@ "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", + "Collapse additional buttons": "Collapse additional buttons", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms." } diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index 1e42805..a986a4d 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -39,5 +39,8 @@ "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", + "Collapse additional buttons": "Sembunyikan tombol tambahan", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan." } 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" } diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 8990c52..7282f7f 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -39,5 +39,8 @@ "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", + "Collapse additional buttons": "Dölj ytterligare knappar", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum." } diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index df4c516..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---" @@ -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 } diff --git a/matrix-js-sdk b/matrix-js-sdk index 09fc7b8..c696abf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85 +Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2 diff --git a/matrix-react-sdk b/matrix-react-sdk index 2fd5a96..cdc59f3 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f +Subproject commit cdc59f3df4d67c36a79c0872499713c256ba068d diff --git a/merge_helpers.sh b/merge_helpers.sh index 8c97abf..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 } @@ -238,9 +239,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" 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