Index: head/net-im/telegram-desktop/Makefile =================================================================== --- head/net-im/telegram-desktop/Makefile (revision 547559) +++ head/net-im/telegram-desktop/Makefile (revision 547560) @@ -1,107 +1,107 @@ # $FreeBSD$ PORTNAME= telegram-desktop DISTVERSION= 2.3.2 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Telegram Desktop messaging app LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported BROKEN_i386= Does not build, webrtc related. BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ dee>0:devel/dee \ microsoft-gsl>0:devel/microsoft-gsl \ pulseaudio>0:audio/pulseaudio \ range-v3>0:devel/range-v3 \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libenchant-2.so:textproc/enchant2 \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libqrcodegencpp.so:graphics/qr-code-generator \ libusrsctp.so:net/libusrsctp \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash -USES= cmake compiler:c++17-lang desktop-file-utils \ +USES= cmake compiler:c++17-lang desktop-file-utils gl \ gnome pkgconfig python:3.7,build qt:5 ssl xorg # see Bugzilla #245452 for details NO_CCACHE= yes USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop GH_TUPLE= desktop-app:tg_owt:fc49a0e:tg_owt/tg_owt USE_GNOME= glib20 USE_QT= core dbus gui imageformats network widgets buildtools_build \ qmake_build wayland USE_XORG= x11 xcb USE_GL= gl CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \ DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -Ddisable_autoupdate=1 \ -DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_ID= 601761 TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d # 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_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO OPTIONS_DEFINE= GTK OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend for voice calls GTK_DESC= Gtk integration (Use Gtk dialogs, etc.) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio GTK_CMAKE_BOOL_OFF= TDESKTOP_DISABLE_GTK_INTEGRATION INSTALLS_ICONS= yes .include .if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk30 .endif .include pre-configure: @cd ${WRKSRC}/tg_owt && \ ${MKDIR} out/${CMAKE_BUILD_TYPE} && \ cd out/${CMAKE_BUILD_TYPE} && \ ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/tg_owt pre-build: @cd ${WRKSRC}/tg_owt/out/${CMAKE_BUILD_TYPE} && ${DO_MAKE_BUILD} .include Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp (revision 547559) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp (nonexistent) @@ -1,22 +0,0 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2020-02-18 08:28:06 UTC -+++ Telegram/SourceFiles/core/update_checker.cpp -@@ -1460,6 +1460,9 @@ int UpdateChecker::size() const { - //} - - bool checkReadyUpdate() { -+#ifdef Q_OS_FREEBSD -+ return false; -+#endif - QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp"); - if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) { - if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { -@@ -1512,6 +1515,9 @@ bool checkReadyUpdate() { - #elif defined Q_OS_UNIX // Q_OS_MAC - QString curUpdater = (cExeDir() + qsl("Updater")); - QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); -+#elif defined Q_OS_FREEBSD -+ QString curUpdater; -+ QFileInfo updater; - #endif // Q_OS_UNIX - if (!updater.exists()) { - QFileInfo current(curUpdater); Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_effects_animation__value.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_effects_animation__value.h (revision 547559) +++ head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_effects_animation__value.h (nonexistent) @@ -1,11 +0,0 @@ ---- Telegram/lib_ui/ui/effects/animation_value.h.orig 2020-05-29 11:22:37 UTC -+++ Telegram/lib_ui/ui/effects/animation_value.h -@@ -6,6 +6,8 @@ - // - #pragma once - -+#include -+ - #include "base/basic_types.h" - - #include "ui/style/style_core.h" Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_effects_animation__value.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_input__fields.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_input__fields.h (revision 547559) +++ head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_input__fields.h (nonexistent) @@ -1,10 +0,0 @@ ---- Telegram/lib_ui/ui/widgets/input_fields.h.orig 2020-05-29 11:22:48 UTC -+++ Telegram/lib_ui/ui/widgets/input_fields.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - class QTouchEvent; - class Painter; Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_input__fields.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake (revision 547559) +++ head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake (nonexistent) @@ -1,20 +0,0 @@ ---- Telegram/cmake/lib_tgvoip.cmake.orig 2020-05-24 07:59:19 UTC -+++ Telegram/cmake/lib_tgvoip.cmake -@@ -793,11 +793,17 @@ else() - ) - endif() - -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(PULSE REQUIRED IMPORTED_TARGET libpulse) -+ pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa) -+ - target_include_directories(lib_tgvoip - PUBLIC - ${tgvoip_loc} - PRIVATE - ${tgvoip_loc}/webrtc_dsp -+ ${PULSE_INCLUDE_DIRS} -+ ${ALSA_INCLUDE_DIRS} - ) - - target_link_libraries(lib_tgvoip Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property