Version 2.4.5: Fix build on Xcode 12 and Linux.

This commit is contained in:
John Preston 2020-10-30 21:30:55 +03:00
parent cc9fa178e6
commit 303684fef5
9 changed files with 9 additions and 26 deletions

View File

@ -59,7 +59,7 @@ Version **1.8.15** was the last that supports older systems
## Build instructions
* [Visual Studio 2019][msvc]
* [Xcode 11][xcode]
* [Xcode 12][xcode]
* [CMake on GNU/Linux][cmake]
[//]: # (LINKS)

View File

@ -3409,7 +3409,6 @@ void HistoryWidget::mouseReleaseEvent(QMouseEvent *e) {
if (_replyForwardPressed) {
_replyForwardPressed = false;
update(0, _field->y() - st::historySendPadding - st::historyReplyHeight, width(), st::historyReplyHeight);
setupPinnedTracker(); AssertIsDebug();
}
if (_recording) {
stopRecording(_peer && _inField);

View File

@ -115,7 +115,7 @@ void WrapInvokeAfter(
auto cb = reinterpret_cast<const char*>(b);
volatile auto different = false;
for (const auto ce = ca + size; ca != ce; ++ca, ++cb) {
different |= (*ca != *cb);
different = different | (*ca != *cb);
}
return different;
}

@ -1 +1 @@
Subproject commit 3426bf778d306d41b1d1052fa06fa07ba24b2608
Subproject commit cbd43984ebdf783e94c8303c41385bf82aa36d5b

View File

@ -70,13 +70,7 @@ else
DeployMac="1"
DeployWin="1"
DeployLinux="1"
if [ "$AlphaVersion" == "0" ]; then
DeployOsx="1"
DeployLinux32="1"
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, macOS and Linux 64 bit.."
fi
echo "Deploying three versions of $AppVersionStrFull: for Windows, macOS and Linux 64 bit.."
fi
if [ "$BuildTarget" == "mac" ]; then
BackupPath="$HOME/Projects/backup/tdesktop"

View File

@ -184,13 +184,6 @@ files.append({
'mime': 'application/octet-stream',
'label': 'macOS 10.12+: Installer',
})
files.append({
'local': 'tsetup-osx.' + version_full + '.dmg',
'remote': 'tsetup-osx.' + version_full + '.dmg',
'backup_folder': 'tosx',
'mime': 'application/octet-stream',
'label': 'OS X 10.10 and 10.11: Installer',
})
files.append({
'local': 'tsetup.' + version_full + '.tar.xz',
'remote': 'tsetup.' + version_full + '.tar.xz',
@ -198,13 +191,6 @@ files.append({
'mime': 'application/octet-stream',
'label': 'Linux 64 bit: Binary',
})
files.append({
'local': 'tsetup32.' + version_full + '.tar.xz',
'remote': 'tsetup32.' + version_full + '.tar.xz',
'backup_folder': 'tlinux32',
'mime': 'application/octet-stream',
'label': 'Linux 32 bit: Binary',
})
files.append({
'local': 'sources',
'remote': 'tdesktop-' + version + '-full.tar.gz',

View File

@ -5,6 +5,7 @@
- Send several music tracks as a playlist.
- Send several files as an album in one chat bubble.
- Send a :slot_machine: emoji to any chat to see if you hit the jackpot.
- Hide Telegram taskbar icon on Linux in Settings > Advanced.
2.4.4 (23.10.20)

View File

@ -278,6 +278,8 @@ Go to ***BuildPath*** and run
-openssl-linked \
-I "$OPENSSL_DIR/include" \
OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
-I "/usr/local/include" \
LIBJPEG_LIBS="/usr/local/lib/libjpeg.a" \
-nomake examples \
-nomake tests

View File

@ -1,4 +1,4 @@
## Build instructions for Xcode 11
## Build instructions for Xcode 12
### Prepare folder
@ -80,6 +80,7 @@ Go to ***BuildPath*** and run
cmake -B build . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local/macos \
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 \
-DWITH_JPEG8=ON \
-DPNG_SUPPORTED=OFF
cmake --build build $MAKE_THREADS_CNT