Re: [PR PATCH] [Updated] telegram-desktop: update to 2.4.7.

[rleppink <rleppink@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

There is an updated pull request by rleppink against master on the void-packages repository

https://github.com/rleppink/void-packages master
https://github.com/void-linux/void-packages/pull/26554

telegram-desktop: update to 2.4.7.
The file that was patched by `0001-musl.patch` was changed. I updated the patch to what _seems_ right to me, but I am not running musl; so this is **untested on musl**.

How to test this before merging?

A patch file from https://github.com/void-linux/void-packages/pull/26554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-26554.patch --]
[-- Type: text/x-diff, Size: 3846 bytes --]

From ddcc3acf55ea04330f007e26ac99e3e0750c8187 Mon Sep 17 00:00:00 2001
From: Ronald Leppink <ronaldleppink@gmail.com>
Date: Sat, 21 Nov 2020 12:05:41 +0100
Subject: [PATCH] telegram-desktop: update to 2.4.7.

Also update license
---
 .../telegram-desktop/patches/0001-musl.patch  | 50 ++++++++++---------
 srcpkgs/telegram-desktop/template             |  6 +--
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
index 5746a911ab9..35b7c90b955 100644
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ b/srcpkgs/telegram-desktop/patches/0001-musl.patch
@@ -1,48 +1,50 @@
---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2020-06-03 09:28:30.000000000 +0200
-+++ -	2020-06-08 00:40:30.503197310 +0200
-@@ -13,7 +13,6 @@
- #include <QtCore/QVersionNumber>
+--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2020-11-21 11:09:51.647955733 +0100
++++ -	2020-11-21 11:09:50.935306092 +0100
+@@ -12,11 +12,6 @@
  #include <QtCore/QDate>
  #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 {
-@@ -84,8 +74,7 @@
- 	return "Linux "
- 		+ (list.isEmpty() ? QString() : list[0] + ' ')
- 		+ (IsWayland() ? "Wayland " : "X11 ")
--		+ "glibc "
--		+ GetGlibCVersion();
-+		+ "void ";
- }
  
- QString SystemCountry() {
-@@ -103,11 +92,7 @@
- QDate WhenSystemBecomesOutdated() {
+@@ -95,11 +90,7 @@
+ 
  	if (IsLinux32Bit()) {
  		return QDate(2020, 9, 1);
--	} else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
--		if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
+-	} else if (libcName == qstr("glibc") && !libcVersion.isEmpty()) {
+-		if (QVersionNumber::fromString(libcVersion) < QVersionNumber(2, 23)) {
 -			return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
 -		}
 -	}
 +	} 
+ 
  	return QDate();
  }
+@@ -123,22 +114,10 @@
+ }
  
-@@ -129,14 +114,6 @@
- 	}
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
+-	return "glibc";
+-#endif // Q_OS_LINUX
+-
+ 	return QString();
  }
  
--QString GetGlibCVersion() {
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
 -	static const auto result = [&] {
 -		const auto version = QString::fromLatin1(gnu_get_libc_version());
 -		return QVersionNumber::fromString(version).isNull() ? QString() : version;
 -	}();
 -	return result;
--}
+-#endif // Q_OS_LINUX
 -
- bool IsWayland() {
- 	return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
+ 	return QString();
  }
+ 
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index cd685fdb7e3..dbadaded1fb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=2.4.3
+version=2.4.7
 revision=1
 wrksrc="tdesktop-${version}-full"
 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"
 short_desc="Telegram Desktop messaging app"
 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/"
 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"
-checksum=56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895
+checksum=7b13df53be5d6b58d07d730c9429e415be2fea7f7be37bcaa80a505152125bc8
 
 build_options="spellcheck"
 build_options_default="spellcheck"