diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index cb1108299..f220a893c 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -26,5 +26,5 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org constexpr int AppVersion = 9048; constexpr str_const AppVersionStr = "0.9.48"; -constexpr bool AppAlphaVersion = true; +constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h index e64547042..babc1f4f3 100644 --- a/Telegram/SourceFiles/ui/text/text_block.h +++ b/Telegram/SourceFiles/ui/text/text_block.h @@ -140,9 +140,9 @@ public: TextWord() = default; TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0) : _from(from) - , _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) , _width(width) - , _rpadding(rpadding) { + , _rpadding(rpadding) + , _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) { } uint16 from() const { return _from; diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index e0b8af549..551412216 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -124,6 +124,9 @@ fi if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols" + if [ ! -d "$DropboxSymbolsPath" ]; then + Error "Dropbox path not found!" + fi mkdir -p "$WorkPath/ReleaseIntermediateUpdater" cd "$WorkPath/ReleaseIntermediateUpdater" @@ -206,6 +209,9 @@ fi if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols" + if [ ! -d "$DropboxSymbolsPath" ]; then + Error "Dropbox path not found!" + fi if [ "$FastParam" != "fast" ]; then touch "./Resources/telegram.qrc" @@ -279,7 +285,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BetaVersion" == "0" ]; then cd "$ReleasePath" - temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` + cp -f tsetup_blank.dmg tsetup.dmg + temppath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` cp -R "./$BinaryName.app" "$temppath/" bless --folder "$temppath/" --openfolder "$temppath/" hdiutil detach "$temppath" diff --git a/Telegram/build/version b/Telegram/build/version index 406870c55..0c657fd1c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -2,5 +2,5 @@ AppVersion 9048 AppVersionStrMajor 0.9 AppVersionStrSmall 0.9.48 AppVersionStr 0.9.48 -AlphaChannel 1 +AlphaChannel 0 BetaVersion 0 diff --git a/doc/building-msvc.md b/doc/building-msvc.md index 6427a5f0c..20b1c4f48 100644 --- a/doc/building-msvc.md +++ b/doc/building-msvc.md @@ -86,6 +86,7 @@ or download in ZIP and extract to **D:\TBuild\Libraries\**, rename **libexif-0.6 Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > Programs > Visual Studio 2015** menu folder), go to **D:\\TBuild\\Libraries** and run git clone git://repo.or.cz/openal-soft.git + cd openal-soft git checkout 90349b38 git apply ./../../tdesktop/Telegram/Patches/openal.diff diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop index 2151d0ad4..35a5c61da 100644 --- a/lib/xdg/telegramdesktop.desktop +++ b/lib/xdg/telegramdesktop.desktop @@ -9,4 +9,4 @@ Terminal=false StartupWMClass=Telegram Type=Application Categories=Network; -MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg; +MimeType=x-scheme-handler/tg;