1 |
commit: 61fa2ab0eb83cb55d7f425802ff83019aa87b0ec |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 31 17:32:52 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 31 18:33:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fa2ab0 |
7 |
|
8 |
net-im/telegram-desktop: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/16920 |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
.../files/2.1.20-qt-includes.patch | 72 ---------------------- |
16 |
1 file changed, 72 deletions(-) |
17 |
|
18 |
diff --git a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch b/net-im/telegram-desktop/files/2.1.20-qt-includes.patch |
19 |
deleted file mode 100644 |
20 |
index a2f02aea3b0..00000000000 |
21 |
--- a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch |
22 |
+++ /dev/null |
23 |
@@ -1,72 +0,0 @@ |
24 |
-From 9eb24ca5c194482faf86e68d93527707fa01a78e Mon Sep 17 00:00:00 2001 |
25 |
-From: Ilya Fedin <fedin-ilja2010@××.ru> |
26 |
-Date: Thu, 16 Jul 2020 18:54:29 +0400 |
27 |
-Subject: [PATCH] QtWaylandClient contains QtXkbCommonSupport includes |
28 |
- |
29 |
---- |
30 |
- external/qt/CMakeLists.txt | 25 +++++++++++++++++++++++++ |
31 |
- external/qt/package.cmake | 1 + |
32 |
- 2 files changed, 26 insertions(+) |
33 |
- |
34 |
-diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt |
35 |
-index 25b662a..490d13b 100644 |
36 |
---- a/cmake/external/qt/CMakeLists.txt |
37 |
-+++ b/cmake/external/qt/CMakeLists.txt |
38 |
-@@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED) |
39 |
- ) |
40 |
- endif() |
41 |
- |
42 |
-+ if (Qt5XkbCommonSupport_FOUND) |
43 |
-+ target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) |
44 |
-+ |
45 |
-+ target_include_directories(external_qt |
46 |
-+ INTERFACE |
47 |
-+ ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} |
48 |
-+ ) |
49 |
-+ endif() |
50 |
-+ |
51 |
- if (Qt5WaylandClient_FOUND) |
52 |
- target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) |
53 |
- |
54 |
-@@ -97,6 +106,15 @@ else() |
55 |
- ) |
56 |
- endif() |
57 |
- |
58 |
-+ if (Qt5XkbCommonSupport_FOUND) |
59 |
-+ target_include_directories(external_qt SYSTEM |
60 |
-+ INTERFACE |
61 |
-+ ${qt_loc}/include/QtXkbCommonSupport |
62 |
-+ ${qt_loc}/include/QtXkbCommonSupport/${qt_version} |
63 |
-+ ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport |
64 |
-+ ) |
65 |
-+ endif() |
66 |
-+ |
67 |
- if (LINUX) |
68 |
- target_include_directories(external_qt SYSTEM |
69 |
- INTERFACE |
70 |
-@@ -129,6 +147,13 @@ else() |
71 |
- ) |
72 |
- endif() |
73 |
- |
74 |
-+ if (Qt5XkbCommonSupport_FOUND) |
75 |
-+ target_compile_definitions(external_qt |
76 |
-+ INTERFACE |
77 |
-+ QT_XKBCOMMON_SUPPORT_LIB |
78 |
-+ ) |
79 |
-+ endif() |
80 |
-+ |
81 |
- if (LINUX) |
82 |
- target_compile_definitions(external_qt |
83 |
- INTERFACE |
84 |
-diff --git a/external/qt/package.cmake b/external/qt/package.cmake |
85 |
-index 4e97717..ac40f05 100644 |
86 |
---- a/cmake/external/qt/package.cmake |
87 |
-+++ b/cmake/external/qt/package.cmake |
88 |
-@@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED) |
89 |
- |
90 |
- if (LINUX) |
91 |
- find_package(Qt5 COMPONENTS WaylandClient REQUIRED) |
92 |
-+ find_package(Qt5 COMPONENTS XkbCommonSupport) |
93 |
- |
94 |
- if (NOT DESKTOP_APP_USE_PACKAGED) |
95 |
- find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED) |