commit: f9ba6a1e03ab56133ff974f1004963a6c176df77 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Mon Sep 8 00:10:06 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Mon Sep 8 06:44:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ba6a1e
net-im/telegram-desktop: Fix USE=-webkit actually skipping the relevant links Apparently the logic here was inverted. Also added a REQUIRE_FIND_PACKAGE to ensure this remains correct. Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43707 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> ...ktop-6.0.2.ebuild => telegram-desktop-6.0.2-r1.ebuild} | 15 ++++++++++++--- ...ktop-6.1.2.ebuild => telegram-desktop-6.1.2-r1.ebuild} | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/net-im/telegram-desktop/telegram-desktop-6.0.2.ebuild b/net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild similarity index 91% rename from net-im/telegram-desktop/telegram-desktop-6.0.2.ebuild rename to net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild index 85d9b5a99462..997b60230117 100644 --- a/net-im/telegram-desktop/telegram-desktop-6.0.2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-6.0.2-r1.ebuild @@ -155,6 +155,7 @@ src_configure() { # https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398 use !libdispatch && append-cppflags -DCRL_FORCE_QT + local no_webkit_wayland=$(use webkit && use wayland && echo no || echo yes) local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no) local mycmakeargs=( -DQT_VERSION_MAJOR=6 @@ -166,9 +167,17 @@ src_configure() { # Control automagic dependencies on certain packages ## These libraries are only used in lib_webview, for wayland ## See Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=${no_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${no_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${no_webkit_wayland} + + # Make sure dependencies that aren't patched to be REQUIRED in + # src_prepare, are found. This was suggested to me by the telegram + # devs, in lieu of having explicit flags in the build system. + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6DBus=$(usex dbus) + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} -DDESKTOP_APP_DISABLE_QT_PLUGINS=ON -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X) diff --git a/net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild b/net-im/telegram-desktop/telegram-desktop-6.1.2-r1.ebuild similarity index 91% rename from net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild rename to net-im/telegram-desktop/telegram-desktop-6.1.2-r1.ebuild index 85d9b5a99462..997b60230117 100644 --- a/net-im/telegram-desktop/telegram-desktop-6.1.2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-6.1.2-r1.ebuild @@ -155,6 +155,7 @@ src_configure() { # https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398 use !libdispatch && append-cppflags -DCRL_FORCE_QT + local no_webkit_wayland=$(use webkit && use wayland && echo no || echo yes) local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no) local mycmakeargs=( -DQT_VERSION_MAJOR=6 @@ -166,9 +167,17 @@ src_configure() { # Control automagic dependencies on certain packages ## These libraries are only used in lib_webview, for wayland ## See Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=${no_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=${no_webkit_wayland} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WaylandCompositor=${no_webkit_wayland} + + # Make sure dependencies that aren't patched to be REQUIRED in + # src_prepare, are found. This was suggested to me by the telegram + # devs, in lieu of having explicit flags in the build system. + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6DBus=$(usex dbus) + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick=${use_webkit_wayland} + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets=${use_webkit_wayland} + -DCMAKE_REQUIRE_FIND_PACKAGE_Qt6WaylandCompositor=${use_webkit_wayland} -DDESKTOP_APP_DISABLE_QT_PLUGINS=ON -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
