From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE18C1382C5 for ; Thu, 28 May 2020 06:14:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56016E087D; Thu, 28 May 2020 06:14:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 215A3E087D for ; Thu, 28 May 2020 06:14:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4946034EDF3 for ; Thu, 28 May 2020 06:14:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA1E626A for ; Thu, 28 May 2020 06:14:23 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1590645983.4fd7ae3236efd1834cafd9771e942fc49cc94da2.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild X-VCS-Directories: net-im/telegram-desktop/ net-im/telegram-desktop/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 4fd7ae3236efd1834cafd9771e942fc49cc94da2 X-VCS-Branch: master Date: Thu, 28 May 2020 06:14:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84f8d01a-be82-4817-8630-2651b4a8f45c X-Archives-Hash: 50cd1fee77b90a5ce633be053f119fd7 commit: 4fd7ae3236efd1834cafd9771e942fc49cc94da2 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu May 28 05:57:42 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu May 28 06:06:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd7ae32 net-im/telegram-desktop: add qt-5.15 include patch Bug: https://bugs.gentoo.org/725652 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> .../files/telegram-desktop-qt5.15.patch | 23 ++++++++++++++++++++++ .../telegram-desktop/telegram-desktop-2.1.0.ebuild | 5 ++++- .../telegram-desktop/telegram-desktop-2.1.7.ebuild | 4 ++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch new file mode 100644 index 00000000000..80c02b10db2 --- /dev/null +++ b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch @@ -0,0 +1,23 @@ +diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h +--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-24 09:44:41.000000000 +0200 ++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-26 20:31:34.381796057 +0200 +@@ -10,6 +10,8 @@ + + #include "ui/style/style_core.h" + ++#include ++ + namespace anim { + + enum class type { +diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp +--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-24 09:44:41.000000000 +0200 ++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-26 20:32:16.340015129 +0200 +@@ -10,6 +10,7 @@ + #include "ui/painter.h" + + #include ++#include + + namespace Ui { + namespace { diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild index 07c9b19ab45..dd038756cdd 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild @@ -70,7 +70,10 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PV}-kde-dir.patch" ) +PATCHES=( + "${FILESDIR}/${PV}-kde-dir.patch" + "${FILESDIR}/${PN}-qt5.15.patch" +) src_configure() { local mycxxflags=( diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild index 3206772347b..e031bf3e1e7 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild @@ -69,6 +69,10 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${PN}-qt5.15.patch" +) + pkg_pretend() { if has ccache ${FEATURES}; then ewarn