Summary: | net-im/telegram-desktop-3.6.1: fails build with kde-frameworks/kwayland-5.93.0 | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Nick Sarnie <sarnex> |
Component: | Current packages | Assignee: | Esteve Varela Colominas <esteve.varela> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | ajak, audvare, harrisl, jalokim541515, kde, kripton, nrndda, proxy-maint, sarnex, skobkin-ru |
Priority: | Normal | Keywords: | PullRequest |
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
URL: | https://mail.kde.org/pipermail/kde-frameworks-devel/2022-January/120608.html | ||
See Also: | https://github.com/gentoo/gentoo/pull/24998 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 838403 | ||
Attachments: | Patch |
Description
Nick Sarnie
![]() cc'ing kde@ as fyi So, telegram-desktop's CMake isn't properly using KF5::Wayland cmake target, otherwise it would not even notice this change. https://invent.kde.org/frameworks/kwayland/-/commit/de442e4a94e249a29cf2e005db8e0a5e4a6a13ed app-crypt/pinentry-1.2.0 also affected: Making all in qt capslock_unix.cpp:29:11: fatal error: KWayland/Client/connection_thread.h: No such file or directory 29 | # include <KWayland/Client/connection_thread.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Please file different bugs for different packages. Besides, app-crypt/pinentry ebuild doesn't even define a single KF5 dependency. Does tdesktop ever use proper cmake targets? lol Anyway, I think the issue might be in https://github.com/desktop-app/cmake_helpers/blob/master/external/kwayland/CMakeLists.txt#L18 , as it doesn't call target_include_directories on the waylandclient implementation. I'll try this when I get home tonight. Apparently the issue wasn't related to the move to a new include directory, but rather that KWayland's cmake config used to add the "KWayland/Client" folder to the include path, and telegram included the files without the prefix, as a result. The new version of kwayland removes that include path... Created attachment 770192 [details, diff]
Patch
Confirmed builds/runs fine over here. Please include this patch along with the one from Bug #837914 in next revision. The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabc16b768077a41ec4b4cd74d8088e52b024ccd commit eabc16b768077a41ec4b4cd74d8088e52b024ccd Author: Esteve Varela Colominas <esteve.varela@gmail.com> AuthorDate: 2022-04-11 22:28:30 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-04-15 06:04:19 +0000 net-im/telegram-desktop: Fix building with KWayland 5.93 Closes: https://bugs.gentoo.org/837569 Thanks-to: Nick Sarnie <sarnex@gentoo.org> Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24998 Signed-off-by: Sam James <sam@gentoo.org> .../files/tdesktop-3.6.1-fix-kwayland-5.93.patch | 55 ++++++++++++++++++++++ .../telegram-desktop-3.5.2-r1.ebuild | 1 + .../telegram-desktop/telegram-desktop-3.6.1.ebuild | 1 + 3 files changed, 57 insertions(+) |