From e48fd5d0794a60f594c624b0fbbd8c21bc780dc6 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 3 Nov 2021 21:35:50 +0400 Subject: [PATCH] Revert "Re-enable -pie along with AppImage-like format hack." This reverts commit d58b9dc9545ebc4452f6b007ec39faa6d2494ffd. AppImage hack fired back: #17183 --- Telegram/build/build.sh | 12 +----------- cmake | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index 20994240d2..b982a3f5e6 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -164,18 +164,8 @@ if [ "$BuildTarget" == "linux" ]; then strip -s "$ReleasePath/$BinaryName" echo "Done!" - echo "Appending an icon.." - rm -rf "$ReleasePath/$BinaryName.AppDir" - rm -rf "$ReleasePath/$BinaryName.squashfs" - mkdir "$ReleasePath/$BinaryName.AppDir" - cp "$HomePath/Resources/art/logo_256.png" "$ReleasePath/$BinaryName.AppDir/.DirIcon" - cd "$ReleasePath" - mksquashfs "$BinaryName.AppDir" "$BinaryName.squashfs" -root-owned -noappend - cat "$BinaryName.squashfs" >> "$BinaryName" - echo "8: 414902" | xxd -r - "$BinaryName" - echo "Done!" - echo "Preparing version $AppVersionStrFull, executing Packer.." + cd "$ReleasePath" "./Packer" -path "$BinaryName" -path Updater -version $VersionForPacker $AlphaBetaParam echo "Packer done!" diff --git a/cmake b/cmake index 393ae95d7f..fc65d3305d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 393ae95d7f538301b572739d1305b41f4a54c1a5 +Subproject commit fc65d3305db9c194979a44fb9b71d290b39b6f5a