From f18bfb11ae136b9cf546145f8849e88bc682decb Mon Sep 17 00:00:00 2001 From: Sergey Kiselev Date: Mon, 24 Apr 2023 09:51:55 +0500 Subject: [PATCH] Add option for Wayland integration --- net-im/telegram-desktop/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index de03750..11b9826 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -57,11 +57,11 @@ GH_PROJECT= tdesktop .if ${FLAVOR} == qt5 USES+= kde:5 qt:5 USE_QT= buildtools:build core dbus gui imageformats network qmake:build \ - svg wayland widgets + svg widgets USE_KDE= coreaddons kimageformats .else USES+= qt:6 -USE_QT= 5compat base imageformats lottie shadertools svg tools:build wayland +USE_QT= 5compat base imageformats lottie shadertools svg tools:build .endif USE_GL= gl @@ -69,8 +69,7 @@ USE_GNOME= glib20 glibmm26 USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} -CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ - DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION +CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port). CMAKE_ARGS+= -DLINUX=true @@ -81,7 +80,7 @@ LDFLAGS+= -lBlocksRuntime # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # If both of them are not installed, then voice calls do not work, but other functionalities still work. -OPTIONS_DEFINE= SYSTEM_FONTS +OPTIONS_DEFINE= SYSTEM_FONTS WAYLAND OPTIONS_DEFAULT= ALSA OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO @@ -93,7 +92,9 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio ALSA_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_ALSA PULSEAUDIO_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_PULSEAUDIO -SYSTEM_FONTS_CMAKE_BOOL= DESKTOP_APP_USE_PACKAGED_FONTS +SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS +WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION +WAYLAND_USE= qt=wayland # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d