mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Move build to Ubuntu 14.04 and GCC 7.2.

Browse Source 
To be able to run on the same distributions as before we need to have
the same GLIBC version dependency as in Ubuntu 12.04, which is 2.15.

For that we need to remove all usages of GLIBC features from 2.16 and above.
Currently there are three methods used, so they're wrapped in a separate
static library, linux_glibc_wraps.

It is a separate library because it must be compiled without '-flto' flag,
otherwise the inline __asm__ is not working and we get unresolved symbols.
This commit is contained in:
John Preston
2017-09-28 12:40:26 +03:00
parent 1cd126d728
commit 21b1ba1f88
16 changed files with 468 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/calls/calls_call.cpp
View File

@@ -597,7 +597,7 @@ void Call::setState(State state) {
break;
case State::Ended:
_delegate->playSound(Delegate::Sound::Ended);
// [[fallthrough]]
[[fallthrough]];
case State::EndedByOtherDevice:
_delegate->callFinished(this);
break;

17
Telegram/SourceFiles/core/basic_types.h
View File

@@ -26,25 +26,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include <ctime>
#include "base/build_config.h"
#include "base/ordered_set.h"
using gsl::not_null;
#if defined COMPILER_GCC
namespace std {
template <typename T>
constexpr std::add_const_t<T>& as_const(T& t) noexcept {
return t;
}
template <typename T>
void as_const(const T&&) = delete;
} // namespace std
#endif // COMPILER_GCC
#include "base/ordered_set.h"
//using uchar = unsigned char; // Qt has uchar
using int16 = qint16;
using uint16 = quint16;

43
Telegram/SourceFiles/platform/linux/linux_glibc_wraps.c Normal file
View File

@@ -0,0 +1,43 @@
/*
This file is part of Telegram Desktop,
the official desktop version of Telegram messaging app, see https://telegram.org
Telegram Desktop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
It is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
In addition, as a special exception, the copyright holders give permission
to link the code of portions of this program with the OpenSSL library.
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
void *__wrap_aligned_alloc(size_t alignment, size_t size) {
void *result = NULL;
return (posix_memalign(&result, alignment, size) == 0)
? result
: NULL;
}
int enable_secure_inited = 0;
int enable_secure = 1;
char *__wrap_secure_getenv(const char *name) {
if (enable_secure_inited == 0) {
enable_secure_inited = 1;
enable_secure = (geteuid() != getuid())
|| (getegid() != getgid());
}
return enable_secure ? NULL : getenv(name);
}

55
Telegram/SourceFiles/platform/linux/linux_glibc_wraps_32.c Normal file
View File

@@ -0,0 +1,55 @@
/*
This file is part of Telegram Desktop,
the official desktop version of Telegram messaging app, see https://telegram.org
Telegram Desktop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
It is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
In addition, as a special exception, the copyright holders give permission
to link the code of portions of this program with the OpenSSL library.
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include <time.h>
#include <stdint.h>
int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_2.2");
int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
return __clock_gettime_glibc_old(clk_id, tp);
}
uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem_p);
int64_t __wrap___divmoddi4(int64_t num, int64_t den, int64_t *rem_p) {
int minus = 0;
int64_t v;
if (num < 0) {
num = -num;
minus = 1;
}
if (den < 0) {
den = -den;
minus ^= 1;
}
v = __udivmoddi4(num, den, (uint64_t *)rem_p);
if (minus) {
v = -v;
if (rem_p)
*rem_p = -(*rem_p);
}
return v;
}

29
Telegram/SourceFiles/platform/linux/linux_glibc_wraps_64.c Normal file
View File

@@ -0,0 +1,29 @@
/*
This file is part of Telegram Desktop,
the official desktop version of Telegram messaging app, see https://telegram.org
Telegram Desktop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
It is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
In addition, as a special exception, the copyright holders give permission
to link the code of portions of this program with the OpenSSL library.
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
*/
#include <time.h>
int __clock_gettime_glibc_old(clockid_t clk_id, struct timespec *tp);
__asm__(".symver __clock_gettime_glibc_old,clock_gettime@GLIBC_2.2.5");
int __wrap_clock_gettime(clockid_t clk_id, struct timespec *tp) {
return __clock_gettime_glibc_old(clk_id, tp);
}

41
Telegram/SourceFiles/rpl/details/callable.h
View File

@@ -23,47 +23,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "base/build_config.h"
#include <tuple>
#ifdef COMPILER_GCC
namespace std {
template <bool Value>
using bool_constant = integral_constant<bool, Value>;
template <typename ...Args>
constexpr auto tuple_size_v = std::tuple_size<Args...>::value;
template <typename ...Args>
constexpr auto is_rvalue_reference_v = is_rvalue_reference<Args...>::value;
template <typename ...Args>
constexpr auto is_base_of_v = is_base_of<Args...>::value;
template <typename ...Args>
constexpr auto is_same_v = is_same<Args...>::value;
namespace detail {
template <typename Method, typename Tuple, size_t... I>
constexpr decltype(auto) apply_impl(
Method &&method,
Tuple &&tuple,
index_sequence<I...>) {
return forward<Method>(method)(get<I>(forward<Tuple>(tuple))...);
}
} // namespace detail
template <class Method, class Tuple>
constexpr decltype(auto) apply(Method &&method, Tuple&& tuple) {
return detail::apply_impl(
forward<Method>(method),
forward<Tuple>(tuple),
make_index_sequence<tuple_size_v<decay_t<Tuple>>>{});
}
} // namespace std
#endif // COMPILER_GCC
namespace rpl {
namespace details {

15
Telegram/SourceFiles/ui/text/text.cpp
View File

@@ -2119,7 +2119,7 @@ private:
status.eor = QChar::DirON;
dir = QChar::DirAN;
}
// fall through
[[fallthrough]];
case QChar::DirEN:
case QChar::DirL:
eor = current;
@@ -2133,12 +2133,14 @@ private:
else
eor = current;
status.eor = QChar::DirEN;
dir = QChar::DirAN; break;
dir = QChar::DirAN;
break;
case QChar::DirES:
case QChar::DirCS:
if(status.eor == QChar::DirEN || dir == QChar::DirAN) {
eor = current; break;
}
[[fallthrough]];
case QChar::DirBN:
case QChar::DirB:
case QChar::DirS:
@@ -2168,11 +2170,13 @@ private:
eor = current; status.eor = dirCurrent;
}
}
[[fallthrough]];
default:
break;
}
break;
}
[[fallthrough]];
case QChar::DirAN:
hasBidi = true;
dirCurrent = QChar::DirAN;
@@ -2181,7 +2185,8 @@ private:
{
case QChar::DirL:
case QChar::DirAN:
eor = current; status.eor = QChar::DirAN; break;
eor = current; status.eor = QChar::DirAN;
break;
case QChar::DirR:
case QChar::DirAL:
case QChar::DirEN:
@@ -2196,6 +2201,7 @@ private:
if(status.eor == QChar::DirAN) {
eor = current; break;
}
[[fallthrough]];
case QChar::DirES:
case QChar::DirET:
case QChar::DirBN:
@@ -2226,6 +2232,7 @@ private:
eor = current; status.eor = dirCurrent;
}
}
[[fallthrough]];
default:
break;
}
@@ -2297,7 +2304,7 @@ private:
status.last = QChar::DirL;
break;
}
// fall through
[[fallthrough]];
default:
status.last = dirCurrent;
}