procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into mentions 

Conflicts:
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/build/version
This commit is contained in:
John Preston 2016-05-10 14:19:01 +03:00
parent f02fc4dd96 fd7f618fd2
commit 107a1e7e5d
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/core/version.h
View File

@ -26,5 +26,5 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
constexpr int AppVersion = 9048; constexpr int AppVersion = 9048;
constexpr str_const AppVersionStr = "0.9.48"; constexpr str_const AppVersionStr = "0.9.48";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

4
Telegram/SourceFiles/ui/text/text_block.h
View File

@ -140,9 +140,9 @@ public:
TextWord() = default; TextWord() = default;
TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0) TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0)
: _from(from) : _from(from)
, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value()))
, _width(width) , _width(width)
, _rpadding(rpadding) { , _rpadding(rpadding)
, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) {
} }
uint16 from() const { uint16 from() const {
return _from; return _from;

9
Telegram/build/build.sh
View File

@ -124,6 +124,9 @@ fi
if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols" DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols"
if [ ! -d "$DropboxSymbolsPath" ]; then
Error "Dropbox path not found!"
fi
mkdir -p "$WorkPath/ReleaseIntermediateUpdater" mkdir -p "$WorkPath/ReleaseIntermediateUpdater"
cd "$WorkPath/ReleaseIntermediateUpdater" cd "$WorkPath/ReleaseIntermediateUpdater"
@ -206,6 +209,9 @@ fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols" DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols"
if [ ! -d "$DropboxSymbolsPath" ]; then
Error "Dropbox path not found!"
fi
if [ "$FastParam" != "fast" ]; then if [ "$FastParam" != "fast" ]; then
touch "./Resources/telegram.qrc" touch "./Resources/telegram.qrc"
@ -279,7 +285,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BetaVersion" == "0" ]; then if [ "$BetaVersion" == "0" ]; then
cd "$ReleasePath" 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/" cp -R "./$BinaryName.app" "$temppath/"
bless --folder "$temppath/" --openfolder "$temppath/" bless --folder "$temppath/" --openfolder "$temppath/"
hdiutil detach "$temppath" hdiutil detach "$temppath"

2
Telegram/build/version
View File

@ -2,5 +2,5 @@ AppVersion 9048
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.48 AppVersionStrSmall 0.9.48
AppVersionStr 0.9.48 AppVersionStr 0.9.48
AlphaChannel 1 AlphaChannel 0
BetaVersion 0 BetaVersion 0

1
doc/building-msvc.md
View File

@ -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 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 git clone git://repo.or.cz/openal-soft.git
cd openal-soft
git checkout 90349b38 git checkout 90349b38
git apply ./../../tdesktop/Telegram/Patches/openal.diff git apply ./../../tdesktop/Telegram/Patches/openal.diff

2
lib/xdg/telegramdesktop.desktop
View File

@ -9,4 +9,4 @@ Terminal=false
StartupWMClass=Telegram StartupWMClass=Telegram
Type=Application Type=Application
Categories=Network; Categories=Network;
MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg; MimeType=x-scheme-handler/tg;