Attachment #224783 for bug #255719

Lines 1-5 Link Here

(-)./Makefile (-2 / +2 lines)
1	PORTNAME= telegram-desktop	1	PORTNAME= telegram-desktop
2	DISTVERSION= 2.6.1	2	DISTVERSION= 2.7.4
3	CATEGORIES= net-im	3	CATEGORIES= net-im
4	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
5	DISTNAME= tdesktop-${DISTVERSION}-full	5	DISTNAME= tdesktop-${DISTVERSION}-full
Lines 46-52 Link Here
46	GH_ACCOUNT= telegramdesktop	46	GH_ACCOUNT= telegramdesktop
47	GH_PROJECT= tdesktop	47	GH_PROJECT= tdesktop
48	USE_GL= gl	48	USE_GL= gl
49	USE_GNOME= glib20	49	USE_GNOME= glib20 glibmm
50	INSTALLS_ICONS= yes	50	INSTALLS_ICONS= yes
51	USE_QT= core dbus gui imageformats network widgets buildtools_build \	51	USE_QT= core dbus gui imageformats network widgets buildtools_build \
52	qmake_build wayland	52	qmake_build wayland

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1615175171	1	TIMESTAMP = 1620514737
2	SHA256 (tdesktop-2.6.1-full.tar.gz) = c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73	2	SHA256 (tdesktop-2.7.4-full.tar.gz) = 97526f0b4adf04cf86b605ae84f3efaacf58eb8f828bab8f4fe752a4fac62fb2
3	SIZE (tdesktop-2.6.1-full.tar.gz) = 36726422	3	SIZE (tdesktop-2.7.4-full.tar.gz) = 36894673




From 0b4100d7cecc4e748c51f3f51ebfd1392ec3978a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Apr 2021 10:53:08 +0400
Subject: [PATCH] Set correct version in QLibrary::load.

---
 webview/platform/linux/webview_linux_webkit_gtk.cpp | 2 +-
 webview/platform/linux/webview_linux_webkit_gtk.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git webview/platform/linux/webview_linux_webkit_gtk.cpp webview/platform/linux/webview_linux_webkit_gtk.cpp
index 3b8ca3f..c3c8d37 100644
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
@@ -38,7 +38,7 @@ bool Resolve() {
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_get_type)
 		&& LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated)
 		&& LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid)
-		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0)
+		&& base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 37)
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new)
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type)
 		&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager)
diff --git webview/platform/linux/webview_linux_webkit_gtk.h webview/platform/linux/webview_linux_webkit_gtk.h
index a7f0f97..6d2979a 100644
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
@@ -11,9 +11,9 @@
 extern "C" {
 #undef signals
 #include <JavaScriptCore/JavaScript.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
-#include <X11/Xlib.h>
 #define signals public
 } // extern "C"
 




--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig	2021-01-28 15:30:24 UTC
+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp
@@ -14,11 +14,6 @@
 #include <QtCore/QDate>
 #include <QtGui/QGuiApplication>
 
