Commit 983242c5 authored by Newbyte's avatar Newbyte

community/telegram-desktop: upgrade to 2.4.9

parent 813ebc37
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer:
pkgname=telegram-desktop
pkgver=2.1.17
pkgrel=2
pkgver=2.4.9
pkgrel=0
pkgdesc="Telegram Desktop messaging app"
options="!check" # Requires Catch2 to be packaged.
url="https://desktop.telegram.org/"
......@@ -29,6 +29,7 @@ makedepends="
libexecinfo-dev
lz4-dev
qtchooser
qt5-qtwayland-dev
pulseaudio-dev
libdbusmenu-glib-dev
xxhash-dev
......@@ -43,7 +44,6 @@ makedepends="
source="
https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
small-sizes.patch
remove-glibc.patch
"
builddir="$srcdir/tdesktop-$pkgver-full"
......@@ -76,6 +76,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
sha512sums="8bea14ff32e74c21c6c080b5acf9e3fe11cee51c1e42c196ceb44222c85f39824049a6fc4386798f4b1770693e3f40fe4f56a4ea11d385fd337c99be5f1746cb tdesktop-2.1.17-full.tar.gz
3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch
b6e16c02f7dafa5e00c9b2ce16df18ccd57d380877d009596261f2e1f631cb0f38088a0d8c48d8e321559cacea64ff9e79fe2d7719382d45e27a339888dc2823 remove-glibc.patch"
sha512sums="712ab6896f89f7df0c7ac297039ee3b3532c159e17f66e4539b701a35d04d4709b558755d592d3cd91df541a2d2ca9f0485cf073c32f0b69a18848ab2ccd1993 tdesktop-2.4.7-full.tar.gz
3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch"
Upstream: Unsuitable (requires re-work into something that doesn't break libc)
Reason: This is Glibc specific and treating Linux == glibc is harmful
diff --git a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
index ea9ab61..bbef601 100644
--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
@@ -13,7 +13,6 @@
#include <QtCore/QVersionNumber>
#include <QtCore/QDate>
#include <QtGui/QGuiApplication>
-#include <gnu/libc-version.h>
namespace Platform {
namespace {
@@ -84,8 +74,7 @@ QString SystemVersionPretty() {
return "Linux "
+ (list.isEmpty() ? QString() : list[0] + ' ')
+ (IsWayland() ? "Wayland " : "X11 ")
- + "glibc "
- + GetGlibCVersion();
+ + "musl";
}
QString SystemCountry() {
@@ -103,10 +92,6 @@ QString SystemLanguage() {
QDate WhenSystemBecomesOutdated() {
if (IsLinux32Bit()) {
return QDate(2020, 9, 1);
- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
- return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
- }
}
return QDate();
}
@@ -129,14 +114,6 @@ QString AutoUpdateKey() {
}
}
-QString GetGlibCVersion() {
- static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version;
- }();
- return result;
-}
-
bool IsWayland() {
return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment