commit: 61fa2ab0eb83cb55d7f425802ff83019aa87b0ec Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Jul 31 17:32:52 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Fri Jul 31 18:33:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fa2ab0
net-im/telegram-desktop: remove unused patch(es) Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16920 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/2.1.20-qt-includes.patch | 72 ---------------------- 1 file changed, 72 deletions(-) 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 deleted file mode 100644 index a2f02aea3b0..00000000000 --- a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9eb24ca5c194482faf86e68d93527707fa01a78e Mon Sep 17 00:00:00 2001 -From: Ilya Fedin <[email protected]> -Date: Thu, 16 Jul 2020 18:54:29 +0400 -Subject: [PATCH] QtWaylandClient contains QtXkbCommonSupport includes - ---- - external/qt/CMakeLists.txt | 25 +++++++++++++++++++++++++ - external/qt/package.cmake | 1 + - 2 files changed, 26 insertions(+) - -diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt -index 25b662a..490d13b 100644 ---- a/cmake/external/qt/CMakeLists.txt -+++ b/cmake/external/qt/CMakeLists.txt -@@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED) - ) - endif() - -+ if (Qt5XkbCommonSupport_FOUND) -+ target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport) -+ -+ target_include_directories(external_qt -+ INTERFACE -+ ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS} -+ ) -+ endif() -+ - if (Qt5WaylandClient_FOUND) - target_link_libraries(external_qt INTERFACE Qt5::WaylandClient) - -@@ -97,6 +106,15 @@ else() - ) - endif() - -+ if (Qt5XkbCommonSupport_FOUND) -+ target_include_directories(external_qt SYSTEM -+ INTERFACE -+ ${qt_loc}/include/QtXkbCommonSupport -+ ${qt_loc}/include/QtXkbCommonSupport/${qt_version} -+ ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport -+ ) -+ endif() -+ - if (LINUX) - target_include_directories(external_qt SYSTEM - INTERFACE -@@ -129,6 +147,13 @@ else() - ) - endif() - -+ if (Qt5XkbCommonSupport_FOUND) -+ target_compile_definitions(external_qt -+ INTERFACE -+ QT_XKBCOMMON_SUPPORT_LIB -+ ) -+ endif() -+ - if (LINUX) - target_compile_definitions(external_qt - INTERFACE -diff --git a/external/qt/package.cmake b/external/qt/package.cmake -index 4e97717..ac40f05 100644 ---- a/cmake/external/qt/package.cmake -+++ b/cmake/external/qt/package.cmake -@@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED) - - if (LINUX) - find_package(Qt5 COMPONENTS WaylandClient REQUIRED) -+ find_package(Qt5 COMPONENTS XkbCommonSupport) - - if (NOT DESKTOP_APP_USE_PACKAGED) - find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED)
