RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Beta version 2.8.12: Fix build on Linux.

This commit is contained in:
John Preston 2021-07-23 20:42:24 +03:00
parent 245909e381
commit 99505b4ee2
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,8 +160,7 @@ int main(int argc, char *argv[])
QString remove; QString remove;
int version = 0; int version = 0;
bool targetosx = false; [[maybe_unused]] bool targetwin64 = false;
bool targetwin64 = false;
QFileInfoList files; QFileInfoList files;
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
if (string("-path") == argv[i] && i + 1 < argc) { if (string("-path") == argv[i] && i + 1 < argc) {
@ -170,7 +169,6 @@ int main(int argc, char *argv[])
files.push_back(info); files.push_back(info);
if (remove.isEmpty()) remove = info.canonicalPath() + "/"; if (remove.isEmpty()) remove = info.canonicalPath() + "/";
} else if (string("-target") == argv[i] && i + 1 < argc) { } else if (string("-target") == argv[i] && i + 1 < argc) {
targetosx = (string("osx") == argv[i + 1]);
targetwin64 = (string("win64") == argv[i + 1]); targetwin64 = (string("win64") == argv[i + 1]);
} else if (string("-version") == argv[i] && i + 1 < argc) { } else if (string("-version") == argv[i] && i + 1 < argc) {
version = QString(argv[i + 1]).toInt(); version = QString(argv[i + 1]).toInt();
@ -496,7 +494,7 @@ int main(int argc, char *argv[])
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version)); QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_MAC #elif defined Q_OS_MAC
QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version)); QString outName(QString("tmacupd%1").arg(AlphaVersion ? AlphaVersion : version));
#elif defined Q_OS_UNIX #elif defined Q_OS_UNIX
#ifndef _LP64 #ifndef _LP64
QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version)); QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));

5
Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
View File

@ -63,7 +63,6 @@ public:
[[nodiscard]] rpl::producer<> activations() const; [[nodiscard]] rpl::producer<> activations() const;
void setActive(bool active); void setActive(bool active);
[[nodiscard]] bool isWindow() const;
[[nodiscard]] QString deviceIdKey() const; [[nodiscard]] QString deviceIdKey() const;
[[nodiscard]] rpl::lifetime &lifetime(); [[nodiscard]] rpl::lifetime &lifetime();
@ -171,10 +170,6 @@ rpl::producer<> Source::activations() const {
return _activations.events(); return _activations.events();
} }
bool Source::isWindow() const {
return _source.isWindow();
}
QString Source::deviceIdKey() const { QString Source::deviceIdKey() const {
return QString::fromStdString(_source.deviceIdKey()); return QString::fromStdString(_source.deviceIdKey());
} }

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 2d251e063cd063f9ba5a1c6e2596a1feb1630b49 Subproject commit 49166a8b7243fd8926d1808da87c803670b02474