Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/
Date: Thu, 28 May 2020 06:14:34
Message-Id: 1590645983.4fd7ae3236efd1834cafd9771e942fc49cc94da2.gyakovlev@gentoo
1 commit: 4fd7ae3236efd1834cafd9771e942fc49cc94da2
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 28 05:57:42 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu May 28 06:06:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd7ae32
7
8 net-im/telegram-desktop: add qt-5.15 include patch
9
10 Bug: https://bugs.gentoo.org/725652
11 Package-Manager: Portage-2.3.100, Repoman-2.3.22
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 .../files/telegram-desktop-qt5.15.patch | 23 ++++++++++++++++++++++
15 .../telegram-desktop/telegram-desktop-2.1.0.ebuild | 5 ++++-
16 .../telegram-desktop/telegram-desktop-2.1.7.ebuild | 4 ++++
17 3 files changed, 31 insertions(+), 1 deletion(-)
18
19 diff --git a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
20 new file mode 100644
21 index 00000000000..80c02b10db2
22 --- /dev/null
23 +++ b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch
24 @@ -0,0 +1,23 @@
25 +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
26 +--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-24 09:44:41.000000000 +0200
27 ++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-26 20:31:34.381796057 +0200
28 +@@ -10,6 +10,8 @@
29 +
30 + #include "ui/style/style_core.h"
31 +
32 ++#include <QPainterPath>
33 ++
34 + namespace anim {
35 +
36 + enum class type {
37 +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
38 +--- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-24 09:44:41.000000000 +0200
39 ++++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-26 20:32:16.340015129 +0200
40 +@@ -10,6 +10,7 @@
41 + #include "ui/painter.h"
42 +
43 + #include <QtCore/QtMath>
44 ++#include <QPainterPath>
45 +
46 + namespace Ui {
47 + namespace {
48
49 diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
50 index 07c9b19ab45..dd038756cdd 100644
51 --- a/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
52 +++ b/net-im/telegram-desktop/telegram-desktop-2.1.0.ebuild
53 @@ -70,7 +70,10 @@ REQUIRED_USE="
54
55 S="${WORKDIR}/${MY_P}"
56
57 -PATCHES=( "${FILESDIR}/${PV}-kde-dir.patch" )
58 +PATCHES=(
59 + "${FILESDIR}/${PV}-kde-dir.patch"
60 + "${FILESDIR}/${PN}-qt5.15.patch"
61 +)
62
63 src_configure() {
64 local mycxxflags=(
65
66 diff --git a/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
67 index 3206772347b..e031bf3e1e7 100644
68 --- a/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
69 +++ b/net-im/telegram-desktop/telegram-desktop-2.1.7.ebuild
70 @@ -69,6 +69,10 @@ REQUIRED_USE="
71
72 S="${WORKDIR}/${MY_P}"
73
74 +PATCHES=(
75 + "${FILESDIR}/${PN}-qt5.15.patch"
76 +)
77 +
78 pkg_pretend() {
79 if has ccache ${FEATURES}; then
80 ewarn