MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove 'mac32' and add 'osx' special targets.

Browse Source
This commit is contained in:
John Preston 2019-11-05 15:27:42 +03:00
parent 9a44531953
commit b94ed1fc3b
14 changed files with 96 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/_other/packer.cpp
View File

@ -148,7 +148,7 @@ int main(int argc, char *argv[])
QString remove;
int version = 0;
bool target32 = false;
bool targetosx = false;
QFileInfoList files;
for (int i = 0; i < argc; ++i) {
if (string("-path") == argv[i] && i + 1 < argc) {
@ -157,7 +157,7 @@ int main(int argc, char *argv[])
files.push_back(info);
if (remove.isEmpty()) remove = info.canonicalPath() + "/";
} else if (string("-target") == argv[i] && i + 1 < argc) {
target32 = (string("mac32") == argv[i + 1]);
targetosx = (string("osx") == argv[i + 1]);
} else if (string("-version") == argv[i] && i + 1 < argc) {
version = QString(argv[i + 1]).toInt();
} else if (string("-beta") == argv[i]) {
@ -466,7 +466,7 @@ int main(int argc, char *argv[])
#ifdef Q_OS_WIN
QString outName(QString("tupdate%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_MAC
QString outName((target32 ? QString("tmac32upd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_LINUX32
QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_LINUX64

4
Telegram/SourceFiles/boxes/about_box.cpp
View File

@ -92,8 +92,8 @@ void AboutBox::showVersionHistory() {
auto url = qsl("https://tdesktop.com/");
if (Platform::IsWindows()) {
url += qsl("win/%1.zip");
} else if (Platform::IsMacOldBuild()) {
url += qsl("mac32/%1.zip");
} else if (Platform::IsOSXBuild()) {
url += qsl("osx/%1.zip");
} else if (Platform::IsMac()) {
url += qsl("mac/%1.zip");
} else if (Platform::IsLinux32Bit()) {

4
Telegram/SourceFiles/core/crash_reports.cpp
View File

@ -328,8 +328,8 @@ QString PlatformString() {
return qsl("Windows");
} else if (Platform::IsMacStoreBuild()) {
return qsl("MacAppStore");
} else if (Platform::IsMacOldBuild()) {
return qsl("MacOSold");
} else if (Platform::IsOSXBuild()) {
return qsl("OSX");
} else if (Platform::IsMac()) {
return qsl("MacOS");
} else if (Platform::IsLinux32Bit()) {

2
Telegram/SourceFiles/core/update_checker.cpp
View File

@ -222,7 +222,7 @@ QString FindUpdateFile() {
"^("
"tupdate|"
"tmacupd|"
"tmac32upd|"
"tosxupd|"
"tlinuxupd|"
"tlinux32upd"
")\\d+(_[a-z\\d]+)?$",

2
Telegram/ThirdParty/libtgvoip vendored

@ -1 +1 @@
Subproject commit d4a0f719ffd8d29e88474f67abc9fc862661c3b9
Subproject commit 6151c18784cdd7fb152588a66939296b7bc87c25

76
Telegram/build/build.sh
View File

@ -61,7 +61,7 @@ elif [ "$BuildTarget" == "linux32" ]; then
ReleasePath="$HomePath/../out/Release"
BinaryName="Telegram"
elif [ "$BuildTarget" == "mac" ]; then
echo "Building version $AppVersionStrFull for OS X 10.8+.."
echo "Building version $AppVersionStrFull for macOS 10.12+.."
if [ "$AC_USERNAME" == "" ]; then
Error "AC_USERNAME not found!"
fi
@ -69,10 +69,10 @@ elif [ "$BuildTarget" == "mac" ]; then
SetupFile="tsetup.$AppVersionStrFull.dmg"
ReleasePath="$HomePath/../out/Release"
BinaryName="Telegram"
elif [ "$BuildTarget" == "mac32" ]; then
echo "Building version $AppVersionStrFull for OS X 10.6 and 10.7.."
UpdateFile="tmac32upd$AppVersion"
SetupFile="tsetup32.$AppVersionStrFull.dmg"
elif [ "$BuildTarget" == "osx" ]; then
echo "Building version $AppVersionStrFull for OS X 10.10 and 10.11.."
UpdateFile="tosxupd$AppVersion"
SetupFile="tsetup-osx.$AppVersionStrFull.dmg"
ReleasePath="$HomePath/../out/Release"
BinaryName="Telegram"
elif [ "$BuildTarget" == "macstore" ]; then
@ -87,31 +87,29 @@ else
Error "Invalid target!"
fi
#if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ] || [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
if [ "$AlphaVersion" != "0" ]; then
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull" ]; then
Error "Deploy folder for version $AppVersionStrFull already exists!"
fi
else
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.alpha" ]; then
Error "Deploy folder for version $AppVersionStr.alpha already exists!"
fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.beta" ]; then
Error "Deploy folder for version $AppVersionStr.beta already exists!"
fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr" ]; then
Error "Deploy folder for version $AppVersionStr already exists!"
fi
if [ -f "$ReleasePath/$UpdateFile" ]; then
Error "Update file for version $AppVersion already exists!"
fi
if [ "$AlphaVersion" != "0" ]; then
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull" ]; then
Error "Deploy folder for version $AppVersionStrFull already exists!"
fi
else
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.alpha" ]; then
Error "Deploy folder for version $AppVersionStr.alpha already exists!"
fi
DeployPath="$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull"
#fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr.beta" ]; then
Error "Deploy folder for version $AppVersionStr.beta already exists!"
fi
if [ -d "$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStr" ]; then
Error "Deploy folder for version $AppVersionStr already exists!"
fi
if [ -f "$ReleasePath/$UpdateFile" ]; then
Error "Update file for version $AppVersion already exists!"
fi
fi
DeployPath="$ReleasePath/deploy/$AppVersionStrMajor/$AppVersionStrFull"
if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
@ -243,7 +241,7 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
fi
fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ] || [ "$BuildTarget" == "macstore" ]; then
DropboxSymbolsPath="$HOME/Dropbox/Telegram/symbols"
if [ ! -d "$DropboxSymbolsPath" ]; then
@ -266,7 +264,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
Error "$BinaryName.app.dSYM not found!"
fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ]; then
if [ ! -f "$ReleasePath/$BinaryName.app/Contents/Frameworks/Updater" ]; then
Error "Updater not found!"
fi
@ -289,7 +287,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
echo "Done!"
echo "Signing the application.."
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ]; then
codesign --force --deep --timestamp --options runtime --sign "Developer ID Application: John Preston" "$ReleasePath/$BinaryName.app" --entitlements "$HomePath/Telegram/Telegram.entitlements"
elif [ "$BuildTarget" == "macstore" ]; then
codesign --force --deep --sign "3rd Party Mac Developer Application: TELEGRAM MESSENGER LLP (6N38VWS5BX)" "$ReleasePath/$BinaryName.app" --entitlements "$HomePath/Telegram/Telegram Desktop.entitlements"
@ -316,7 +314,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
Error "$BinaryName signature not found!"
fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ]; then
if [ ! -f "$ReleasePath/$BinaryName.app/Contents/Frameworks/Updater" ]; then
Error "Updater not found in Frameworks!"
fi
@ -332,7 +330,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
cp "$ReleasePath/$BinaryName.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/"
echo "Done!"
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ]; then
cd "$ReleasePath"
if [ "$AlphaVersion" == "0" ]; then
cp -f tsetup_template.dmg tsetup.temp.dmg
@ -452,7 +450,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
mkdir "$ReleasePath/deploy/$AppVersionStrMajor"
fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "osx" ]; then
echo "Copying $BinaryName.app and $UpdateFile to deploy/$AppVersionStrMajor/$AppVersionStr..";
mkdir "$DeployPath"
mkdir "$DeployPath/$BinaryName"
@ -476,12 +474,12 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac/"
fi
fi
if [ "$BuildTarget" == "mac32" ]; then
mkdir -p "$BackupPath/tmac32"
cp "$DeployPath/$UpdateFile" "$BackupPath/tmac32/"
cp "$DeployPath/$SetupFile" "$BackupPath/tmac32/"
if [ "$BuildTarget" == "osx" ]; then
mkdir -p "$BackupPath/tosx"
cp "$DeployPath/$UpdateFile" "$BackupPath/tosx/"
cp "$DeployPath/$SetupFile" "$BackupPath/tosx/"
if [ "$AlphaVersion" != "0" ]; then
cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tmac32/"
cp -v "$DeployPath/$AlphaKeyFile" "$BackupPath/tosx/"
fi
fi
elif [ "$BuildTarget" == "macstore" ]; then

46
Telegram/build/deploy.sh
View File

@ -47,16 +47,16 @@ fi
echo ""
HomePath="$FullScriptPath/.."
DeployMac="0"
DeployMac32="0"
DeployOsx="0"
DeployWin="0"
DeployLinux="0"
DeployLinux32="0"
if [ "$DeployTarget" == "mac" ]; then
DeployMac="1"
echo "Deploying version $AppVersionStrFull for OS X 10.8+.."
elif [ "$DeployTarget" == "mac32" ]; then
DeployMac32="1"
echo "Deploying version $AppVersionStrFull for OS X 10.6 and 10.7.."
echo "Deploying version $AppVersionStrFull for macOS.."
elif [ "$DeployTarget" == "osx" ]; then
DeployOsx="1"
echo "Deploying version $AppVersionStrFull for OS X 10.10 and 10.11.."
elif [ "$DeployTarget" == "win" ]; then
DeployWin="1"
echo "Deploying version $AppVersionStrFull for Windows.."
@ -71,11 +71,11 @@ else
DeployWin="1"
DeployLinux="1"
if [ "$AlphaVersion" == "0" ]; then
DeployMac32="1"
DeployOsx="1"
DeployLinux32="1"
echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.6 and 10.7, OS X 10.8+, Linux 64 bit and Linux 32 bit.."
echo "Deploying five versions of $AppVersionStrFull: for Windows, OS X 10.10 and 10.11, macOS, Linux 64 bit and Linux 32 bit.."
else
echo "Deploying three versions of $AppVersionStrFull: for Windows, OS X 10.8+ and Linux 64 bit.."
echo "Deploying three versions of $AppVersionStrFull: for Windows, macOS and Linux 64 bit.."
fi
fi
if [ "$BuildTarget" == "mac" ]; then
@ -89,10 +89,10 @@ MacDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tmac"
MacUpdateFile="tmacupd$AppVersion"
MacSetupFile="tsetup.$AppVersionStrFull.dmg"
MacRemoteFolder="tmac"
Mac32DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tmac32"
Mac32UpdateFile="tmac32upd$AppVersion"
Mac32SetupFile="tsetup32.$AppVersionStrFull.dmg"
Mac32RemoteFolder="tmac32"
OsxDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tosx"
OsxUpdateFile="tosxupd$AppVersion"
OsxSetupFile="tsetup-osx.$AppVersionStrFull.dmg"
OsxRemoteFolder="tosx"
WinDeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull/tsetup"
WinUpdateFile="tupdate$AppVersion"
WinSetupFile="tsetup.$AppVersionStrFull.exe"
@ -111,8 +111,8 @@ DeployPath="$BackupPath/$AppVersionStrMajor/$AppVersionStrFull"
if [ "$AlphaVersion" != "0" ]; then
if [ "$DeployTarget" == "win" ]; then
AlphaFilePath="$WinDeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "mac32" ]; then
AlphaFilePath="$Mac32DeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "osx" ]; then
AlphaFilePath="$OsxDeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "linux" ]; then
AlphaFilePath="$LinuxDeployPath/$AlphaKeyFile"
elif [ "$DeployTarget" == "linux32" ]; then
@ -130,8 +130,8 @@ if [ "$AlphaVersion" != "0" ]; then
MacUpdateFile="${MacUpdateFile}_${AlphaSignature}"
MacSetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
Mac32UpdateFile="${Mac32UpdateFile}_${AlphaSignature}"
Mac32SetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
OsxUpdateFile="${OsxUpdateFile}_${AlphaSignature}"
OsxSetupFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
WinUpdateFile="${WinUpdateFile}_${AlphaSignature}"
WinPortableFile="talpha${AlphaVersion}_${AlphaSignature}.zip"
LinuxUpdateFile="${LinuxUpdateFile}_${AlphaSignature}"
@ -148,12 +148,12 @@ if [ "$DeployMac" == "1" ]; then
Error "$MacDeployPath/$MacSetupFile not found!"
fi
fi
if [ "$DeployMac32" == "1" ]; then
if [ ! -f "$Mac32DeployPath/$Mac32UpdateFile" ]; then
Error "$Mac32UpdateFile not found!"
if [ "$DeployOsx" == "1" ]; then
if [ ! -f "$OsxDeployPath/$OsxUpdateFile" ]; then
Error "$OsxUpdateFile not found!"
fi
if [ ! -f "$Mac32DeployPath/$Mac32SetupFile" ]; then
Error "$Mac32SetupFile not found!"
if [ ! -f "$OsxDeployPath/$OsxSetupFile" ]; then
Error "$OsxSetupFile not found!"
fi
fi
if [ "$DeployWin" == "1" ]; then
@ -192,8 +192,8 @@ declare -a Files
if [ "$DeployMac" == "1" ]; then
Files+=("tmac/$MacUpdateFile" "tmac/$MacSetupFile")
fi
if [ "$DeployMac32" == "1" ]; then
Files+=("tmac32/$Mac32UpdateFile" "tmac32/$Mac32SetupFile")
if [ "$DeployOsx" == "1" ]; then
Files+=("tosx/$OsxUpdateFile" "tosx/$OsxSetupFile")
fi
if [ "$DeployWin" == "1" ]; then
Files+=("tsetup/$WinUpdateFile" "tsetup/$WinPortableFile")

14
Telegram/build/release.py
View File

@ -93,8 +93,8 @@ if access_token == '':
print('Access token not found!')
sys.exit(1)
print('Version: ' + version_full);
local_folder = expanduser("~") + '/Telegram/backup/' + version_major + '/' + version_full
print('Version: ' + version_full)
local_folder = expanduser("~") + '/Projects/backup/tdesktop/' + version_major + '/' + version_full
if stable == 1:
if os.path.isdir(local_folder + '.beta'):
@ -129,14 +129,14 @@ files.append({
'remote': 'tsetup.' + version_full + '.dmg',
'backup_folder': 'tmac',
'mime': 'application/octet-stream',
'label': 'macOS and OS X 10.8+: Installer',
'label': 'macOS 10.12+: Installer',
})
files.append({
'local': 'tsetup32.' + version_full + '.dmg',
'remote': 'tsetup32.' + version_full + '.dmg',
'backup_folder': 'tmac32',
'local': 'tsetup-osx.' + version_full + '.dmg',
'remote': 'tsetup-osx.' + version_full + '.dmg',
'backup_folder': 'tosx',
'mime': 'application/octet-stream',
'label': 'OS X 10.6 and 10.7: Installer',
'label': 'OS X 10.10 and 10.11: Installer',
})
files.append({
'local': 'tsetup.' + version_full + '.tar.xz',

2
Telegram/gyp/helpers

@ -1 +1 @@
Subproject commit 3a10166f5c99a4658c70480b3e8ec8c0f2870219
Subproject commit f450301417d8b7bd7fed660cf7520ae7ead10c60

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 11a5031d22cd6405525cef93c8d681c485320a77
Subproject commit 33f64d6d9de493acb287154a557f25bd8eb50bb4

10
docs/building-cmake.md
View File

@ -44,11 +44,11 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/madler/zlib.git
cd zlib
./configure
make $MAKE_THREADS_CNT
@ -232,9 +232,9 @@ Go to ***BuildPath*** and run
cd qtbase
git apply ../../patches/qtbase_5_12_5.diff
cd src/plugins/platforminputcontexts
git clone https://github.com/telegramdesktop/fcitx.git
git clone https://github.com/telegramdesktop/hime.git
git clone https://github.com/telegramdesktop/nimf.git
git clone https://github.com/desktop-app/fcitx.git
git clone https://github.com/desktop-app/hime.git
git clone https://github.com/desktop-app/nimf.git
cd ../../../..
./configure -prefix "/usr/local/desktop-app/Qt-5.12.5" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-harfbuzz -qt-pcre -qt-xcb -system-freetype -fontconfig -no-opengl -no-gtk -static -openssl-linked -I "/usr/local/desktop-app/openssl-1.1.1/include" OPENSSL_LIBS="/usr/local/desktop-app/openssl-1.1.1/lib/libssl.a /usr/local/desktop-app/openssl-1.1.1/lib/libcrypto.a -ldl -lpthread" -nomake examples -nomake tests

10
docs/building-msvc.md
View File

@ -32,7 +32,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df4
cd ../
git clone https://chromium.googlesource.com/external/gyp
cd gyp
@ -64,11 +64,11 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
cd ../
git checkout b0ec5df
cd ..
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3 range-v3
git clone https://github.com/telegramdesktop/lzma.git
git clone https://github.com/desktop-app/lzma.git
cd lzma\C\Util\LzmaLib
msbuild LzmaLib.sln /property:Configuration=Debug
msbuild LzmaLib.sln /property:Configuration=Release
@ -93,7 +93,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
move ossl_static.pdb out32
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
git checkout tdesktop
cd contrib\vstudio\vc14

6
docs/building-osx.md
View File

@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@ -60,7 +60,7 @@ Go to ***BuildPath*** and run
sudo make install
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
CFLAGS="-mmacosx-version-min=10.10 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.10" ./configure
make $MAKE_THREADS_CNT

10
docs/building-xcode.md
View File

@ -33,7 +33,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
@ -50,7 +50,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout db1239ce64
git checkout b0ec5df
cd ../
git clone --branch 0.9.1 https://github.com/ericniebler/range-v3
@ -60,7 +60,7 @@ Go to ***BuildPath*** and run
sudo make install
cd ..
git clone https://github.com/telegramdesktop/zlib.git
git clone https://github.com/desktop-app/zlib.git
cd zlib
CFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.12" ./configure --prefix=/usr/local/macos
make $MAKE_THREADS_CNT
@ -213,12 +213,12 @@ Go to ***BuildPath*** and run
git clone https://chromium.googlesource.com/crashpad/crashpad.git
cd crashpad
git checkout feb3aa3923
git apply ../../../tdesktop/Telegram/Patches/crashpad.diff
git apply ../../patches/crashpad.diff
cd third_party/mini_chromium
git clone https://chromium.googlesource.com/chromium/mini_chromium
cd mini_chromium
git checkout 7c5b0c1ab4
git apply ../../../../../../tdesktop/Telegram/Patches/mini_chromium.diff
git apply ../../../../../patches/mini_chromium.diff
cd ../../gtest
git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest
cd gtest