wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-06 23:23:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

telegram-desktop: update to 2.4.7.

Browse source 
Also update license
This commit is contained in:
Ronald Leppink 2020-11-21 12:05:41 +01:00 • committed by Érico Nogueira Rolim
parent 538b74d2b9
commit c63ac1c963
2 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
srcpkgs/telegram-desktop/patches/0001-musl.patch
View file

@ -1,48 +1,50 @@
--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-06-03 09:28:30.000000000 +0200 --- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
+++ - 2020-06-08 00:40:30.503197310 +0200 +++ - 2020-11-21 11:09:50.935306092 +0100
@@ -13,7 +13,6 @@ @@ -12,11 +12,6 @@
#include <QtCore/QVersionNumber>
#include <QtCore/QDate> #include <QtCore/QDate>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
-#include <gnu/libc-version.h>
-// this file is used on both Linux & BSD
-#ifdef Q_OS_LINUX
-#include <gnu/libc-version.h>
-#endif // Q_OS_LINUX
-
namespace Platform { namespace Platform {
namespace { namespace {
@@ -84,8 +74,7 @@
return "Linux "
+ (list.isEmpty() ? QString() : list[0] + ' ')
+ (IsWayland() ? "Wayland " : "X11 ")
- + "glibc "
- + GetGlibCVersion();
+ + "void ";
}
QString SystemCountry() { @@ -95,11 +90,7 @@
@@ -103,11 +92,7 @@
QDate WhenSystemBecomesOutdated() {
if (IsLinux32Bit()) { if (IsLinux32Bit()) {
return QDate(2020, 9, 1); return QDate(2020, 9, 1);
- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) { - } else if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) { - if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 23)) {
- return QDate(2020, 9, 1); // Older than Ubuntu 16.04. - return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
- } - }
- } - }
+ } + }
return QDate(); return QDate();
} }
@@ -123,22 +114,10 @@
@@ -129,14 +114,6 @@
}
} }
-QString GetGlibCVersion() { QString GetLibcName() {
-#ifdef Q_OS_LINUX
- return "glibc";
-#endif // Q_OS_LINUX
-
return QString();
}
QString GetLibcVersion() {
-#ifdef Q_OS_LINUX
- static const auto result = [&] { - static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version()); - const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version; - return QVersionNumber::fromString(version).isNull() ? QString() : version;
- }(); - }();
- return result; - return result;
-} -#endif // Q_OS_LINUX
- -
bool IsWayland() { return QString();
return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
} }

6
srcpkgs/telegram-desktop/template
View file

@ -1,6 +1,6 @@
# Template file for 'telegram-desktop' # Template file for 'telegram-desktop'
pkgname=telegram-desktop pkgname=telegram-desktop
version=2.4.3 version=2.4.7
revision=1 revision=1
wrksrc="tdesktop-${version}-full" wrksrc="tdesktop-${version}-full"
build_style=cmake build_style=cmake
@ -21,11 +21,11 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
depends="qt5-imageformats qt5-core>=5.15.1<5.15.2" depends="qt5-imageformats qt5-core>=5.15.1<5.15.2"
short_desc="Telegram Desktop messaging app" short_desc="Telegram Desktop messaging app"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later WITH OpenSSL" license="GPL-3.0-or-later, OpenSSL"
homepage="https://desktop.telegram.org/" homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
checksum=56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895 checksum=7b13df53be5d6b58d07d730c9429e415be2fea7f7be37bcaa80a505152125bc8
build_options="spellcheck" build_options="spellcheck"
build_options_default="spellcheck" build_options_default="spellcheck"