Attachment 224783 Details for Bug 255719 – port for 2.7.4

[patch] port for 2.7.4

telegram-desktop-2.7.4.patch (text/plain), 5.07 KB, created by Henry Hu on 2021-05-09 02:18:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Hu

Created: 2021-05-09 02:18:00 UTC

Size: 5.07 KB

patch

obsolete

>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.md -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/Makefile ./Makefile
>--- /usr/ports/net-im/telegram-desktop/Makefile	2021-04-07 04:06:21.000000000 -0400
>+++ ./Makefile	2021-05-08 19:49:37.795656000 -0400
>@@ -1,5 +1,5 @@
> PORTNAME=	telegram-desktop
>-DISTVERSION=	2.6.1
>+DISTVERSION=	2.7.4
> CATEGORIES=	net-im
> MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
> DISTNAME=	tdesktop-${DISTVERSION}-full
>@@ -46,7 +46,7 @@
> GH_ACCOUNT=	telegramdesktop
> GH_PROJECT=	tdesktop
> USE_GL=		gl
>-USE_GNOME=	glib20
>+USE_GNOME=	glib20 glibmm
> INSTALLS_ICONS=	yes
> USE_QT=		core dbus gui imageformats network widgets buildtools_build \
> 		qmake_build wayland
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.md -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/distinfo ./distinfo
>--- /usr/ports/net-im/telegram-desktop/distinfo	2021-03-09 04:13:25.000000000 -0500
>+++ ./distinfo	2021-05-08 18:58:57.176155000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1615175171
>-SHA256 (tdesktop-2.6.1-full.tar.gz) = c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73
>-SIZE (tdesktop-2.6.1-full.tar.gz) = 36726422
>+TIMESTAMP = 1620514737
>+SHA256 (tdesktop-2.7.4-full.tar.gz) = 97526f0b4adf04cf86b605ae84f3efaacf58eb8f828bab8f4fe752a4fac62fb2
>+SIZE (tdesktop-2.7.4-full.tar.gz) = 36894673
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.md -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-0b4100d7 ./files/patch-0b4100d7
>--- /usr/ports/net-im/telegram-desktop/files/patch-0b4100d7	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-0b4100d7	2021-05-08 21:30:48.346804000 -0400
>@@ -0,0 +1,38 @@
>+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"
>+ 
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.md -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp ./files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp	2021-02-11 07:32:32.000000000 -0500
>+++ ./files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,41 +0,0 @@
>---- 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;

Flags:

henry.hu.sh: maintainer-approval+

Actions: View | Diff

Attachments on bug 255719: 224783 | 224926