forked submodule cmake

.gitmodules

@@ -42,7 +42,7 @@
 	url = https://github.com/desktop-app/lib_storage.git
 [submodule "cmake"]
 	path = cmake
-	url = https://github.com/desktop-app/cmake_helpers.git
+	url = https://github.com/rabbitGramDesktopModules/cmake_helpers.git
 [submodule "Telegram/ThirdParty/expected"]
 	path = Telegram/ThirdParty/expected
 	url = https://github.com/TartanLlama/expected
@@ -67,9 +67,7 @@
 [submodule "Telegram/ThirdParty/fcitx5-qt"]
 	path = Telegram/ThirdParty/fcitx5-qt
 	url = https://github.com/fcitx/fcitx5-qt.git
-[submodule "Telegram/ThirdParty/fcitx-qt5"]
-	path = Telegram/ThirdParty/fcitx-qt5
-	url = https://github.com/fcitx/fcitx-qt5.git
+
 [submodule "Telegram/lib_webrtc"]
 	path = Telegram/lib_webrtc
 	url = https://github.com/desktop-app/lib_webrtc.git

Telegram/SourceFiles/_other/packer.cpp

@@ -12,34 +12,10 @@ quint64 AlphaVersion = 0;
 bool OnlyAlphaKey = false;
 
 const char *PublicKey = "\
------BEGIN PRIVATE KEY-----\n\
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDNLhXYRAArR5js\n\
-MtkMdIgTTYNYSEqqc1Pr47xDe1zVipqiOdaOn01xw5Yt3GPmiXhx2VHzziA4jWdL\n\
-xyWpcjvkCVDNXpNxZWbfDEZSVZ0eam8y51wQNJ11qRnIIJcI0B4fUpC1HzRDMPrs\n\
-TS4MgQKKfZCTPWe6AID5Zm5eH3S187Zm1ci1hnAFMDIMGG8BoIFRyAjXjSsYkq4A\n\
-Jq8NeQZTd//kZWJ8lSlwLEwZ+tgQ6GCb5Wo7IU/ImNBlbv7Bg6F0lJZ3WJiVIE2u\n\
-s0Cxm5IA5IAUQPkoHxt+J3AZvYJuQkj1JYEJBSUQacFreFUZpVQx6oDzLooYfXhu\n\
-PwXZTWddAgMBAAECggEAJ651yZdvK++jJu03loXUCl2nnROQIzJ+RMUM1EU/wUnW\n\
-2bCTaw5qoSmpOhHhXUTxfx0/UQZoq19HnrtzcHe4FwRpNOrJW7k3gcRDNmm54xfF\n\
-DUR7BORUHp0XcCHDbBAp/zdN5sWT6znGEZzknsT1m5iotR0/WhT+XJ2fk0MEpKqW\n\
-ef2yW9ScM2WzKfuTB47Yh3qCWNJTWdMD2dR+V8zsxzip94AT1ae0WkQjG/AdF3cx\n\
-zBQ9QbMa7QUjT3f2AfoVTkzgUPoQcGnwF0d0ptyAoBCBEQh6udLwXNhTyFTnXIOy\n\
-3rEnro3iLaKnTw8Gw8Y1e1LwOKX9LxsDZ3O2g/G7UQKBgQD6TYEp/uvGpZ7F4N88\n\
-rhwrOasckHU3ZtvMjSpBKyKPL0X3uD1KrMU4tx5+YYoQkVd7S7fbZXeSaDzImUj8\n\
-axLUGVOwOlfdFXNR+kYe2FIKsft5P2sHk+aAIkardfSGg/MVARkZLtg1FnhZznlJ\n\
-oP09j8hRpjEotqwOhYy0J9J+UQKBgQDR2adsWEq6lOBt7WnxfoPimPkfAesQcpMA\n\
-Rh12yle0ueBRjqomII/G/sGUihj9WoxM78tKJ17N0d5x6ed6TDgCxDOpmlf2cODd\n\
-pXV69FBHpiQoXR+W0JVe794HXVEbb3Ipjwy3WyQkRc8HjIxybYDDdCkH5gC4sITo\n\
-8AqEjs+ZTQKBgQDFIoW4La5EpeyGrLUldXt6D9FUjfHD0J8MW6IL8Y0meHUCxXiA\n\
-d9Jc+NxrbSbwJYhg8yG7Cg9CoBY/Z3q0UyBhLBFdmpXY6iwJRLQ1VupGwibtN6V0\n\
-Mmg4QsamBCCyUPoCcPrzepGOPkRLdvLPqpvJAJUkuV++USDxzv0iZrrCAQKBgHBq\n\
-jMn5sm6pemDpIiwAfl5RXIND38z708v9w6LzWnCycny+VGAAaYVMzB7qq+BtNWOx\n\
-wdGDrcHMf8G+cAaP9iFlQdfFmwGmDpAuJvUrFCaN1ijZWibMrnghP2vqjZyI4zto\n\
-KoO/C2lzDCkbHdHe32/VNnXIvPIzfb/bd4bzijqxAoGABJiuO30FJQPA7BJjPcfJ\n\
-kksO7lv0zlQx+cJULl8KDPNK0+USwX1BN6KzJLlL7pVRpKW0rk86kXN63kRZuR14\n\
-ocjL3XachX1+uU+CXUuvOtkQRXD5RXBw0yQNfPP2HEdjA7V7fWAWCOd2YF6Gu+W2\n\
-4GK1kumBQBqCsbUgMBJ5PZs=\n\
------END PRIVATE KEY-----\n\
+-----BEGIN PUBLIC KEY-----\n\
+MDwwDQYJKoZIhvcNAQEBBQADKwAwKAIhAI2p1dyWYOPoNNEaQNukf72fMV5XxW0X\n\
+08Zg9L+HaFCTAgMBAAE=\n\
+-----END PUBLIC KEY-----\n\
 ";
 
 extern const char *PrivateKey;

Telegram/SourceFiles/rabbit/rabbit_version.h

@@ -7,6 +7,6 @@ For license and copyright information please follow this link:
 */
 #pragma once
 
-constexpr auto AppRabbitVersion = 4010004;
-constexpr auto AppRabbitVersionStr = "4.10.4";
+constexpr auto AppRabbitVersion = 4010005;
+constexpr auto AppRabbitVersionStr = "4.10.5";
 constexpr auto AppRabbitBetaVersion = true;

Telegram/build/setup.iss

@@ -1,14 +1,14 @@
 #define MyAppShortName "rabbitGram"
 #define MyAppName "rabbitGram Desktop"
 #define MyAppPublisher "xmdnx"
-#define MyAppVersion "4.10.4"
+#define MyAppVersion "4.10.5"
 #define MyAppURL "https://t.me/rabbitGramDesktop"
-#define ReleasePath "C:\Users\xmdnx\source\repos\rabbitGramDesktop\out\Release"
+#define ReleasePath "C:\Users\xmdnusr\source\repos\rabbitgramdesktop\out\Release"
 #define MyAppExeName "rabbitGram.exe"
 #define MyAppId "4356CE01-4137-4C55-9F8B-FB4EEBB6EC0C"
 #define CurrentYear GetDateTimeString('yyyy','','')
 #define MyBuildTarget "win64"
-#define MyAppVersionFull "4.10.4-22102023"
+#define MyAppVersionFull "4.10.5-26102023"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

prepare_version.py

@@ -76,7 +76,7 @@ def make_portable():
     set_repo_path()
 if config["version"] == "":
     set_version()
-rename_files()
+check_files()
 if config["make_setup"]:
     set_iss()
     run_iss_build()