Date: Fri, 18 Oct 2019 15:54:48 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514727 - in head/net-im/telegram-desktop: . files Message-ID: <201910181554.x9IFsmuc018679@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Oct 18 15:54:48 2019 New Revision: 514727 URL: https://svnweb.freebsd.org/changeset/ports/514727 Log: net-im/telegram-desktop: update to 1.8.15 Changelog: 1.8.15 (07.10.19) - Bug fixes and other minor improvements. 1.8.14 (03.10.19) - Bug fixes and other minor improvements. 1.8.13 (03.10.19) - Bug fixes and other minor improvements. 1.8.12 (02.10.19) - Bug fixes and other minor improvements. 1.8.11 (01.10.19) - Bug fixes and other minor improvements. 1.8.10 (30.09.19) - Bug fixes and other minor improvements. PR: 241319 Submitted by: Henry Hu <henry.hu.sh@gmail.com> (maintainer) Added: head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_linux.qrc (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_platform_ui__platform__utility.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_common_common.gypi (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram_sources.txt (contents, props changed) Deleted: head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp head/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Modified: head/net-im/telegram-desktop/Makefile head/net-im/telegram-desktop/distinfo head/net-im/telegram-desktop/files/CMakeLists.inj head/net-im/telegram-desktop/files/gyp-patches head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp 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_history__inner__widget.cpp 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_platform_linux_main__window__linux.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/Makefile Fri Oct 18 15:54:48 2019 (r514727) @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.8.9 +DISTVERSION= 1.8.15 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/distinfo Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ -TIMESTAMP = 1569722754 -SHA256 (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 2df035cc4a582660b612656c22ff10d37eb34dbece958f9c99f6a0bd4e2fb61b -SIZE (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 14407939 +TIMESTAMP = 1571274501 +SHA256 (telegramdesktop-tdesktop-v1.8.15_GH0.tar.gz) = 68bb6c3d007fe21847286815f22c2532a7cf9c247dc2781d749ebeb40f02ed99 +SIZE (telegramdesktop-tdesktop-v1.8.15_GH0.tar.gz) = 14416530 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 Modified: head/net-im/telegram-desktop/files/CMakeLists.inj ============================================================================== --- head/net-im/telegram-desktop/files/CMakeLists.inj Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/CMakeLists.inj Fri Oct 18 15:54:48 2019 (r514727) @@ -13,6 +13,7 @@ add_precompiled_header(lib_base ../../Telegram/SourceF add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h) +add_precompiled_header(lib_ui ../../Telegram/SourceFiles/ui/ui_pch.h) # vim: ft=cmake # -------------- debian/CMakeLists.inj end -------------- Modified: head/net-im/telegram-desktop/files/gyp-patches ============================================================================== --- head/net-im/telegram-desktop/files/gyp-patches Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/gyp-patches Fri Oct 18 15:54:48 2019 (r514727) @@ -1,15 +1,6 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/codegen_rules.gypi -@@ -15,7 +15,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', - ], - 'action': [ -- 'python', '<(DEPTH)/update_dependent.py', '--styles', -+ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--styles', - '-I', '<(res_loc)', '-I', '<(src_loc)', - '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', - '<@(style_files)', -@@ -26,13 +26,13 @@ +--- Telegram/gyp/codegen/rules.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/codegen/rules.gypi +@@ -10,13 +10,13 @@ 'inputs': [ '<(DEPTH)/update_dependent.py', '<@(qrc_files)', @@ -25,9 +16,93 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', '<@(qrc_files)', ], ---- Telegram/gyp/lib_export.gyp.orig 2019-09-06 13:41:43 UTC +--- Telegram/gyp/codegen/styles_rule.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/codegen/styles_rule.gypi +@@ -16,7 +16,7 @@ + '<(style_timestamp)', + ], + 'action': [ +- 'python', '<(DEPTH)/update_dependent.py', '--styles', ++ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--styles', + '-I', '<(res_loc)', '-I', '<(src_loc)', + '-o', '<(style_timestamp)', + '<@(style_files)', +--- Telegram/gyp/common/linux.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/common/linux.gypi +@@ -11,7 +11,6 @@ + 'linux_common_flags': [ + '-pipe', + '-Wall', +- '-Werror', + '-W', + '-fPIC', + '-Wno-unused-variable', +@@ -26,16 +25,17 @@ + '-Wno-error=class-memaccess', + '-Wno-error=parentheses', + ], +- 'linux_path_ffmpeg%': '/usr/local', +- 'linux_path_openal%': '/usr/local', +- 'linux_path_va%': '/usr/local', +- 'linux_path_vdpau%': '/usr/local', +- 'linux_path_breakpad%': '/usr/local', +- 'linux_path_opus_include%': '<(libs_loc)/opus/include', +- 'linux_path_range%': '/usr/local', ++ 'linux_path_ffmpeg%': '%%LOCALBASE%%', ++ 'linux_path_openal%': '%%LOCALBASE%%', ++ 'linux_path_va%': '%%LOCALBASE%%', ++ 'linux_path_vdpau%': '%%LOCALBASE%%', ++ 'linux_path_breakpad%': '%%LOCALBASE%%', ++ 'linux_path_opus_include%': '%%LOCALBASE%%/opus/include', ++ 'linux_path_range%': '%%LOCALBASE%%', + }, + 'include_dirs': [ +- '/usr/local/include', ++ '/usr/include/openssl-1.0', ++ '%%LOCALBASE%%/include', + '<(linux_path_ffmpeg)/include', + '<(linux_path_openal)/include', + '<(linux_path_breakpad)/include/breakpad', +@@ -43,7 +43,8 @@ + '<(linux_path_range)/include', + ], + 'library_dirs': [ +- '/usr/local/lib', ++ '/usr/lib/openssl-1.0', ++ '%%LOCALBASE%%/lib', + '<(linux_path_ffmpeg)/lib', + '<(linux_path_openal)/lib', + '<(linux_path_va)/lib', +@@ -51,7 +52,7 @@ + '<(linux_path_breakpad)/lib', + ], + 'conditions': [ +- [ '"<!(uname -m)" == "x86_64" or "<!(uname -m)" == "aarch64"', { ++ [ '"<!(uname -m)" == "amd64" or "<!(uname -m)" == "arm64"', { + 'defines': [ + 'Q_OS_LINUX64', + ], +@@ -86,7 +87,6 @@ + ], + 'defines': [ + '_REENTRANT', +- 'QT_STATICPLUGIN', + 'QT_PLUGIN', + ], + 'cflags_c': [ +@@ -99,9 +99,6 @@ + '-Wno-register', + ], + 'make_global_settings': [ +- ['AR', '/usr/bin/gcc-ar'], +- ['RANLIB', '/usr/bin/gcc-ranlib'], +- ['NM', '/usr/bin/gcc-nm'], + ], + 'configurations': { + 'Debug': { +--- Telegram/gyp/lib_export.gyp.orig 2019-10-07 15:58:21 UTC +++ Telegram/gyp/lib_export.gyp -@@ -46,7 +46,7 @@ +@@ -44,7 +44,7 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -36,19 +111,48 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', ---- Telegram/gyp/lib_scheme.gyp.orig 2019-09-06 13:41:43 UTC +--- Telegram/gyp/lib_scheme.gyp.orig 2019-10-07 15:58:21 UTC +++ Telegram/gyp/lib_scheme.gyp -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ '<(SHARED_INTERMEDIATE_DIR)/scheme.h', ], 'action': [ - 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', + '%%PYTHON_CMD%%', '<(src_loc)/codegen/scheme/codegen_scheme.py', '-o', '<(SHARED_INTERMEDIATE_DIR)', - '<(res_loc)/tl/mtproto.tl', - '<(res_loc)/tl/api.tl', ---- Telegram/gyp/qt_moc.gypi.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/qt_moc.gypi + '<(res_loc)/tl/mtproto.tl', + '<(res_loc)/tl/api.tl', +--- Telegram/gyp/lib_ui.gyp.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/lib_ui.gyp +@@ -39,7 +39,7 @@ + 'dependent_style_files': [ + ], + 'style_timestamp': '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles_ui.timestamp', +- 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/lib_ui/sources.txt --replace src_loc=<(src_loc)', ++ 'list_sources_command': '%%PYTHON_CMD%% <(DEPTH)/list_sources.py --input <(DEPTH)/lib_ui/sources.txt --replace src_loc=<(src_loc)', + 'pch_source': '<(src_loc)/ui/ui_pch.cpp', + 'pch_header': '<(src_loc)/ui/ui_pch.h', + }, +@@ -56,7 +56,7 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(libs_loc)/range-v3/include', ++ '%%LOCALBASE%%/include', + '<(submodules_loc)/GSL/include', + '<(submodules_loc)/variant/include', + '<(submodules_loc)/crl/src', +@@ -68,7 +68,7 @@ + '<(DEPTH)/lib_ui/sources.txt', + ], + 'sources!': [ +- '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))', ++ '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for linux)', + ], + }], + } +--- Telegram/gyp/modules/qt_moc.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/modules/qt_moc.gypi @@ -15,12 +15,12 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', ], @@ -64,8 +168,8 @@ # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")', '<(RULE_INPUT_PATH)', '-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', ---- Telegram/gyp/qt_rcc.gypi.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/qt_rcc.gypi +--- Telegram/gyp/modules/qt_rcc.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/modules/qt_rcc.gypi @@ -15,7 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp', ], @@ -75,8 +179,8 @@ '-name', '<(RULE_INPUT_ROOT)', '-no-compress', '<(RULE_INPUT_PATH)', ---- Telegram/gyp/qt.gypi.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/qt.gypi +--- Telegram/gyp/modules/qt.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/modules/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { 'qt_version%': '5.3.2', @@ -233,8 +337,8 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/telegram_linux.gypi +--- Telegram/gyp/telegram/linux.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/telegram/linux.gypi @@ -10,7 +10,7 @@ 'variables': { 'build_defines%': '', @@ -244,74 +348,43 @@ 'pkgconfig_libs': [ # In order to work libxkbcommon must be linked statically, # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon" -@@ -23,10 +23,11 @@ - 'linux_path_va%': '/usr/local', - 'linux_path_vdpau%': '/usr/local', - 'linux_path_breakpad%': '/usr/local', -- 'linux_path_opus_include%': '<(libs_loc)/opus/include', -+ 'linux_path_opus_include%': '%%LOCALBASE%%/include/opus', - 'linux_path_range%': '/usr/local', +@@ -20,12 +20,6 @@ + ], }, - 'include_dirs': [ -+ '/usr/include/openssl-1.0', - '/usr/local/include', - '<(linux_path_ffmpeg)/include', - '<(linux_path_openal)/include', -@@ -35,6 +36,7 @@ - '<(linux_path_range)/include', - ], - 'library_dirs': [ -+ '/usr/lib/openssl-1.0', - '/usr/local/lib', - '<(linux_path_ffmpeg)/lib', - '<(linux_path_openal)/lib', -@@ -43,27 +45,16 @@ - '<(linux_path_breakpad)/lib', - ], 'libraries': [ -- 'breakpad_client', -- 'composeplatforminputcontextplugin', -- 'ibusplatforminputcontextplugin', -- 'fcitxplatforminputcontextplugin', -- 'himeplatforminputcontextplugin', -- 'nimfplatforminputcontextplugin', -- 'liblzma.a', -- 'libopenal.a', -- 'libavformat.a', -- 'libavcodec.a', -- 'libswresample.a', -- 'libswscale.a', -- 'libavutil.a', -- 'libopus.a', -- 'libva-x11.a', -- 'libva-drm.a', -- 'libva.a', -- 'libvdpau.a', -- 'libdrm.a', -- 'libz.a', --# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', -+ 'lzma', -+ 'openal', -+ 'avformat', -+ 'avcodec', -+ 'swresample', -+ 'swscale', -+ 'avutil', -+ 'minizip', -+ 'opus', -+ 'z', +- '-lbreakpad_client', +- '-lcomposeplatforminputcontextplugin', +- '-libusplatforminputcontextplugin', +- '-lfcitxplatforminputcontextplugin', +- '-lhimeplatforminputcontextplugin', +- '-lnimfplatforminputcontextplugin', + '-llzma', + '-lopenal', + '-lavformat', +@@ -34,12 +28,8 @@ + '-lswscale', + '-lavutil', + '-lopus', +- '-lva-x11', +- '-lva-drm', +- '-lva', +- '-lvdpau', +- '-ldrm', + '-lz', ++ '-lminizip', + # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ - '-Wno-strict-overflow', -@@ -72,7 +63,6 @@ +@@ -49,22 +39,23 @@ 'ldflags': [ '-Wl,-wrap,aligned_alloc', '-Wl,-wrap,secure_getenv', - '-Wl,-wrap,clock_gettime', '-Wl,--no-as-needed,-lrt', +- '-Wl,-Bstatic', ], 'configurations': { -@@ -80,13 +70,16 @@ + 'Release': { 'cflags_c': [ '-Ofast', '-fno-strict-aliasing', @@ -328,7 +401,7 @@ ], }, }, -@@ -97,9 +90,7 @@ +@@ -75,9 +66,7 @@ ], }], ['not_need_gtk!="True"', { 'cflags_cc': [ @@ -339,32 +412,27 @@ ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { 'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ], ---- Telegram/gyp/Telegram.gyp.orig 2019-09-06 13:41:43 UTC -+++ Telegram/gyp/Telegram.gyp -@@ -51,7 +51,7 @@ +--- Telegram/gyp/telegram/telegram.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/telegram/telegram.gypi +@@ -11,7 +11,7 @@ + 'src_loc': '../SourceFiles', + 'res_loc': '../Resources', + 'submodules_loc': '../ThirdParty', +- 'minizip_loc': '<(submodules_loc)/minizip', ++ 'minizip_loc': '%%LOCALBASE%%/include/minizip', + 'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap', + 'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions', + 'style_files': [ +@@ -47,7 +47,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)', +- '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)', 'pch_source': '<(src_loc)/stdafx.cpp', 'pch_header': '<(src_loc)/stdafx.h', }, -@@ -75,7 +75,6 @@ - 'codegen.gyp:codegen_numbers', - 'codegen.gyp:codegen_style', - 'tests/tests.gyp:tests', -- 'utils.gyp:Updater', - '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', - 'crl.gyp:crl', - 'lib_base.gyp:lib_base', -@@ -87,27 +86,18 @@ - ], - - 'defines': [ -- 'AL_LIBTYPE_STATIC', - 'AL_ALEXT_PROTOTYPES', - 'TGVOIP_USE_CXX11_LIB', +@@ -91,19 +91,12 @@ 'XXH_INLINE_ALL', 'TDESKTOP_API_ID=<(api_id)', 'TDESKTOP_API_HASH=<(api_hash)', @@ -382,14 +450,11 @@ - '<(libs_loc)/openal-soft/include', - '<(libs_loc)/opus/include', - '<(libs_loc)/range-v3/include', -- '<(minizip_loc)', -- '<(sp_media_key_tap_loc)', -+ '%%LOCALBASE%%/include/minizip', + '<(minizip_loc)', + '<(sp_media_key_tap_loc)', '<(emoji_suggestions_loc)', - '<(submodules_loc)/GSL/include', - '<(submodules_loc)/variant/include', -@@ -126,7 +116,7 @@ - '<(res_loc)/export_html/images/back@2x.png', +@@ -124,7 +117,7 @@ + '<!@(<(list_sources_command) <(qt_moc_list_sources_arg))', ], 'sources!': [ - '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))', @@ -397,9 +462,18 @@ ], 'conditions': [ [ '"<(official_build_target)" != ""', { ---- Telegram/gyp/tests/tests.gyp.orig 2019-09-06 13:41:43 UTC +@@ -139,7 +132,7 @@ + 'mac_hardened_runtime': 1, + 'mac_bundle': '1', + 'mac_bundle_resources': [ +- '<!@(python -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")', ++ '<!@(%%PYTHON_CMD%% -c "for s in \'<@(langpacks)\'.split(\' \'): print(\'<(res_loc)/langs/\' + s + \'.lproj/Localizable.strings\')")', + '../../Telegram/Images.xcassets', + ], + 'xcode_settings': { +--- Telegram/gyp/tests/tests.gyp.orig 2019-10-07 15:58:21 UTC +++ Telegram/gyp/tests/tests.gyp -@@ -13,7 +13,7 @@ +@@ -12,7 +12,7 @@ 'src_loc': '../../SourceFiles', 'submodules_loc': '../../ThirdParty', 'mac_target': '10.10', @@ -408,6 +482,36 @@ }, 'targets': [{ 'target_name': 'tests', +--- Telegram/gyp/utils.gyp.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/utils.gyp +@@ -119,11 +119,11 @@ + ], + }, { + 'include_dirs': [ +- '/usr/local/include', ++ '%%LOCALBASE%%/include', + '<(libs_loc)/openssl/include' + ], + 'library_dirs': [ +- '/usr/local/lib', ++ '%%LOCALBASE%%/lib', + ], + }] + ], +@@ -141,11 +141,11 @@ + ], + }, { + 'include_dirs': [ +- '/usr/local/include', ++ '%%LOCALBASE%%/include', + '<(libs_loc)/openssl/include' + ], + 'library_dirs': [ +- '/usr/local/lib', ++ '%%LOCALBASE%%/lib', + ], + }] + ], --- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2019-07-15 12:59:17 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -14,11 +14,12 @@ Added: head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_linux.qrc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_linux.qrc Fri Oct 18 15:54:48 2019 (r514727) @@ -0,0 +1,9 @@ +--- Telegram/Resources/qrc/linux.qrc.orig 2019-10-07 15:58:21 UTC ++++ Telegram/Resources/qrc/linux.qrc +@@ -1,6 +1,5 @@ + <RCC> + <qresource prefix="/qt"> +- <file alias="etc/qt.conf">../etc/qt_linux.conf</file> + </qresource> + <qresource prefix="/fc"> + <file alias="fc-custom.conf">../fc-custom.conf</file> Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp -@@ -105,7 +105,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10 +@@ -107,7 +107,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10 }, 5, }; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,15 +1,15 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/core/launcher.cpp -@@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste - #include "core/sandbox.h" +@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste #include "base/concurrent_timer.h" + #include "facades.h" +#include "FREEBSD_QT_PLUGINDIR.h" + namespace Core { namespace { -@@ -248,12 +250,13 @@ void Launcher::init() { +@@ -249,12 +251,13 @@ void Launcher::init() { #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) #V #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING(V) TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) QApplication::setDesktopFileName(qsl(TDESKTOP_LAUNCHER_FILENAME_TO_STRING(TDESKTOP_LAUNCHER_FILENAME))); @@ -26,7 +26,7 @@ initHook(); } -@@ -270,6 +273,11 @@ int Launcher::exec() { +@@ -271,6 +274,11 @@ int Launcher::exec() { // both are finished in Sandbox::closeApplication Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before Sandbox is created Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/core/update_checker.cpp -@@ -1458,6 +1458,9 @@ int UpdateChecker::size() const { +@@ -1459,6 +1459,9 @@ int UpdateChecker::size() const { //} bool checkReadyUpdate() { @@ -10,7 +10,7 @@ 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()) { -@@ -1510,6 +1513,9 @@ bool checkReadyUpdate() { +@@ -1511,6 +1514,9 @@ bool checkReadyUpdate() { #elif defined Q_OS_LINUX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -138,7 +138,7 @@ QString FileNameUnsafe( +@@ -140,7 +140,7 @@ QString FileNameUnsafe( name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); #elif defined Q_OS_MAC name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,13 +1,13 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1428,13 +1428,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre +@@ -1438,13 +1438,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre _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) { - SetClipboardText( + TextUtilities::SetClipboardText( _selectedItem->selectedText(_selectedText), QClipboard::Selection); } Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1394,7 +1394,7 @@ void HistoryInner::mouseActionFinish( +@@ -1401,7 +1401,7 @@ void HistoryInner::mouseActionFinish( _widget->noSelectingScroll(); _widget->updateTopBarSelection(); @@ -9,7 +9,7 @@ if (!_selected.empty() && _selected.cbegin()->second != FullSelection) { const auto [item, selection] = *_selected.cbegin(); if (const auto view = item->mainView()) { -@@ -1403,7 +1403,7 @@ void HistoryInner::mouseActionFinish( +@@ -1410,7 +1410,7 @@ void HistoryInner::mouseActionFinish( QClipboard::Selection); } } Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2053,7 +2053,7 @@ void ListWidget::mouseActionFinish( +@@ -2061,7 +2061,7 @@ void ListWidget::mouseActionFinish( _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // #TODO select scroll @@ -9,7 +9,7 @@ if (_selectedTextItem && _selectedTextRange.from != _selectedTextRange.to) { if (const auto view = viewForItem(_selectedTextItem)) { -@@ -2062,7 +2062,7 @@ void ListWidget::mouseActionFinish( +@@ -2070,7 +2070,7 @@ void ListWidget::mouseActionFinish( QClipboard::Selection); } } Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -28,7 +28,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; +@@ -30,7 +30,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION @@ -10,7 +10,7 @@ GtkStatusIcon *_trayIcon = 0; GtkWidget *_trayMenu = 0; GdkPixbuf *_trayPixbuf = 0; -@@ -294,7 +296,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -296,7 +298,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -20,7 +20,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, false); } -@@ -310,7 +314,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -312,7 +316,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -30,7 +30,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, true); } -@@ -329,7 +335,9 @@ void MainWindow::psUpdateIndicator() { +@@ -331,7 +337,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); @@ -40,7 +40,7 @@ } else { useAppIndicator = false; } -@@ -426,11 +434,15 @@ void MainWindow::LibsLoaded() { +@@ -428,11 +436,15 @@ void MainWindow::LibsLoaded() { && (Libs::g_object_ref_sink != nullptr) && (Libs::g_object_unref != nullptr); @@ -56,7 +56,7 @@ if (tryAppIndicator && useGtkBase && useAppIndicator) { noQtTrayIcon = true; -@@ -466,6 +478,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -468,6 +480,7 @@ void MainWindow::psCreateTrayIcon() { } #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION @@ -64,7 +64,7 @@ if (useAppIndicator) { DEBUG_LOG(("Trying to create AppIndicator")); _trayMenu = Libs::gtk_menu_new(); -@@ -496,6 +509,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -498,6 +511,7 @@ void MainWindow::psCreateTrayIcon() { useAppIndicator = false; } } @@ -72,7 +72,7 @@ if (useStatusIcon) { if (Libs::gdk_init_check(0, 0)) { if (!_trayMenu) _trayMenu = Libs::gtk_menu_new(); -@@ -630,10 +644,12 @@ MainWindow::~MainWindow() { +@@ -632,10 +646,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-04-13 06:46:58 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -58,8 +58,8 @@ void finish(); +@@ -51,8 +51,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_window_title.h.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/platform_window_title.h.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/platform/platform_window_title.h -@@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &preview, const st +@@ -26,7 +26,7 @@ void PreviewWindowFramePaint(QImage &preview, const st #include "platform/mac/window_title_mac.h" #elif defined Q_OS_WIN // Q_OS_MAC #include "platform/win/window_title_win.h" @@ -9,7 +9,7 @@ namespace Platform { -@@ -43,4 +43,4 @@ inline void PreviewWindowFramePaint(QImage &preview, c +@@ -44,4 +44,4 @@ inline void PreviewWindowFramePaint(QImage &preview, c } // namespace Platform Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -494,11 +494,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( +@@ -496,11 +496,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( _deleted = true; // Ubuntu has a lag if deleteLater() called immediately. Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_platform_ui__platform__utility.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_platform_ui__platform__utility.h Fri Oct 18 15:54:48 2019 (r514727) @@ -0,0 +1,14 @@ +--- Telegram/SourceFiles/ui/platform/ui_platform_utility.h.orig 2019-10-07 15:58:21 UTC ++++ Telegram/SourceFiles/ui/platform/ui_platform_utility.h +@@ -37,8 +37,8 @@ void DrainMainQueue(); // Needed only if UseMainQueueG + + #ifdef Q_OS_MAC + #include "ui/platform/mac/ui_platform_utility_mac.h" +-#elif defined Q_OS_LINUX // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC + #include "ui/platform/linux/ui_platform_utility_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 "ui/platform/win/ui_platform_utility_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 Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -2018,11 +2018,11 @@ class Renderer { (private) +@@ -1972,11 +1972,11 @@ class Renderer { (private) if (item == -1) return; Modified: 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 Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,13 +1,15 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -396,11 +396,11 @@ Ui::Text::StateResult FlatLabel::dragActionFinish(cons +@@ -400,13 +400,13 @@ Text::StateResult FlatLabel::dragActionFinish(const QP } } -#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()) { - SetClipboardText(_text.toTextForMimeData(_selection), QClipboard::Selection); + TextUtilities::SetClipboardText( + _text.toTextForMimeData(_selection), + QClipboard::Selection); } -#endif // Q_OS_LINUX32 || Q_OS_LINUX64 +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Fri Oct 18 15:48:52 2019 (r514726) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Fri Oct 18 15:54:48 2019 (r514727) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-27 17:04:25 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-10-07 15:58:21 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -571,7 +571,7 @@ bool MainWindow::minimizeToTray() { +@@ -573,7 +573,7 @@ bool MainWindow::minimizeToTray() { } void MainWindow::reActivateWindow() { @@ -9,7 +9,7 @@ const auto reActivate = [=] { if (const auto w = App::wnd()) { if (auto f = QApplication::focusWidget()) { -@@ -586,7 +586,7 @@ void MainWindow::reActivateWindow() { +@@ -588,7 +588,7 @@ void MainWindow::reActivateWindow() { }; crl::on_main(this, reActivate); App::CallDelayed(200, this, reActivate); Added: head/net-im/telegram-desktop/files/patch-Telegram_gyp_common_common.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_common_common.gypi Fri Oct 18 15:54:48 2019 (r514727) @@ -0,0 +1,11 @@ +--- Telegram/gyp/common/common.gypi.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/common/common.gypi +@@ -29,7 +29,7 @@ + }, { + 'build_mac': 0, + }], +- [ 'build_os == "linux"', { ++ [ 'build_os == "freebsd"', { + 'build_linux': 1, + }, { + 'build_linux': 0, Added: head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram_sources.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram_sources.txt Fri Oct 18 15:54:48 2019 (r514727) @@ -0,0 +1,29 @@ +--- Telegram/gyp/telegram/sources.txt.orig 2019-10-07 15:58:21 UTC ++++ Telegram/gyp/telegram/sources.txt +@@ -610,8 +610,8 @@ + <(src_loc)/platform/linux/linux_libs.h + <(src_loc)/platform/linux/file_utilities_linux.cpp + <(src_loc)/platform/linux/file_utilities_linux.h +-<(src_loc)/platform/linux/info_linux.cpp +-<(src_loc)/platform/linux/info_linux.h ++<(src_loc)/platform/freebsd/info_freebsd.cpp ++<(src_loc)/platform/freebsd/info_freebsd.h + <(src_loc)/platform/linux/launcher_linux.cpp + <(src_loc)/platform/linux/launcher_linux.h + <(src_loc)/platform/linux/main_window_linux.cpp +@@ -863,14 +863,7 @@ + <(src_loc)/settings.cpp + <(src_loc)/settings.h + +-platforms: !win +-<(minizip_loc)/crypt.h +-<(minizip_loc)/ioapi.c +-<(minizip_loc)/ioapi.h +-<(minizip_loc)/zip.c +-<(minizip_loc)/zip.h +-<(minizip_loc)/unzip.c +-<(minizip_loc)/unzip.h ++<(src_loc)/qt_functions.cpp + + platforms: win + <(res_loc)/winrc/Telegram.rc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910181554.x9IFsmuc018679>