-// this file is used on both Linux & BSD
-#ifdef Q_OS_LINUX
-#include <gnu/libc-version.h>
-#endif // Q_OS_LINUX
-
 namespace Platform {
 namespace {
 
@@ -103,7 +98,7 @@ QString SystemVersionPretty() {
 	static const auto result = [&] {
 		QStringList resultList{};
 
-#ifdef Q_OS_LINUX
+#if 0
 		resultList << "Linux";
 #else // Q_OS_LINUX
 		resultList << QSysInfo::kernelType();
@@ -186,7 +181,7 @@ QString AutoUpdateKey() {
 }
 
 QString GetLibcName() {
-#ifdef Q_OS_LINUX
+#if 0
 	return "glibc";
 #endif // Q_OS_LINUX
 
@@ -194,7 +189,7 @@ QString GetLibcName() {
 }
 
 QString GetLibcVersion() {
-#ifdef Q_OS_LINUX
+#if 0
 	static const auto result = [&] {
 		const auto version = QString::fromLatin1(gnu_get_libc_version());
 		return QVersionNumber::fromString(version).isNull() ? QString() : version;

Return to bug 255719

Line 0 Link Here

(-)./files/patch-0b4100d7 (+38 lines)
	1	From 0b4100d7cecc4e748c51f3f51ebfd1392ec3978a Mon Sep 17 00:00:00 2001
	2	From: John Preston <johnprestonmail@gmail.com>
	3	Date: Thu, 29 Apr 2021 10:53:08 +0400
	4	Subject: [PATCH] Set correct version in QLibrary::load.
	5
	6	---
	7	webview/platform/linux/webview_linux_webkit_gtk.cpp \| 2 +-
	8	webview/platform/linux/webview_linux_webkit_gtk.h \| 2 +-
	9	2 files changed, 2 insertions(+), 2 deletions(-)
	10
	11	diff --git webview/platform/linux/webview_linux_webkit_gtk.cpp webview/platform/linux/webview_linux_webkit_gtk.cpp
	12	index 3b8ca3f..c3c8d37 100644
	13	--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
	14	+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
	15	@@ -38,7 +38,7 @@ bool Resolve() {
	16	&& LOAD_GTK_SYMBOL(gtk, gtk_window_get_type)
	17	&& LOAD_GTK_SYMBOL(gtk, gtk_window_set_decorated)
	18	&& LOAD_GTK_SYMBOL(gtk, gdk_x11_window_get_xid)
	19	- && base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 0)
	20	+ && base::Platform::Gtk::LoadLibrary(webkit2gtk, "libwebkit2gtk-4.0.so.37", 37)
	21	&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_new)
	22	&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_type)
	23	&& LOAD_GTK_SYMBOL(webkit2gtk, webkit_web_view_get_user_content_manager)
	24	diff --git webview/platform/linux/webview_linux_webkit_gtk.h webview/platform/linux/webview_linux_webkit_gtk.h
	25	index a7f0f97..6d2979a 100644
	26	--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
	27	+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
	28	@@ -11,9 +11,9 @@
	29	extern "C" {
	30	#undef signals
	31	#include <JavaScriptCore/JavaScript.h>
	32	+#include <gdk/gdkx.h>
	33	#include <gtk/gtk.h>
	34	#include <webkit2/webkit2.h>
	35	-#include <X11/Xlib.h>
	36	#define signals public
	37	} // extern "C"
	38

Lines 1-41 Link Here

(-)./files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp (-41 lines)
1	--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2021-01-28 15:30:24 UTC
2	+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp
3	@@ -14,11 +14,6 @@
4	#include <QtCore/QDate>
5	#include <QtGui/QGuiApplication>
6
7	-// this file is used on both Linux & BSD
8	-#ifdef Q_OS_LINUX
9	-#include <gnu/libc-version.h>
10	-#endif // Q_OS_LINUX
11	-
12	namespace Platform {
13	namespace {
14
15	@@ -103,7 +98,7 @@ QString SystemVersionPretty() {
16	static const auto result = [&] {
17	QStringList resultList{};
18
19	-#ifdef Q_OS_LINUX
20	+#if 0
21	resultList << "Linux";
22	#else // Q_OS_LINUX
23	resultList << QSysInfo::kernelType();
24	@@ -186,7 +181,7 @@ QString AutoUpdateKey() {
25	}
26
27	QString GetLibcName() {
28	-#ifdef Q_OS_LINUX
29	+#if 0
30	return "glibc";
31	#endif // Q_OS_LINUX
32
33	@@ -194,7 +189,7 @@ QString GetLibcName() {
34	}
35
36	QString GetLibcVersion() {
37	-#ifdef Q_OS_LINUX
38	+#if 0
39	static const auto result = [&] {
40	const auto version = QString::fromLatin1(gnu_get_libc_version());
41	return QVersionNumber::fromString(version).isNull() ? QString() : version;