Index: head/net-im/telegram-desktop/Makefile =================================================================== --- head/net-im/telegram-desktop/Makefile (revision 467606) +++ head/net-im/telegram-desktop/Makefile (revision 467607) @@ -1,88 +1,103 @@ # $FreeBSD$ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.1.23 +DISTVERSION= 1.2.17 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com COMMENT= Telegram Desktop messaging app LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= dee>0:devel/dee \ - gyp:devel/py-gyp@${PY_FLAVOR} -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libavformat.so:multimedia/ffmpeg \ + gyp:devel/py-gyp@${PY_FLAVOR} \ + range-v3>0:devel/range-v3 \ + pulseaudio>0:audio/pulseaudio \ + alsa-lib>0:audio/alsa-lib +LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ - libopus.so:audio/opus \ - libpulse.so:audio/pulseaudio + libopus.so:audio/opus USES= cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build ssl USE_GITHUB= yes GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \ mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \ - Microsoft:GSL:c5851a8:gsl/Telegram/ThirdParty/GSL \ - telegramdesktop:libtgvoip:757a5d8e:libtgvoip/Telegram/ThirdParty/libtgvoip + Microsoft:GSL:9d65e74:gsl/Telegram/ThirdParty/GSL \ + telegramdesktop:libtgvoip:6e0e102:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:344cbde9:crl/Telegram/ThirdParty/crl USE_GNOME= glib20 gtk30 -USE_QT5= core gui imageformats network widgets buildtools_build qmake_build +USE_QT5= core gui imageformats network widgets buildtools_build qmake_build dbus USE_XORG= x11 xcb CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME +# 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_DEFAULT= ALSA + +AUDIO_DESC= Audio backend for voice calls + +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + .include +# This port needs C++17 libs/compiler. +# Currently, this is not supported by USES=compiler +# Using clang does not work: libc++ in base does not support C++17. +# Using gcc does not work: using both libc++ and libstdc++ causes crashes. .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -CC= clang40 -CXX= clang++40 -BUILD_DEPENDS+= clang++40:devel/llvm40 -RUN_DEPENDS+= clang++40:devel/llvm40 +BROKEN= Need C++17 support in compiler and runtime .endif post-patch: @cd ${WRKSRC} && \ (${SED} -e " \ s|%%QT_VERSION%%|${QT5_VERSION}| ; \ s|%%LOCALBASE%%|${LOCALBASE}| ; \ s|%%CFLAGS%%|${CFLAGS:C/(.*)/'\1',/}| ; \ s|%%CXXFLAGS%%|${CXXFLAGS:C/(.*)/'\1',/}| ; \ s|%%LDFLAGS%%|${LDFLAGS:C/(.*)/'\1',/}| ; \ s|%%QT_BINDIR%%|${QT_BINDIR}| ; \ s|%%QT_INCDIR%%|${QT_INCDIR}| ; \ s|%%QT_LIBDIR%%|${QT_LIBDIR}| ; \ s|%%QMAKESPEC%%|${QMAKESPEC}| ; \ s|%%PYTHON_CMD%%|${PYTHON_CMD}|" \ ${FILESDIR}/gyp-patches | \ ${PATCH} -z .bak -s) @${ECHO} "#define FREEBSD_QT_PLUGINDIR \"${QT_PLUGINDIR}\"" > ${WRKSRC}/Telegram/SourceFiles/FREEBSD_QT_PLUGINDIR.h pre-configure: @cd ${WRKSRC} && gyp \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake @TOT=`wc -l < ${WRKSRC}/out/Release/CMakeLists.txt` && NUM=`expr $$TOT - 2` && \ ${SED} -i -e "$$NUM r ${FILESDIR}/CMakeLists.inj" ${WRKSRC}/out/Release/CMakeLists.txt do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Telegram ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/lib/xdg/telegramdesktop.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${MKDIR} ${STAGEDIR}${PREFIX}/share/kservices5 ${INSTALL_DATA} ${WRKSRC}/lib/xdg/tg.protocol ${STAGEDIR}${PREFIX}/share/kservices5 @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata ${INSTALL_DATA} ${WRKSRC}/lib/xdg/telegramdesktop.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/${PORTNAME}.appdata.xml .for icon_size in 16 32 48 64 128 256 512 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps ${INSTALL_DATA} \ ${WRKSRC}/Telegram/Resources/art/icon${icon_size}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps/${PORTNAME}.png .endfor .include Index: head/net-im/telegram-desktop/distinfo =================================================================== --- head/net-im/telegram-desktop/distinfo (revision 467606) +++ head/net-im/telegram-desktop/distinfo (revision 467607) @@ -1,11 +1,13 @@ -TIMESTAMP = 1512711381 -SHA256 (telegramdesktop-tdesktop-v1.1.23_GH0.tar.gz) = 56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030 -SIZE (telegramdesktop-tdesktop-v1.1.23_GH0.tar.gz) = 16863984 -SHA256 (Microsoft-GSL-c5851a8_GH0.tar.gz) = 32fae541af0bc21cdf83922740db6a3a00fbb9cb9ace323fbc038b608ac36956 -SIZE (Microsoft-GSL-c5851a8_GH0.tar.gz) = 54462 -SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 -SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686 +TIMESTAMP = 1523832839 +SHA256 (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d +SIZE (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 16916625 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 -SHA256 (telegramdesktop-libtgvoip-757a5d8e_GH0.tar.gz) = a745c2c097f6a98bf9443d0cee9e375f279571a18dcb51bf06684eccf82eb9c6 -SIZE (telegramdesktop-libtgvoip-757a5d8e_GH0.tar.gz) = 408328 +SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 +SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686 +SHA256 (Microsoft-GSL-9d65e74_GH0.tar.gz) = c2270ade74bd74831e2e854970c04db77f00e0dfdb0a3c3bce356da6019dd18d +SIZE (Microsoft-GSL-9d65e74_GH0.tar.gz) = 57320 +SHA256 (telegramdesktop-libtgvoip-6e0e102_GH0.tar.gz) = 53f2d27f8bc76d454cd933fe0d598155d091967e9cb98b095cd44f2a70137220 +SIZE (telegramdesktop-libtgvoip-6e0e102_GH0.tar.gz) = 411964 +SHA256 (telegramdesktop-crl-344cbde9_GH0.tar.gz) = ec7d04bc36ed6dda88574e317e78d332b36cbd3378c3a8218ac5a3f37ee6d90f +SIZE (telegramdesktop-crl-344cbde9_GH0.tar.gz) = 18308 Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_structs.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_structs.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_structs.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- Telegram/SourceFiles/structs.cpp.orig 2017-09-05 17:38:38 UTC -+++ Telegram/SourceFiles/structs.cpp -@@ -1280,7 +1280,7 @@ QString saveFileName(const QString &titl - name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); - #elif defined Q_OS_MAC - name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); --#elif defined Q_OS_LINUX -+#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD - name = name.replace(QRegularExpression(qsl("[\\/]")), qsl("_")); - #endif - if (Global::AskDownloadPath() || savingAs) { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_structs.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_SourceFiles_main.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_main.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_main.cpp (nonexistent) @@ -1,30 +0,0 @@ ---- Telegram/SourceFiles/main.cpp.orig 2017-09-05 17:38:38 UTC -+++ Telegram/SourceFiles/main.cpp -@@ -22,10 +22,13 @@ Copyright (c) 2014-2017 John Preston, ht - #include "platform/platform_specific.h" - #include "storage/localstorage.h" - -+#include "FREEBSD_QT_PLUGINDIR.h" -+ - int main(int argc, char *argv[]) { --#ifndef Q_OS_MAC // Retina display support is working fine, others are not. -+#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -+ // Retina display support is working fine, others are not. - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); --#endif // Q_OS_MAC -+#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); - - InitFromCommandLine(argc, argv); -@@ -39,6 +42,11 @@ int main(int argc, char *argv[]) { - Logs::start(); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created - -+ // I don't know why path is not in QT_PLUGIN_PATH by default -+ QCoreApplication::addLibraryPath(FREEBSD_QT_PLUGINDIR); -+ // without this Telegram doesn't start on Ubuntu 17.04 due GTK errors -+ setenv("QT_STYLE_OVERRIDE", "qwerty", false); -+ - int result = 0; - { - Application app(argc, argv); Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_main.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_SourceFiles_mainwindow.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_mainwindow.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_mainwindow.cpp (nonexistent) @@ -1,19 +0,0 @@ ---- Telegram/SourceFiles/mainwindow.cpp.orig 2017-09-05 17:38:38 UTC -+++ Telegram/SourceFiles/mainwindow.cpp -@@ -460,6 +460,7 @@ void MainWindow::ui_hideMediaPreview() { - void MainWindow::showConnecting(const QString &text, const QString &reconnect) { - if (_connecting) { - _connecting->set(text, reconnect); -+ _connecting->show(); - } else { - _connecting.create(bodyWidget(), text, reconnect); - _connecting->show(); -@@ -470,7 +471,7 @@ void MainWindow::showConnecting(const QS - - void MainWindow::hideConnecting() { - if (_connecting) { -- _connecting.destroyDelayed(); -+ _connecting->hide(); - } - } - Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_mainwindow.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/gyp-patches =================================================================== --- head/net-im/telegram-desktop/files/gyp-patches (revision 467606) +++ head/net-im/telegram-desktop/files/gyp-patches (revision 467607) @@ -1,375 +1,435 @@ ---- Telegram/gyp/qt_rcc.gypi.orig 2017-09-05 17:38:38 UTC +--- Telegram/gyp/qt_rcc.gypi.orig 2018-01-03 10:46:01 UTC +++ Telegram/gyp/qt_rcc.gypi -@@ -28,7 +28,7 @@ +@@ -15,7 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp', ], 'action': [ - '<(qt_loc)/bin/rcc<(exe_ext)', + '%%QT_BINDIR%%/rcc', '-name', '<(RULE_INPUT_ROOT)', '-no-compress', '<(RULE_INPUT_PATH)', ---- Telegram/gyp/qt.gypi.orig 2017-09-05 17:38:38 UTC +--- Telegram/gyp/qt_moc.gypi.orig 2018-01-03 10:46:01 UTC ++++ Telegram/gyp/qt_moc.gypi +@@ -12,12 +12,12 @@ + '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', + ], + 'action': [ +- '<(qt_loc)/bin/moc<(exe_ext)', ++ '%%QT_BINDIR%%/moc', + + # Silence "Note: No relevant classes found. No output generated." + '--no-notes', + +- ' /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -- ' /dev/null --cflags appindicator-0.1)', -- ' /dev/null --cflags gtk+-2.0)', -- ' /dev/null --cflags glib-2.0)', -+# ' /dev/null --cflags appindicator-0.1)', -+ ' /dev/null --cflags gtk+-3.0)', - ' /dev/null --cflags dee-1.0)', +@@ -67,7 +59,6 @@ + 'ldflags': [ + '-Wl,-wrap,aligned_alloc', + '-Wl,-wrap,secure_getenv', +- '-Wl,-wrap,clock_gettime', + '-Wl,--no-as-needed,-lrt', ], 'configurations': { - 'Release': { - 'cflags': [ -- '-Ofast', -- '-flto', -+ %%CFLAGS%% - '-fno-strict-aliasing', +@@ -86,7 +77,7 @@ + }, + }, + 'conditions': [ +- [ '" /dev/null --cflags appindicator-0.1)', +- ' /dev/null --cflags gtk+-2.0)', +- ' /dev/null --cflags glib-2.0)', +- ' /dev/null --cflags dee-1.0)', ++ ' /dev/null --cflags gtk+-3.0)', ], - 'ldflags': [ -- '-Ofast', -- '-flto', -+ %%LDFLAGS%% - ], - }, - }, ---- Telegram/gyp/Telegram.gyp.orig 2017-09-05 17:38:38 UTC + }] + ], +--- Telegram/gyp/Telegram.gyp.orig 2018-01-03 10:46:01 UTC +++ Telegram/gyp/Telegram.gyp -@@ -61,7 +61,7 @@ +@@ -49,7 +49,7 @@ 'pt-BR', ], 'build_defines%': '', - 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)', + 'list_sources_command': '%%PYTHON_CMD%% <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)', }, 'includes': [ 'common_executable.gypi', -@@ -80,28 +80,19 @@ +@@ -69,30 +69,20 @@ 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', 'tests/tests.gyp:tests', - 'utils.gyp:Updater', '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', + 'crl.gyp:crl', ], 'defines': [ - 'AL_LIBTYPE_STATIC', 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', - ' + +- ../etc/qt_linux.conf + + Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp (revision 467607) @@ -1,11 +1,11 @@ ---- Telegram/SourceFiles/_other/packer.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/_other/packer.cpp.orig 2018-02-06 05:52:28 UTC +++ Telegram/SourceFiles/_other/packer.cpp -@@ -246,7 +246,7 @@ int main(int argc, char *argv[]) +@@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } QByteArray inner = f.readAll(); stream << name << quint32(inner.size()) << inner; -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD stream << (QFileInfo(fullName).isExecutable() ? true : false); #endif } Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h (revision 467607) @@ -1,11 +1,11 @@ ---- Telegram/SourceFiles/base/build_config.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/base/build_config.h.orig 2018-02-06 05:52:11 UTC +++ Telegram/SourceFiles/base/build_config.h -@@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, ht +@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesk #if defined(__APPLE__) #define OS_MAC 1 -#elif defined(__linux__) // __APPLE__ -+#elif defined(__linux__) || defined(__FreeBSD__)// __APPLE__ ++#elif defined(__linux__) || defined(__FreeBSD__) // __APPLE__ #define OS_LINUX 1 #elif defined(_WIN32) // __APPLE__ || __linux__ #define OS_WIN 1 Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h (revision 467607) @@ -1,73 +1,73 @@ ---- Telegram/SourceFiles/base/lambda.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/base/lambda.h.orig 2018-01-03 10:46:01 UTC +++ Telegram/SourceFiles/base/lambda.h -@@ -212,11 +212,14 @@ protected: +@@ -226,11 +226,14 @@ protected: template struct vtable_once : public vtable_once_impl, Return, Args...> { - static const vtable_once instance; + static const vtable_once* get_instance(); }; template -const vtable_once vtable_once::instance = {}; +const vtable_once* vtable_once::get_instance() { + static vtable_once instance; + return &instance; +} template struct vtable_impl; -@@ -262,12 +265,14 @@ struct vtable_impl struct vtable : public vtable_impl, Return, Args...> { - static const vtable instance; + static const vtable* get_instance(); }; template -const vtable vtable::instance = {}; - +const vtable* vtable::get_instance() { + static vtable instance; + return &instance; +} } // namespace lambda_internal template -@@ -346,7 +351,7 @@ public: +@@ -360,7 +365,7 @@ public: // Copy / move construct / assign from an arbitrary type. template ()(std::declval()...)),Return>::value>> lambda_once(Lambda other) { - data_.vtable = &lambda_internal::vtable_once::instance; + data_.vtable = lambda_internal::vtable_once::get_instance(); lambda_internal::vtable_once::construct_move_lambda_method(data_.storage, &other); } template ()(std::declval()...)),Return>::value>> -@@ -354,7 +359,7 @@ public: +@@ -368,7 +373,7 @@ public: if (data_.vtable) { data_.vtable->destruct(data_.storage); } - data_.vtable = &lambda_internal::vtable_once::instance; + data_.vtable = lambda_internal::vtable_once::get_instance(); lambda_internal::vtable_once::construct_move_lambda_method(data_.storage, &other); return *this; } -@@ -424,7 +429,7 @@ public: +@@ -443,7 +448,7 @@ public: // Copy / move construct / assign from an arbitrary type. template ()(std::declval()...)),Return>::value>> - lambda(Lambda other) : Parent(&lambda_internal::vtable::instance, typename Parent::Private()) { + lambda(Lambda other) : Parent(lambda_internal::vtable::get_instance(), typename Parent::Private()) { lambda_internal::vtable::construct_move_lambda_method(this->data_.storage, &other); } template ()(std::declval()...)),Return>::value>> -@@ -432,7 +437,7 @@ public: +@@ -451,7 +456,7 @@ public: if (this->data_.vtable) { this->data_.vtable->destruct(this->data_.storage); } - this->data_.vtable = &lambda_internal::vtable::instance; + this->data_.vtable = lambda_internal::vtable::get_instance(); lambda_internal::vtable::construct_move_lambda_method(this->data_.storage, &other); return *this; } Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp (revision 467607) @@ -0,0 +1,17 @@ +--- Telegram/SourceFiles/boxes/notifications_box.cpp.orig 2018-02-06 06:26:42 UTC ++++ Telegram/SourceFiles/boxes/notifications_box.cpp +@@ -84,11 +84,11 @@ private: + _deleted = true; + + // Ubuntu has a lag if deleteLater() called immediately. +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + QTimer::singleShot(1000, [this] { delete this; }); +-#else // Q_OS_LINUX32 || Q_OS_LINUX64 ++#else // Q_OS_LINUX32 || Q_OS_LINUX64 || defined Q_OS_FREEBSD + deleteLater(); +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || defined Q_OS_FREEBSD + } + + NotificationsBox *_owner; Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h (revision 467607) @@ -1,20 +1,20 @@ ---- Telegram/SourceFiles/config.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/config.h.orig 2018-04-08 17:34:33 UTC +++ Telegram/SourceFiles/config.h -@@ -270,7 +270,7 @@ inline const char *cApiDeviceModel() { +@@ -240,7 +240,7 @@ inline const char *cApiDeviceModel() { return "PC"; #elif defined Q_OS_MAC return "Mac"; -#elif defined Q_OS_LINUX +#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD return "PC"; #endif } -@@ -281,6 +281,8 @@ inline const char *cApiSystemVersion() { +@@ -251,6 +251,8 @@ inline const char *cApiSystemVersion() { return "OS X"; #elif defined Q_OS_LINUX return "Linux"; +#elif defined Q_OS_FREEBSD + return "FreeBSD"; #endif } Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp (revision 467607) @@ -0,0 +1,47 @@ +--- Telegram/SourceFiles/core/launcher.cpp.orig 2018-01-03 10:46:01 UTC ++++ Telegram/SourceFiles/core/launcher.cpp +@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesk + #include "core/main_queue_processor.h" + #include "application.h" + ++#include "FREEBSD_QT_PLUGINDIR.h" ++ + namespace Core { + + std::unique_ptr Launcher::Create(int argc, char *argv[]) { +@@ -31,9 +33,10 @@ void Launcher::init() { + + QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + +-#ifndef OS_MAC_OLD ++#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) ++ // Retina display support is working fine, others are not. + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); +-#endif // OS_MAC_OLD ++#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 + + initHook(); + } +@@ -51,6 +54,11 @@ int Launcher::exec() { + Logs::start(this); // must be started before Platform is started + Platform::start(); // must be started before QApplication is created + ++ // I don't know why path is not in QT_PLUGIN_PATH by default ++ QCoreApplication::addLibraryPath(FREEBSD_QT_PLUGINDIR); ++ // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 ++ unsetenv("QT_QPA_PLATFORMTHEME"); ++ + auto result = executeApplication(); + + DEBUG_LOG(("Telegram finished, result: %1").arg(result)); +@@ -136,6 +144,10 @@ void Launcher::prepareSettings() { + gUpdateURL = QUrl(qsl("http://tdesktop.com/linux32/tupdates/current")); + gPlatformString = qsl("Linux32bit"); + break; ++ case dbipFreeBSD: ++ gUpdateURL = QUrl(qsl("")); ++ gPlatformString = qsl("FreeBSD"); ++ break; + } + + auto path = Platform::CurrentExecutablePath(_argc, _argv); Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h (revision 467607) @@ -0,0 +1,10 @@ +--- Telegram/SourceFiles/core/utils.h.orig 2018-04-08 17:34:33 UTC ++++ Telegram/SourceFiles/core/utils.h +@@ -451,6 +451,7 @@ enum DBIPlatform { + dbipLinux64 = 2, + dbipLinux32 = 3, + dbipMacOld = 4, ++ dbipFreeBSD = 5, + }; + + enum DBIPeerReportSpamStatus { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp (revision 467607) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/data/data_document.cpp.orig 2018-04-08 17:34:33 UTC ++++ Telegram/SourceFiles/data/data_document.cpp +@@ -76,7 +76,7 @@ QString FileNameUnsafe( + name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); + #elif defined Q_OS_MAC + name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); +-#elif defined Q_OS_LINUX ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD + name = name.replace(QRegularExpression(qsl("[\\/]")), qsl("_")); + #endif + if (Global::AskDownloadPath() || savingAs) { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp (revision 467607) @@ -0,0 +1,18 @@ +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2018-04-08 17:34:33 UTC ++++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +@@ -1388,13 +1388,13 @@ void InnerWidget::mouseActionFinish(cons + _mouseSelectType = TextSelectType::Letters; + //_widget->noSelectingScroll(); // TODO + +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + if (_selectedItem && _selectedText.from != _selectedText.to) { + SetClipboardWithEntities( + _selectedItem->selectedText(_selectedText), + QClipboard::Selection); + } +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void InnerWidget::updateSelected() { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp (revision 467607) @@ -0,0 +1,20 @@ +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-04-08 17:34:33 UTC ++++ Telegram/SourceFiles/history/history_inner_widget.cpp +@@ -1336,7 +1336,7 @@ void HistoryInner::mouseActionFinish( + _widget->noSelectingScroll(); + _widget->updateTopBarSelection(); + +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + if (!_selected.empty() && _selected.cbegin()->second != FullSelection) { + const auto [item, selection] = *_selected.cbegin(); + if (const auto view = item->mainView()) { +@@ -1345,7 +1345,7 @@ void HistoryInner::mouseActionFinish( + QClipboard::Selection); + } + } +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void HistoryInner::mouseReleaseEvent(QMouseEvent *e) { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp (revision 467607) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2018-04-15 23:31:46 UTC ++++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp +@@ -2014,7 +2014,7 @@ void ListWidget::mouseActionFinish( + _mouseSelectType = TextSelectType::Letters; + //_widget->noSelectingScroll(); // #TODO select scroll + +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + if (_selectedTextItem + && _selectedTextRange.from != _selectedTextRange.to) { + if (const auto view = viewForItem(_selectedTextItem)) { Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp (revision 467607) @@ -1,22 +1,22 @@ ---- Telegram/SourceFiles/layout.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/layout.cpp.orig 2018-04-08 17:34:33 UTC +++ Telegram/SourceFiles/layout.cpp -@@ -264,16 +264,16 @@ bool documentIsExecutableName(const QStr +@@ -206,16 +206,16 @@ bool documentIsExecutableName(const QStr *result = qsl("\ action app bin command csh osx workflow\ ").split(' '); -#elif defined Q_OS_LINUX // Q_OS_MAC +#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC *result = qsl("\ bin csh ksh out run\ ").split(' '); -#else // Q_OS_MAC || Q_OS_LINUX +#else // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD *result = qsl("\ bat bin cmd com cpl exe gadget inf ins inx isu job jse lnk msc msi \ msp mst paf pif ps1 reg rgs sct shb shs u3p vb vbe vbs vbscript ws wsf\ ").split(' '); -#endif // !Q_OS_MAC && !Q_OS_LINUX -+#endif // !Q_OS_MAC && !Q_OS_LINUX && ! Q_OS_FREEBSD ++#endif // !Q_OS_MAC && !Q_OS_LINUX && !Q_OS_FREEBSD return result.release(); })()); Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp (revision 467607) @@ -1,35 +1,39 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2018-02-06 05:51:11 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -311,7 +311,7 @@ namespace Logs { - QString initialWorkingDir = QDir(cWorkingDir()).absolutePath() + '/', moveOldDataFrom; - if (cBetaVersion()) { - cSetDebug(true); +@@ -321,7 +321,7 @@ void start(not_null lau + if (cBetaVersion()) { + cSetDebug(true); + workingDirChosen = true; -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD - } else { + } else { #ifdef _DEBUG - cForceWorkingDir(cExeDir()); -@@ -322,11 +322,11 @@ namespace Logs { - #endif // else for _DEBUG - workingDirChosen = true; + cForceWorkingDir(cExeDir()); +@@ -335,15 +335,15 @@ void start(not_null lau + #endif // !_DEBUG + workingDirChosen = true; -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version +#if (defined Q_OS_LINUX || defined Q_OS_FREEBSD) && !defined _DEBUG // fix first version - moveOldDataFrom = initialWorkingDir; --#endif // Q_OS_LINUX && !_DEBUG -+#endif // (Q_OS_LINUX || Q_OS_FREEBSD) && !_DEBUG + moveOldDataFrom = initialWorkingDir; + #endif // Q_OS_LINUX && !_DEBUG -#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD - } else { - cForceWorkingDir(psAppDataPath()); + } else { + cForceWorkingDir(psAppDataPath()); + workingDirChosen = true; +-#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT ++#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_FREEBSD + #ifdef _DEBUG + cForceWorkingDir(cExeDir()); + #else // _DEBUG +@@ -357,7 +357,7 @@ void start(not_null lau + cForceWorkingDir(cWorkingDir()); workingDirChosen = true; -@@ -502,7 +502,7 @@ namespace Logs { - //OutputDebugString(reinterpret_cast(msg.utf16())); - #elif defined Q_OS_MAC - //objc_outputDebugString(msg); --#elif defined Q_OS_LINUX && defined _DEBUG -+#elif (defined Q_OS_LINUX || defined Q_OS_FREEBSD) && defined _DEBUG - //std::cout << msg.toUtf8().constData(); - #endif + } +-#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE ++#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE || Q_OS_FREEBSD } + + LogsData = new LogsDataFields(); Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp (revision 467607) @@ -1,47 +1,47 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-02-06 05:57:25 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp -@@ -133,6 +133,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { +@@ -121,6 +121,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { return true; } +#ifdef HAVE_APPINDICATOR bool setupAppIndicator(QLibrary &lib_indicator) { if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false; if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false; -@@ -142,6 +143,7 @@ bool setupAppIndicator(QLibrary &lib_ind +@@ -130,6 +131,7 @@ bool setupAppIndicator(QLibrary &lib_ind DEBUG_LOG(("Library appindicator functions loaded!")); return true; } +#endif + #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION } // namespace - -@@ -201,10 +203,12 @@ f_g_type_check_instance_cast g_type_chec +@@ -191,10 +193,12 @@ f_g_type_check_instance_cast g_type_chec f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr; f_g_signal_connect_data g_signal_connect_data = nullptr; f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr; +#ifdef HAVE_APPINDICATOR f_app_indicator_new app_indicator_new = nullptr; f_app_indicator_set_status app_indicator_set_status = nullptr; f_app_indicator_set_menu app_indicator_set_menu = nullptr; f_app_indicator_set_icon_full app_indicator_set_icon_full = nullptr; +#endif f_gdk_init_check gdk_init_check = nullptr; f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr; f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr; -@@ -242,6 +246,7 @@ void start() { +@@ -234,6 +238,7 @@ void start() { bool gtkLoaded = false; bool indicatorLoaded = false; QLibrary lib_gtk, lib_indicator; +#ifdef HAVE_APPINDICATOR if (loadLibrary(lib_indicator, "appindicator3", 1)) { if (loadLibrary(lib_gtk, "gtk-3", 0)) { gtkLoaded = setupGtkBase(lib_gtk); -@@ -257,6 +262,7 @@ void start() { +@@ -249,6 +254,7 @@ void start() { } } } +#endif // If no appindicator, try at least load gtk. if (!gtkLoaded && !indicatorLoaded) { Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h (revision 467607) @@ -1,36 +1,36 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-02-06 05:56:56 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -22,14 +22,16 @@ Copyright (c) 2014-2017 John Preston, ht - +@@ -10,14 +10,16 @@ https://github.com/telegramdesktop/tdesk + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION extern "C" { #undef signals +#ifdef HAVE_APPINDICATOR #include +#endif #include #include #define signals public } // extern "C" #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION -#include +typedef void UnityLauncherEntry; #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION + #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - namespace Platform { -@@ -284,6 +286,7 @@ inline gulong g_signal_connect_swapped_h +@@ -274,6 +276,7 @@ inline gulong g_signal_connect_swapped_h typedef void (*f_g_signal_handler_disconnect)(gpointer instance, gulong handler_id); extern f_g_signal_handler_disconnect g_signal_handler_disconnect; +#ifdef HAVE_APPINDICATOR typedef AppIndicator* (*f_app_indicator_new)(const gchar *id, const gchar *icon_name, AppIndicatorCategory category); extern f_app_indicator_new app_indicator_new; -@@ -295,6 +298,7 @@ extern f_app_indicator_set_menu app_indi +@@ -285,6 +288,7 @@ extern f_app_indicator_set_menu app_indi typedef void (*f_app_indicator_set_icon_full)(AppIndicator *self, const gchar *icon_name, const gchar *icon_desc); extern f_app_indicator_set_icon_full app_indicator_set_icon_full; +#endif typedef gboolean (*f_gdk_init_check)(gint *argc, gchar ***argv); extern f_gdk_init_check gdk_init_check; Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp (revision 467607) @@ -1,87 +1,87 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-04-08 17:34:33 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -36,7 +36,9 @@ namespace { - bool noQtTrayIcon = false, tryAppIndicator = false; +@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicat bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +#ifdef HAVE_APPINDICATOR AppIndicator *_trayIndicator = 0; +#endif GtkStatusIcon *_trayIcon = 0; GtkWidget *_trayMenu = 0; GdkPixbuf *_trayPixbuf = 0; -@@ -274,7 +276,9 @@ void MainWindow::workmodeUpdated(DBIWork - if (mode == dbiwmWindowOnly) { +@@ -279,7 +281,9 @@ void MainWindow::workmodeUpdated(DBIWork if (noQtTrayIcon) { + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { +#ifdef HAVE_APPINDICATOR Libs::app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_PASSIVE); +#endif } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, false); } -@@ -288,7 +292,9 @@ void MainWindow::workmodeUpdated(DBIWork - } else { +@@ -295,7 +299,9 @@ void MainWindow::workmodeUpdated(DBIWork if (noQtTrayIcon) { + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { +#ifdef HAVE_APPINDICATOR Libs::app_indicator_set_status(_trayIndicator, APP_INDICATOR_STATUS_ACTIVE); +#endif } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, true); } -@@ -305,7 +311,9 @@ void MainWindow::psUpdateIndicator() { +@@ -314,7 +320,9 @@ void MainWindow::psUpdateIndicator() { if (iconFile.exists()) { QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName()); name = name.mid(0, name.size() - 4); +#ifdef HAVE_APPINDICATOR Libs::app_indicator_set_icon_full(_trayIndicator, path.constData(), name); +#endif } else { useAppIndicator = false; } -@@ -392,11 +400,15 @@ void MainWindow::LibsLoaded() { +@@ -407,11 +415,15 @@ void MainWindow::LibsLoaded() { && (Libs::g_object_ref_sink != nullptr) && (Libs::g_object_unref != nullptr); +#ifdef HAVE_APPINDICATOR useAppIndicator = useGtkBase && (Libs::app_indicator_new != nullptr) && (Libs::app_indicator_set_status != nullptr) && (Libs::app_indicator_set_menu != nullptr) && (Libs::app_indicator_set_icon_full != nullptr); +#else -+ useAppIndicator = false; ++ useAppIndicator = false; +#endif if (tryAppIndicator && useGtkBase && useAppIndicator) { noQtTrayIcon = true; -@@ -439,6 +451,7 @@ void MainWindow::psCreateTrayIcon() { - return; +@@ -456,6 +468,7 @@ void MainWindow::psCreateTrayIcon() { } + #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +#ifdef HAVE_APPINDICATOR if (useAppIndicator) { DEBUG_LOG(("Trying to create AppIndicator")); _trayMenu = Libs::gtk_menu_new(); -@@ -469,6 +482,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -486,6 +499,7 @@ void MainWindow::psCreateTrayIcon() { useAppIndicator = false; } } +#endif if (useStatusIcon) { if (Libs::gdk_init_check(0, 0)) { if (!_trayMenu) _trayMenu = Libs::gtk_menu_new(); -@@ -585,10 +599,12 @@ MainWindow::~MainWindow() { +@@ -604,10 +618,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } +#ifdef HAVE_APPINDICATOR if (_trayIndicator) { Libs::g_object_unref(_trayIndicator); _trayIndicator = nullptr; } +#endif #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION if (_psUnityLauncherEntry) { Libs::g_object_unref(_psUnityLauncherEntry); Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h (revision 467607) @@ -1,20 +1,20 @@ ---- Telegram/SourceFiles/platform/platform_audio.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_audio.h.orig 2018-02-06 05:55:32 UTC +++ Telegram/SourceFiles/platform/platform_audio.h -@@ -32,7 +32,7 @@ void DeInit(); +@@ -19,7 +19,7 @@ void DeInit(); // Platform dependent implementations. -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD namespace Platform { namespace Audio { -@@ -44,6 +44,6 @@ inline void DeInit() { +@@ -31,6 +31,6 @@ inline void DeInit() { } // namespace Audio } // namespace Platform -#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD #include "platform/win/audio_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h (revision 467607) @@ -1,14 +1,14 @@ ---- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2018-02-06 05:55:41 UTC +++ Telegram/SourceFiles/platform/platform_file_utilities.h -@@ -51,8 +51,8 @@ bool Get(QStringList &files, QByteArray +@@ -38,8 +38,8 @@ bool Get(QStringList &files, QByteArray #ifdef Q_OS_MAC #include "platform/mac/file_utilities_mac.h" -#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC #include "platform/linux/file_utilities_linux.h" -#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD #include "platform/win/file_utilities_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h (revision 467607) @@ -0,0 +1,14 @@ +--- Telegram/SourceFiles/platform/platform_launcher.h.orig 2018-02-07 00:52:41 UTC ++++ Telegram/SourceFiles/platform/platform_launcher.h +@@ -23,8 +23,8 @@ namespace Platform { + + #ifdef Q_OS_MAC + #include "platform/mac/launcher_mac.h" +-#elif defined Q_OS_LINUX // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC + #include "platform/linux/launcher_linux.h" +-#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX ++#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD + #include "platform/win/launcher_win.h" +-#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN ++#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_FREEBSD Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h (revision 467607) @@ -1,14 +1,14 @@ ---- Telegram/SourceFiles/platform/platform_main_window.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_main_window.h.orig 2018-02-06 05:55:51 UTC +++ Telegram/SourceFiles/platform/platform_main_window.h -@@ -32,8 +32,8 @@ class MainWindow; +@@ -19,8 +19,8 @@ class MainWindow; #ifdef Q_OS_MAC #include "platform/mac/main_window_mac.h" -#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC #include "platform/linux/main_window_linux.h" -#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD #include "platform/win/main_window_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h (revision 467607) @@ -1,14 +1,14 @@ ---- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2018-02-06 05:55:59 UTC +++ Telegram/SourceFiles/platform/platform_notifications_manager.h -@@ -39,8 +39,8 @@ void FlashBounce(); +@@ -26,8 +26,8 @@ void FlashBounce(); #ifdef Q_OS_MAC #include "platform/mac/notifications_manager_mac.h" -#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC #include "platform/linux/notifications_manager_linux.h" -#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD #include "platform/win/notifications_manager_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h (revision 467607) @@ -1,14 +1,14 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-02-06 05:56:11 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -45,8 +45,8 @@ void finish(); +@@ -32,8 +32,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" -#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC #include "platform/linux/specific_linux.h" -#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD #include "platform/win/specific_win.h" -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h (revision 467607) @@ -1,17 +1,17 @@ ---- Telegram/SourceFiles/platform/platform_window_title.h.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-02-06 05:56:19 UTC +++ Telegram/SourceFiles/platform/platform_window_title.h -@@ -38,7 +38,7 @@ void PreviewWindowFramePaint(QImage &pre +@@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &pre #include "platform/mac/window_title_mac.h" #elif defined Q_OS_WIN // Q_OS_MAC #include "platform/win/window_title_win.h" -#elif defined Q_OS_WINRT || defined Q_OS_LINUX // Q_OS_MAC || Q_OS_WIN -+#elif defined Q_OS_WINRT || defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC || Q_OS_WIN ++#elif defined Q_OS_WINRT || defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC || Q_OS_WIN namespace Platform { -@@ -56,4 +56,4 @@ inline void PreviewWindowFramePaint(QIma +@@ -43,4 +43,4 @@ inline void PreviewWindowFramePaint(QIma } // namespace Platform -#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX +#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX || Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp (revision 467607) @@ -1,97 +1,97 @@ ---- Telegram/SourceFiles/qt_functions.cpp.orig 2017-12-11 10:10:37 UTC +--- Telegram/SourceFiles/qt_functions.cpp.orig 2018-02-06 05:16:48 UTC +++ Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file contains some parts of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/* TODO: find a dynamic library with these symbols. */ + +/* Debian maintainer: this function is taken from qfiledialog.cpp */ +/* + Makes a list of filters from ;;-separated text. + Used by the mac and windows implementations +*/ +QStringList qt_make_filter_list(const QString &filter) +{ + QString f(filter); + + if (f.isEmpty()) + return QStringList(); + + QString sep(QLatin1String(";;")); + int i = f.indexOf(sep, 0); + if (i == -1) { + if (f.indexOf(QLatin1Char('\n'), 0) != -1) { + sep = QLatin1Char('\n'); + i = f.indexOf(sep, 0); + } + } + + return f.split(sep); +} + +/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */ +QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format) + : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format), + num_chars(numChars), chars(chars_), logClusters(0), f(font), glyphs(g), fontEngine(fe) +{ +} + +/* Debian maintainer: this method is also taken from qtextengine.cpp */ +// Fix up flags and underlineStyle with given info +void QTextItemInt::initWithScriptItem(const QScriptItem &si) +{ + // explicitly initialize flags so that initFontAttributes can be called + // multiple times on the same TextItem + flags = 0; + if (si.analysis.bidiLevel %2) + flags |= QTextItem::RightToLeft; + ascent = si.ascent; + descent = si.descent; + + if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) { + underlineStyle = charFormat.underlineStyle(); + } else if (charFormat.boolProperty(QTextFormat::FontUnderline) + || f->d->underline) { + underlineStyle = QTextCharFormat::SingleUnderline; + } + + // compat + if (underlineStyle == QTextCharFormat::SingleUnderline) + flags |= QTextItem::Underline; + + if (f->d->overline || charFormat.fontOverline()) + flags |= QTextItem::Overline; + if (f->d->strikeOut || charFormat.fontStrikeOut()) + flags |= QTextItem::StrikeOut; +} Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp (revision 467607) @@ -1,19 +1,19 @@ ---- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-01-03 10:46:01 UTC +++ Telegram/SourceFiles/qt_static_plugins.cpp -@@ -27,14 +27,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi +@@ -14,14 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) -#elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC -Q_IMPORT_PLUGIN(QWebpPlugin) -Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) -Q_IMPORT_PLUGIN(QConnmanEnginePlugin) -Q_IMPORT_PLUGIN(QGenericEnginePlugin) -Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin) -Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) -Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) -#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX +#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_WIN | Q_OS_MAC +#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX | Q_OS_FREEBSD Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp (revision 467607) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/settings.cpp.orig 2018-02-06 06:26:16 UTC ++++ Telegram/SourceFiles/settings.cpp +@@ -83,6 +83,8 @@ DBIPlatform gPlatform = dbipMac; + DBIPlatform gPlatform = dbipLinux64; + #elif defined Q_OS_LINUX32 + DBIPlatform gPlatform = dbipLinux32; ++#elif defined Q_OS_FREEBSD ++DBIPlatform gPlatform = dbipFreeBSD; + #else + #error Unknown platform + #endif Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp (revision 467607) @@ -0,0 +1,14 @@ +--- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig 2018-02-06 06:27:16 UTC ++++ Telegram/SourceFiles/settings/settings_notifications_widget.cpp +@@ -69,9 +69,9 @@ void NotificationsWidget::createNotifica + if (Platform::Notifications::Supported()) { + #ifdef Q_OS_WIN + nativeNotificationsLabel = lang(lng_settings_use_windows); +-#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_WIN ++#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 || defined Q_OS_FREEBSD // Q_OS_WIN + nativeNotificationsLabel = lang(lng_settings_use_native_notifications); +-#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32 ++#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32 || Q_OS_FREEBSD + } + if (!nativeNotificationsLabel.isEmpty()) { + createChildRow(_nativeNotifications, margin, nativeNotificationsLabel, [this](bool) { onNativeNotifications(); }, Global::NativeNotifications()); Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp (revision 467607) @@ -1,17 +1,17 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-04-08 17:34:33 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1689,11 +1689,11 @@ private: +@@ -1748,11 +1748,11 @@ private: if (item == -1) return; -#ifdef OS_MAC_OLD +#if defined(OS_MAC_OLD) || QT_VERSION < QT_VERSION_CHECK(5, 6, 0) auto end = _e->findItem(line.from + line.length - 1); -#else // OS_MAC_OLD +#else auto end = _e->findItem(line.from + line.length - 1, item); -#endif // OS_MAC_OLD +#endif auto blockIndex = _lineStartBlock; auto currentBlock = _t->_blocks[blockIndex].get(); Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp (revision 467607) @@ -1,11 +1,12 @@ ---- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-04-08 17:34:33 UTC +++ Telegram/SourceFiles/ui/text/text_block.cpp -@@ -330,7 +330,7 @@ TextBlock::TextBlock(const style::font & - SignalHandlers::setCrashAnnotationRef("CrashString", &part); +@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font & QStackTextEngine engine(part, blockFont->f); -- QTextLayout layout(&engine); + BlockParser parser(&engine, this, minResizeWidth, _from, part); + QTextLayout layout(part, blockFont->f); - layout.beginLayout(); - layout.createLine(); ++ layout.beginLayout(); ++ layout.createLine(); + CrashReports::ClearAnnotationRef("CrashString"); + } Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp (revision 467607) @@ -1,14 +1,14 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2017-09-05 17:38:38 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-01-03 10:46:01 UTC +++ Telegram/SourceFiles/ui/twidget.cpp -@@ -191,9 +191,9 @@ void sendSynteticMouseEvent(QWidget *wid +@@ -235,9 +235,9 @@ void sendSynteticMouseEvent(QWidget *wid , button , QGuiApplication::mouseButtons() | button , QGuiApplication::keyboardModifiers() -#ifndef OS_MAC_OLD +#if !defined(OS_MAC_OLD) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) , Qt::MouseEventSynthesizedByApplication -#endif // OS_MAC_OLD +#endif ); ev.setTimestamp(getms()); QGuiApplication::sendEvent(windowHandle, &ev); Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp (revision 467607) @@ -0,0 +1,16 @@ +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-02-06 06:28:03 UTC ++++ Telegram/SourceFiles/ui/widgets/labels.cpp +@@ -359,11 +359,11 @@ Text::StateResult FlatLabel::dragActionF + } + } + +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + if (!_selection.empty()) { + QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode), QClipboard::Selection); + } +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + + return state; + } Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h (revision 467607) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/window/main_window.h.orig 2018-04-08 17:34:33 UTC ++++ Telegram/SourceFiles/window/main_window.h +@@ -57,7 +57,7 @@ public: + } + + void reActivateWindow() { +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + onReActivate(); + QTimer::singleShot(200, this, SLOT(onReActivate())); + #endif // Q_OS_LINUX32 || Q_OS_LINUX64 Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp (revision 467607) @@ -0,0 +1,11 @@ +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-02-07 04:45:28 UTC ++++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp +@@ -1954,7 +1954,7 @@ static void initMachTimestart() { + #endif + + double VoIPController::GetCurrentTime(){ +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec+(double)ts.tv_nsec/1000000000.0; Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp (revision 467607) @@ -1,11 +1,29 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2017-07-06 17:16:18 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2017-12-27 18:47:58 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #include "../os/windows/AudioInputWave.h" #endif #include "../os/windows/AudioInputWASAPI.h" -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #include "../os/linux/AudioInputALSA.h" #include "../os/linux/AudioInputPulse.h" #else +@@ -54,7 +54,7 @@ AudioInput *AudioInput::Create(std::stri + return new AudioInputWave(deviceID); + #endif + return new AudioInputWASAPI(deviceID); +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + if(AudioInputPulse::IsAvailable()){ + AudioInputPulse* aip=new AudioInputPulse(deviceID); + if(!aip->IsInitialized()) +@@ -87,7 +87,7 @@ void AudioInput::EnumerateDevices(std::v + } + #endif + AudioInputWASAPI::EnumerateDevices(devs); +-#elif defined(__linux__) && !defined(__ANDROID__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) + if(!AudioInputPulse::IsAvailable() || !AudioInputPulse::EnumerateDevices(devs)) + AudioInputALSA::EnumerateDevices(devs); + #endif Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp (revision 467607) @@ -1,11 +1,29 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2017-07-06 17:16:18 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2017-12-27 18:47:58 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ #include "../os/windows/AudioOutputWave.h" #endif #include "../os/windows/AudioOutputWASAPI.h" -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #include "../os/linux/AudioOutputALSA.h" #include "../os/linux/AudioOutputPulse.h" #else +@@ -52,7 +52,7 @@ AudioOutput *AudioOutput::Create(std::st + return new AudioOutputWave(deviceID); + #endif + return new AudioOutputWASAPI(deviceID); +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + if(AudioOutputPulse::IsAvailable()){ + AudioOutputPulse* aop=new AudioOutputPulse(deviceID); + if(!aop->IsInitialized()) +@@ -101,7 +101,7 @@ void AudioOutput::EnumerateDevices(std:: + } + #endif + AudioOutputWASAPI::EnumerateDevices(devs); +-#elif defined(__linux__) && !defined(__ANDROID__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) + if(!AudioOutputPulse::IsAvailable() || !AudioOutputPulse::EnumerateDevices(devs)) + AudioOutputALSA::EnumerateDevices(devs); + #endif Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp (revision 467607) @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/logging.cpp.orig 2018-02-07 04:44:58 UTC ++++ Telegram/ThirdParty/libtgvoip/logging.cpp +@@ -13,7 +13,7 @@ + + #ifdef __ANDROID__ + #include +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #include + #endif + +@@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(){ + #else + char* systemVersion="Windows RT"; + #endif +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #ifdef __ANDROID__ + char systemVersion[128]; + char sysRel[PROP_VALUE_MAX]; Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp (revision 467607) @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp.orig 2018-02-07 04:47:15 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp +@@ -12,6 +12,10 @@ + #include "../../logging.h" + #include "../../VoIPController.h" + ++#ifndef typeof ++#define typeof __typeof__ ++#endif ++ + using namespace tgvoip::audio; + + #define BUFFER_SIZE 960 +@@ -177,4 +181,4 @@ void AudioInputALSA::EnumerateDevices(st + } + + dlclose(lib); +-} +\ No newline at end of file ++} Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp (revision 467607) @@ -0,0 +1,10 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioInputPulse.cpp.orig 2018-02-07 04:48:22 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/AudioInputPulse.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include "AudioInputPulse.h" + #include "../../logging.h" + #include "../../VoIPController.h" Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp (revision 467607) @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp.orig 2018-02-07 04:46:53 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp +@@ -11,6 +11,10 @@ + #include "../../logging.h" + #include "../../VoIPController.h" + ++#ifndef typeof ++#define typeof __typeof__ ++#endif ++ + #define BUFFER_SIZE 960 + #define CHECK_ERROR(res, msg) if(res<0){LOGE(msg ": %s", _snd_strerror(res)); failed=true; return;} + #define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); failed=true; return;} +@@ -180,4 +184,4 @@ void AudioOutputALSA::EnumerateDevices(s + } + + dlclose(lib); +-} +\ No newline at end of file ++} Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp (revision 467607) @@ -0,0 +1,10 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputPulse.cpp.orig 2018-02-07 04:48:32 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputPulse.cpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include "AudioOutputPulse.h" + #include "../../logging.h" + #include "../../VoIPController.h" Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h (revision 467607) @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/PulseAudioLoader.h.orig 2018-02-07 04:46:43 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/PulseAudioLoader.h +@@ -9,6 +9,10 @@ + + #include + ++#ifndef typeof ++#define typeof __typeof__ ++#endif ++ + #define DECLARE_DL_FUNCTION(name) static typeof(name)* _import_##name + + namespace tgvoip{ +@@ -106,4 +110,4 @@ private: + #define pa_operation_get_state PulseAudioLoader::_import_pa_operation_get_state + #endif + +-#endif // LIBTGVOIP_PULSEAUDIOLOADER_H +\ No newline at end of file ++#endif // LIBTGVOIP_PULSEAUDIOLOADER_H Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp (revision 467607) @@ -1,10 +1,10 @@ ---- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2017-07-06 17:16:18 UTC +--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2017-12-27 18:47:58 UTC +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -45,6 +45,7 @@ void NetworkSocketPosix::SetMaxPriority( +@@ -46,6 +46,7 @@ void NetworkSocketPosix::SetMaxPriority( if(res<0){ LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno)); } +#elif defined(__FreeBSD__) #else int prio=5; int res=setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio)); Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h (revision 467607) @@ -1,11 +1,11 @@ ---- Telegram/ThirdParty/libtgvoip/threading.h.orig 2017-07-06 17:16:18 UTC +--- Telegram/ThirdParty/libtgvoip/threading.h.orig 2017-12-27 18:47:58 UTC +++ Telegram/ThirdParty/libtgvoip/threading.h @@ -20,7 +20,7 @@ typedef pthread_cond_t tgvoip_lock_t; #define start_thread(ref, entry, arg) pthread_create(&ref, NULL, entry, arg) #define join_thread(thread) pthread_join(thread, NULL) #ifndef __APPLE__ -#define set_thread_name(thread, name) pthread_setname_np(thread, name) +#define set_thread_name(thread, name) #else #define set_thread_name(thread, name) #endif Index: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h (revision 467607) @@ -1,11 +1,11 @@ ---- Telegram/ThirdParty/libtgvoip/webrtc_dsp/webrtc/base/stringutils.h.orig 2017-07-06 17:16:18 UTC +--- Telegram/ThirdParty/libtgvoip/webrtc_dsp/webrtc/base/stringutils.h.orig 2017-12-27 18:47:58 UTC +++ Telegram/ThirdParty/libtgvoip/webrtc_dsp/webrtc/base/stringutils.h @@ -23,7 +23,7 @@ #endif // WEBRTC_WIN #if defined(WEBRTC_POSIX) -#ifdef BSD +#if defined BSD || defined __FreeBSD__ #include #else // BSD #include Index: head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake (revision 467607) @@ -1,36 +1,36 @@ ---- Telegram/gyp/PrecompiledHeader.cmake.orig 2017-09-05 17:38:38 UTC +--- Telegram/gyp/PrecompiledHeader.cmake.orig 2018-01-03 10:46:01 UTC +++ Telegram/gyp/PrecompiledHeader.cmake @@ -79,7 +79,7 @@ function(export_all_flags _filename _sou endfunction() function(add_precompiled_header _target _input) - if(CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) get_filename_component(_name ${_input} NAME) set(_pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${_input}") set(_pch_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch") @@ -112,7 +112,7 @@ function(add_precompiled_header _target set(_compiler_FLAGS "@${_pch_c_flags_file}") add_custom_command( OUTPUT "${_output_c}" - COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" -c "${_pchfile}" + COMMAND "${CMAKE_C_COMPILER}" "$(C_DEFINES)" "$(C_INCLUDES)" "$(C_FLAGS)" -x c-header -o "${_output_c}" -c "${_pchfile}" DEPENDS "${_pchfile}" "${_pch_c_flags_file}" IMPLICIT_DEPENDS C "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C)") @@ -123,7 +123,7 @@ function(add_precompiled_header _target set(_compiler_FLAGS "@${_pch_cpp_flags_file}") add_custom_command( OUTPUT "${_output_cxx}" - COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" -c "${_pchfile}" + COMMAND "${CMAKE_CXX_COMPILER}" "$(CXX_DEFINES)" "$(CXX_INCLUDES)" "$(CXX_FLAGS)" -x c++-header -o "${_output_cxx}" -c "${_pchfile}" DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C++)") @@ -161,5 +161,5 @@ function(add_precompiled_header _target OBJECT_DEPENDS "${_object_depends}") endif() endforeach() - endif(CMAKE_COMPILER_IS_GNUCXX) + endif(CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) endfunction() Index: head/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi (revision 467607) @@ -1,11 +1,11 @@ ---- Telegram/gyp/common.gypi.orig 2017-09-05 17:38:38 UTC +--- Telegram/gyp/common.gypi.orig 2018-02-06 06:29:27 UTC +++ Telegram/gyp/common.gypi -@@ -42,7 +42,7 @@ +@@ -29,7 +29,7 @@ }, { 'build_mac': 0, }], - [ 'build_os == "linux"', { + [ 'build_os == "freebsd"', { 'build_linux': 1, }, { 'build_linux': 0, Index: head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi (revision 467606) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi (revision 467607) @@ -1,18 +1,27 @@ ---- Telegram/gyp/settings_linux.gypi.orig 2017-09-05 17:38:38 UTC +--- Telegram/gyp/settings_linux.gypi.orig 2018-01-03 10:46:01 UTC +++ Telegram/gyp/settings_linux.gypi -@@ -25,7 +25,6 @@ +@@ -11,7 +11,6 @@ + 'linux_common_flags': [ '-pipe', - '-g', '-Wall', - '-Werror', '-W', '-fPIC', '-Wno-unused-variable', -@@ -61,7 +60,6 @@ +@@ -25,7 +24,7 @@ + ], + }, + 'conditions': [ +- [ '"