diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp index 0daea75a1c..54ded4de8f 100644 --- a/Telegram/SourceFiles/core/utils.cpp +++ b/Telegram/SourceFiles/core/utils.cpp @@ -392,7 +392,6 @@ namespace ThirdParty { } else { LOG(("MTP Error: Could not init OpenSSL threads, CRYPTO_num_locks() returned zero!")); } - CRYPTO_THREADID_set_callback(_sslThreadId); } if (!CRYPTO_get_dynlock_create_callback()) { CRYPTO_set_dynlock_create_callback(_sslCreateFunction); @@ -419,9 +418,7 @@ namespace ThirdParty { #endif ENGINE_cleanup(); CONF_modules_unload(1); - ERR_remove_state(0); ERR_free_strings(); - ERR_remove_thread_state(nullptr); EVP_cleanup(); delete[] base::take(_sslLocks); diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp index 3775f7503b..85347c75bb 100644 --- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp +++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp @@ -48,7 +48,7 @@ void AlignedImageBufferCleanupHandler(void* data) { } void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) { -#ifdef TDESKTOP_OFFICIAL_TARGET +#ifndef TDESKTOP_OFFICIAL_TARGET // #TODO 5.12.5 const auto layout = &qPixelLayouts[QImage::Format_ARGB32]; const auto convert = layout->convertFromARGB32PM; #else // TDESKTOP_OFFICIAL_TARGET @@ -74,7 +74,7 @@ void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) { } void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) { -#ifdef TDESKTOP_OFFICIAL_TARGET +#ifndef TDESKTOP_OFFICIAL_TARGET // #TODO 5.12.5 const auto layout = &qPixelLayouts[QImage::Format_ARGB32]; const auto convert = layout->convertToARGB32PM; #else // TDESKTOP_OFFICIAL_TARGET diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index b6d9734de5..ef8fcf6dbf 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -578,7 +578,7 @@ void MainWindow::updateTrayMenu(bool force) { // On macOS just remove trayIcon menu if the window is not active. // So we will activate the window on click instead of showing the menu. - if (!active && Platform::IsMac()) { + if (!active && Platform::IsMac() && false) { // #TODO 5.12.5 iconMenu = nullptr; } } diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h index 9b8d8e8ecb..7eebb91726 100644 --- a/Telegram/SourceFiles/mtproto/core_types.h +++ b/Telegram/SourceFiles/mtproto/core_types.h @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/algorithm.h" #include "base/assertion.h" #include "tl/tl_basic_types.h" +#include "tl/tl_boxed.h" #include #include diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index 82805bf8ec..824bec2f61 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include +#include #include #include @@ -284,6 +285,15 @@ void objc_outputDebugString(const QString &str) { } void objc_start() { + // Patch: Fix macOS regression. On 10.14.4, it crashes on GPU switches. + // See https://bugreports.qt.io/browse/QTCREATORBUG-22215 + const auto version = QOperatingSystemVersion::current(); + if (version.majorVersion() == 10 + && version.minorVersion() == 14 + && version.microVersion() == 4) { + qputenv("QT_MAC_PRO_WEBENGINE_WORKAROUND", "1"); + } + _sharedDelegate = [[ApplicationDelegate alloc] init]; [[NSApplication sharedApplication] setDelegate:_sharedDelegate]; [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver: _sharedDelegate diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp index 5c3b13ba74..d8ebc80cea 100644 --- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp +++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp @@ -421,9 +421,9 @@ bool Get( } else { files = dialog.selectedFiles().mid(0, 1); } - if (type == Type::ReadFile || type == Type::ReadFiles) { - remoteContent = dialog.selectedRemoteContent(); - } + //if (type == Type::ReadFile || type == Type::ReadFiles) { + // remoteContent = dialog.selectedRemoteContent(); + //} return true; } diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp index a757d085f9..a33f12701e 100644 --- a/Telegram/SourceFiles/qt_static_plugins.cpp +++ b/Telegram/SourceFiles/qt_static_plugins.cpp @@ -7,15 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include -#ifdef Q_OS_WIN Q_IMPORT_PLUGIN(QWebpPlugin) +Q_IMPORT_PLUGIN(QJpegPlugin) +Q_IMPORT_PLUGIN(QGifPlugin) +#ifdef Q_OS_WIN Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) #elif defined Q_OS_MAC // Q_OS_WIN -Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC -Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QConnmanEnginePlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) diff --git a/Telegram/codegen b/Telegram/codegen index 0172289398..3a61c3a32c 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit 01722893988a6573e1ba910028fbc0c596c2ae5b +Subproject commit 3a61c3a32c51e652f639ae506201a31db48359f1 diff --git a/Telegram/gyp/helpers b/Telegram/gyp/helpers index ac60d8fa23..f70c0fda21 160000 --- a/Telegram/gyp/helpers +++ b/Telegram/gyp/helpers @@ -1 +1 @@ -Subproject commit ac60d8fa23ffca6bfc23efa0ee10696a47579ea6 +Subproject commit f70c0fda21bfe9d011bb1ff780f476826bb5f8a2 diff --git a/Telegram/gyp/telegram/linux.gypi b/Telegram/gyp/telegram/linux.gypi index 6350360316..494d1381e2 100644 --- a/Telegram/gyp/telegram/linux.gypi +++ b/Telegram/gyp/telegram/linux.gypi @@ -20,6 +20,7 @@ ], }, 'libraries': [ + '-Wl,-Bstatic', '-lbreakpad_client', '-llzma', '-lopenal', @@ -35,6 +36,10 @@ '-lvdpau', '-ldrm', '-lz', + '-lXi', + '-lXext', + '-lXfixes', + '-lXrender', # ' /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ diff --git a/Telegram/gyp/tests/tests.gyp b/Telegram/gyp/tests/tests.gyp index 0b43a0635e..43ae1d6969 100644 --- a/Telegram/gyp/tests/tests.gyp +++ b/Telegram/gyp/tests/tests.gyp @@ -12,7 +12,7 @@ 'src_loc': '../../SourceFiles', 'base_loc': '<(submodules_loc)/lib_base', 'rpl_loc': '<(submodules_loc)/lib_rpl', - 'mac_target': '10.10', + 'mac_target': '10.12', 'list_tests_command': 'python <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt', }, 'targets': [{ diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp index 15c5f65ae7..7d5dafaba0 100644 --- a/Telegram/gyp/utils.gyp +++ b/Telegram/gyp/utils.gyp @@ -57,40 +57,30 @@ 'target_name': 'Packer', 'variables': { 'src_loc': '../SourceFiles', - 'mac_target': '10.10', + 'mac_target': '10.12', }, 'includes': [ 'helpers/common/executable.gypi', 'helpers/modules/qt.gypi', + 'helpers/modules/openssl.gypi', ], 'conditions': [ [ 'build_win', { 'libraries': [ - 'libeay32', - 'ssleay32', - 'Crypt32', 'zlibstat', 'LzmaLib', ], }], [ 'build_linux', { 'libraries': [ - 'ssl', - 'crypto', + '<(linux_lib_ssl)', + '<(linux_lib_crypto)', 'lzma', ], }], [ 'build_mac', { - 'include_dirs': [ - '<(libs_loc)/openssl/include' - ], - 'library_dirs': [ - '<(libs_loc)/openssl', - ], 'xcode_settings': { 'OTHER_LDFLAGS': [ - '-lssl', - '-lcrypto', '-llzma', ], }, diff --git a/Telegram/lib_base b/Telegram/lib_base index cfc1a874eb..dd5ca832f9 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit cfc1a874eb603c345f60be2ce98a885d9f336d14 +Subproject commit dd5ca832f9b212e553ea5afee9a2dab2c3acd982 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index f762cc8b87..aa6bf8b0e7 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit f762cc8b87ba16706e402b6d66b1451402357555 +Subproject commit aa6bf8b0e7c18426140a15e79a43f7d24b62c80a diff --git a/docs/building-cmake.md b/docs/building-cmake.md index 5f5a0df913..bda4edefcd 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -204,10 +204,10 @@ Go to ***BuildPath*** and run sudo make install cd ../.. - git clone https://github.com/openssl/openssl - cd openssl - git checkout OpenSSL_1_0_1-stable - ./config + git clone https://github.com/openssl/openssl openssl_1_1_1 + cd openssl_1_1_1 + git checkout OpenSSL_1_1_1-stable + ./config --prefix=/usr/local/desktop-app/openssl-1.1.1 make $MAKE_THREADS_CNT sudo make install cd .. @@ -220,20 +220,21 @@ Go to ***BuildPath*** and run sudo make install cd .. - git clone git://code.qt.io/qt/qt5.git qt5_6_2 - cd qt5_6_2 + git clone git://code.qt.io/qt/qt5.git qt_5_12_5 + cd qt_5_12_5 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.2 - cd qtimageformats && git checkout v5.6.2 && cd .. - cd qtbase && git checkout v5.6.2 && cd .. - cd qtbase && git apply ../../patches/qtbase_5_6_2.diff && cd .. - cd qtbase/src/plugins/platforminputcontexts + git checkout v5.12.5 + git submodule update qtbase + git submodule update qtimageformats + 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 cd ../../../.. - ./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests + ./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 make $MAKE_THREADS_CNT sudo make install diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 8324432a0c..57bcbdc5d8 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -57,6 +57,8 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** mkdir Libraries cd Libraries + SET LibrariesPath=%cd% + git clone https://github.com/desktop-app/patches.git git clone --branch 0.9.1 https://github.com/ericniebler/range-v3 range-v3 @@ -66,15 +68,21 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** msbuild LzmaLib.sln /property:Configuration=Release cd ..\..\..\.. - git clone https://github.com/openssl/openssl.git - cd openssl - git checkout OpenSSL_1_0_1-stable - perl Configure no-shared --prefix="C:\Program Files (x86)\OpenSSL" --openssldir="C:\Program Files (x86)\Common Files\SSL" VC-WIN32 - ms\do_ms - nmake -f ms\nt.mak - perl Configure no-shared --prefix="C:\Program Files (x86)\OpenSSL" --openssldir="C:\Program Files (x86)\Common Files\SSL" debug-VC-WIN32 - ms\do_ms - nmake -f ms\nt.mak + git clone https://github.com/openssl/openssl.git openssl_1_1_1 + cd openssl_1_1_1 + git checkout OpenSSL_1_1_1-stable + perl Configure no-share VC-WIN32 + nmake + mkdir out32 + move libcrypto.lib out32 + move libssl.lib out32 + move ossl_static.pdb out32 + perl Configure no-shared debug-VC-WIN32 + nmake + mkdir out32.dbg + move libcrypto.lib out32.dbg + move libssl.lib out32.dbg + move ossl_static.pdb out32.dbg cd .. git clone https://github.com/telegramdesktop/zlib.git @@ -133,18 +141,14 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** SET PATH=%PATH_BACKUP_% cd .. - git clone git://code.qt.io/qt/qt5.git qt5_6_2 - cd qt5_6_2 + git clone git://code.qt.io/qt/qt5.git qt_5_12_5 + cd qt_5_12_5 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.2 - cd qtimageformats - git checkout v5.6.2 - cd ..\qtbase - git checkout v5.6.2 - git apply ../../patches/qtbase_5_6_2.diff - cd .. + git checkout v5.12.5 + git submodule update qtbase + git submodule update qtimageformats - configure -debug-and-release -force-debug-info -opensource -confirm-license -static -I "%cd%\..\openssl\inc32" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%cd%\..\openssl\out32.dbg\ssleay32.lib %cd%\..\openssl\out32.dbg\libeay32.lib" OPENSSL_LIBS_RELEASE="%cd%\..\openssl\out32\ssleay32.lib %cd%\..\openssl\out32\libeay32.lib" -mp -nomake examples -nomake tests -platform win32-msvc2015 + configure -prefix "%LibrariesPath%\Qt-5.12.5" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%cd%\..\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%cd%\..\openssl_1_1_1\out32.dbg\libssl.lib %cd%\..\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%cd%\..\openssl_1_1_1\out32\libssl.lib %cd%\..\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc jom -j4 jom -j4 install diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 2fa5a2ac62..736ecdc239 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -10,16 +10,16 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. ### Download libraries -Download [**xz-5.0.5**](http://tukaani.org/xz/xz-5.0.5.tar.gz) and unpack to ***BuildPath*/Libraries/xz-5.0.5** +Download [**xz-5.0.5**](http://tukaani.org/xz/xz-5.0.5.tar.gz) and unpack to ***BuildPath*/Libraries/macos/xz-5.0.5** -Download [**libiconv-1.15**](http://www.gnu.org/software/libiconv/#downloading) and unpack to ***BuildPath*/Libraries/libiconv-1.15** +Download [**libiconv-1.15**](http://www.gnu.org/software/libiconv/#downloading) and unpack to ***BuildPath*/Libraries/macos/libiconv-1.15** ### Clone source code and prepare libraries Go to ***BuildPath*** and run - MAKE_THREADS_CNT=-j4 - MACOSX_DEPLOYMENT_TARGET=10.8 + MAKE_THREADS_CNT=-j8 + MACOSX_DEPLOYMENT_TARGET=10.12 ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew install automake cmake fdk-aac git lame libass libtool libvorbis libvpx ninja opus sdl shtool texi2html theora wget x264 xvid yasm pkg-config @@ -28,28 +28,43 @@ Go to ***BuildPath*** and run git clone --recursive https://github.com/telegramdesktop/tdesktop.git - cd Libraries + mkdir ThirdParty + cd ThirdParty + + git clone https://github.com/desktop-app/patches.git + git clone https://chromium.googlesource.com/external/gyp + git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git + export PATH="$PWD/depot_tools:$PATH" + cd gyp + git checkout 9f2a7bb1 + git apply ../patches/gyp.diff + ./setup.py build + sudo ./setup.py install + cd ../.. + + cd Libraries/macos + LibrariesPath=`pwd` git clone https://github.com/desktop-app/patches.git git clone --branch 0.9.1 https://github.com/ericniebler/range-v3 cd xz-5.0.5 - CFLAGS="-mmacosx-version-min=10.8" LDFLAGS="-mmacosx-version-min=10.8" ./configure - make + CFLAGS="-mmacosx-version-min=10.12" LDFLAGS="-mmacosx-version-min=10.12" ./configure --prefix=/usr/local/macos + make $MAKE_THREADS_CNT sudo make install cd .. git clone https://github.com/telegramdesktop/zlib.git cd zlib - CFLAGS="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.8" ./configure + 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 sudo make install cd .. - git clone https://github.com/openssl/openssl - cd openssl - git checkout OpenSSL_1_0_1-stable - ./Configure darwin64-x86_64-cc -static -mmacosx-version-min=10.8 + git clone https://github.com/openssl/openssl openssl_1_1_1 + cd openssl_1_1_1 + git checkout OpenSSL_1_1_1-stable + ./Configure --prefix=/usr/local/macos darwin64-x86_64-cc -static -mmacosx-version-min=10.12 make build_libs $MAKE_THREADS_CNT cd .. @@ -57,13 +72,13 @@ Go to ***BuildPath*** and run cd opus git checkout v1.3 ./autogen.sh - CFLAGS="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" CPPFLAGS="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.8" ./configure + CFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" CPPFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.12" ./configure --prefix=/usr/local/macos make $MAKE_THREADS_CNT sudo make install cd .. cd libiconv-1.15 - CFLAGS="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" CPPFLAGS="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.8" ./configure --enable-static + CFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" CPPFLAGS="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" LDFLAGS="-mmacosx-version-min=10.12" ./configure --enable-static --prefix=/usr/local/macos make $MAKE_THREADS_CNT sudo make install cd .. @@ -75,10 +90,10 @@ Go to ***BuildPath*** and run LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig - ./configure --prefix=/usr/local \ - --extra-cflags="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" \ - --extra-cxxflags="-mmacosx-version-min=10.8 -Werror=unguarded-availability-new" \ - --extra-ldflags="-mmacosx-version-min=10.8" \ + ./configure --prefix=/usr/local/macos \ + --extra-cflags="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" \ + --extra-cxxflags="-mmacosx-version-min=10.12 -Werror=unguarded-availability-new" \ + --extra-ldflags="-mmacosx-version-min=10.12" \ --enable-protocol=file --enable-libopus \ --disable-programs \ --disable-doc \ @@ -184,49 +199,42 @@ Go to ***BuildPath*** and run cd openal-soft git checkout v1.19 cd build - CFLAGS='-Werror=unguarded-availability-new' CPPFLAGS='-Werror=unguarded-availability-new' LDFLAGS='-stdlib=libc++' cmake -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8 .. + CFLAGS='-Werror=unguarded-availability-new' CPPFLAGS='-Werror=unguarded-availability-new' cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 .. make $MAKE_THREADS_CNT sudo make install cd ../.. - git clone https://chromium.googlesource.com/external/gyp - git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - export PATH="$PWD/depot_tools:$PATH" - cd gyp - git checkout 9f2a7bb1 - git apply ../patches/gyp.diff - ./setup.py build - sudo ./setup.py install - cd .. - git clone https://chromium.googlesource.com/crashpad/crashpad.git cd crashpad git checkout feb3aa3923 - git apply ../../tdesktop/Telegram/Patches/crashpad.diff + git apply ../../../tdesktop/Telegram/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 ../../../../../../tdesktop/Telegram/Patches/mini_chromium.diff cd ../../gtest git clone https://chromium.googlesource.com/external/github.com/google/googletest gtest cd gtest git checkout d62d6c6556 cd ../../.. - build/gyp_crashpad.py -Dmac_deployment_target=10.8 + build/gyp_crashpad.py -Dmac_deployment_target=10.10 ninja -C out/Debug ninja -C out/Release cd .. - git clone git://code.qt.io/qt/qt5.git qt5_6_2 - cd qt5_6_2 + git clone git://code.qt.io/qt/qt5.git qt5_12_5 + cd qt5_12_5 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.2 - cd qtimageformats && git checkout v5.6.2 && cd .. - cd qtbase && git checkout v5.6.2 && git apply ../../patches/qtbase_5_6_2.diff && cd .. + git checkout v5.12.5 + git submodule update qtbase + git submodule update qtimageformats + cd qtbase + git apply ../../patches/qtbase_5_12_5.diff + cd .. - ./configure -prefix "/usr/local/desktop-app/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang + ./configure -prefix "/usr/local/desktop-app/Qt-5.12.5" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang make $MAKE_THREADS_CNT sudo make install cd ..