diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-08-22 16:09:42 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-08-22 16:09:42 +0000 |
| commit | 6ef98c879f8b55b52b7aa06d1f1a96ac34d660e6 (patch) | |
| tree | 6fdd0c3d73e2d1684946454d73953e2ef971d9d5 /net-im | |
| parent | 0863a5a68976a6637a0acdd8cf280af54e0a2dd1 (diff) | |
Notes
Diffstat (limited to 'net-im')
60 files changed, 398 insertions, 352 deletions
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 934a3d07903a..d28e9d0d9815 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -2,8 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.2.17 -PORTREVISION= 1 +DISTVERSION= 1.3.12 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -29,12 +28,13 @@ GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \ mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \ - 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 + Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \ + telegramdesktop:libtgvoip:5380aab:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:527ad27:crl/Telegram/ThirdParty/crl +USE_GNOME= glib20 USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus USE_XORG= x11 xcb +INSTALLS_ICONS= yes CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release @@ -45,13 +45,23 @@ GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP # If both of them are not installed, then voice calls do not work, but other functionalities still work. OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO +OPTIONS_DEFINE= GTK OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend for voice calls +GTK_DESC= Gtk integration (Use Gtk dialogs, etc.) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGTK} +USE_GNOME+= gtk30 +.else +GYP_DEFINES:= ${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTEGRATION +.endif + .include <bsd.port.pre.mk> # This port needs C++17 libs/compiler. diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index a5dda2d15919..87b96c146aee 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1523832839 -SHA256 (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d -SIZE (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 16916625 +TIMESTAMP = 1533439370 +SHA256 (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 4d19fdc85f0c792c6c073062dacf707fc976581a8d249fa91757015cceb7662b +SIZE (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 17180353 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 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 +SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468 +SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930 +SHA256 (telegramdesktop-libtgvoip-5380aab_GH0.tar.gz) = 6b3e49835a7705406a0161162a1ffb53be6d66b17a8faaca49e6df51a34ebe23 +SIZE (telegramdesktop-libtgvoip-5380aab_GH0.tar.gz) = 810123 +SHA256 (telegramdesktop-crl-527ad27_GH0.tar.gz) = 6ab03b09ea2f501f3602acfd06d6a5d174db6a25259268978323552a69b37622 +SIZE (telegramdesktop-crl-527ad27_GH0.tar.gz) = 20081 diff --git a/net-im/telegram-desktop/files/CMakeLists.inj b/net-im/telegram-desktop/files/CMakeLists.inj index e039cb1585af..24ed27799bce 100644 --- a/net-im/telegram-desktop/files/CMakeLists.inj +++ b/net-im/telegram-desktop/files/CMakeLists.inj @@ -9,6 +9,7 @@ set_target_properties(Telegram PROPERTIES SKIP_BUILD_RPATH TRUE) # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) # vim: ft=cmake # -------------- debian/CMakeLists.inj end -------------- diff --git a/net-im/telegram-desktop/files/gyp-patches b/net-im/telegram-desktop/files/gyp-patches index db0dc263f314..074f33854ed6 100644 --- a/net-im/telegram-desktop/files/gyp-patches +++ b/net-im/telegram-desktop/files/gyp-patches @@ -1,15 +1,53 @@ ---- Telegram/gyp/qt_rcc.gypi.orig 2018-01-03 10:46:01 UTC -+++ Telegram/gyp/qt_rcc.gypi +--- Telegram/gyp/codegen_rules.gypi.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/codegen_rules.gypi @@ -15,7 +15,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp', + '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', ], 'action': [ -- '<(qt_loc)/bin/rcc<(exe_ext)', -+ '%%QT_BINDIR%%/rcc', - '-name', '<(RULE_INPUT_ROOT)', - '-no-compress', - '<(RULE_INPUT_PATH)', ---- Telegram/gyp/qt_moc.gypi.orig 2018-01-03 10:46:01 UTC +- '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 @@ + 'inputs': [ + '<(DEPTH)/update_dependent.py', + '<@(qrc_files)', +- '<!@(python <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', ++ '<!@(%%PYTHON_CMD%% <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', + ], + 'action': [ +- 'python', '<(DEPTH)/update_dependent.py', '--qrc', ++ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--qrc', + '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', + '<@(qrc_files)', + ], +--- Telegram/gyp/lib_export.gyp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/lib_export.gyp +@@ -48,7 +48,7 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(libs_loc)/range-v3/include', ++ '%%LOCALBASE%%', + '<(submodules_loc)/GSL/include', + '<(submodules_loc)/variant/include', + '<(submodules_loc)/crl/src', +--- Telegram/gyp/lib_scheme.gyp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/lib_scheme.gyp +@@ -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)/scheme.tl', + ], + 'message': 'codegen_scheme-ing scheme.tl..', +--- Telegram/gyp/qt_moc.gypi.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/qt_moc.gypi @@ -12,12 +12,12 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', @@ -26,7 +64,18 @@ # '<!@(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.gypi.orig 2018-01-03 10:46:01 UTC +--- Telegram/gyp/qt_rcc.gypi.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/qt_rcc.gypi +@@ -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 2018-08-04 18:53:40 UTC +++ Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { @@ -184,18 +233,18 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2018-01-03 10:46:01 UTC +--- Telegram/gyp/telegram_linux.gypi.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/telegram_linux.gypi -@@ -7,7 +7,7 @@ - { - 'conditions': [[ 'build_linux', { - 'variables': { +@@ -10,7 +10,7 @@ + 'variables': { + 'build_defines%': '', + }, - 'not_need_gtk%': '<!(python -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")', + 'not_need_gtk%': '<!(%%PYTHON_CMD%% -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")', 'pkgconfig_libs': [ # In order to work libxkbcommon must be linked statically, # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon" -@@ -20,10 +20,11 @@ +@@ -23,10 +23,11 @@ 'linux_path_va%': '/usr/local', 'linux_path_vdpau%': '/usr/local', 'linux_path_breakpad%': '/usr/local', @@ -208,7 +257,7 @@ '/usr/local/include', '<(linux_path_ffmpeg)/include', '<(linux_path_openal)/include', -@@ -32,6 +33,7 @@ +@@ -35,6 +36,7 @@ '<(linux_path_range)/include', ], 'library_dirs': [ @@ -216,7 +265,7 @@ '/usr/local/lib', '<(linux_path_ffmpeg)/lib', '<(linux_path_openal)/lib', -@@ -40,25 +42,15 @@ +@@ -43,25 +45,16 @@ '<(linux_path_breakpad)/lib', ], 'libraries': [ @@ -239,6 +288,7 @@ - 'libvdpau.a', - 'libdrm.a', - 'libz.a', ++ 'lzma', + 'openal', + 'avformat', + 'avcodec', @@ -251,7 +301,7 @@ # '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -67,7 +59,6 @@ +@@ -71,7 +64,6 @@ 'ldflags': [ '-Wl,-wrap,aligned_alloc', '-Wl,-wrap,secure_getenv', @@ -259,29 +309,24 @@ '-Wl,--no-as-needed,-lrt', ], 'configurations': { -@@ -86,7 +77,7 @@ +@@ -79,13 +71,16 @@ + 'cflags_c': [ + '-Ofast', + '-fno-strict-aliasing', ++ %%CFLAGS%% + ], + 'cflags_cc': [ + '-Ofast', + '-fno-strict-aliasing', ++ %%CXXFLAGS%% + ], + 'ldflags': [ + '-Ofast', ++ %%LDFLAGS%% + ], }, }, - 'conditions': [ -- [ '"<!(uname -p)" == "x86_64"', { -+ [ '"<!(uname -m)" == "x86_64"', { - # 32 bit version can't be linked with debug info or LTO, - # virtual memory exhausted :( - 'cflags_c': [ '-g' ], -@@ -94,9 +85,9 @@ - 'ldflags': [ '-g' ], - 'configurations': { - 'Release': { -- 'cflags_c': [ '-flto' ], -- 'cflags_cc': [ '-flto' ], -- 'ldflags': [ '-flto' ], -+ 'cflags_c': [ %%CFLAGS%% ], -+ 'cflags_cc': [ %%CXXFLAGS%% ], -+ 'ldflags': [ %%LDFLAGS%% ], - }, - }, - }, { -@@ -105,10 +96,7 @@ +@@ -96,10 +91,7 @@ ], }], ['not_need_gtk!="True"', { 'cflags_cc': [ @@ -293,24 +338,25 @@ ], }] ], ---- Telegram/gyp/Telegram.gyp.orig 2018-01-03 10:46:01 UTC +--- Telegram/gyp/Telegram.gyp.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/Telegram.gyp -@@ -49,7 +49,7 @@ +@@ -51,7 +51,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)', + 'pch_source': '<(src_loc)/stdafx.cpp', + 'pch_header': '<(src_loc)/stdafx.h', }, - 'includes': [ - 'common_executable.gypi', -@@ -69,30 +69,20 @@ +@@ -74,31 +74,21 @@ 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', 'tests/tests.gyp:tests', - 'utils.gyp:Updater', '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', 'crl.gyp:crl', + 'lib_export.gyp:lib_export', ], 'defines': [ @@ -337,8 +383,8 @@ '<(emoji_suggestions_loc)', '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', -@@ -105,7 +95,7 @@ - 'telegram_sources.txt', +@@ -115,7 +105,7 @@ + '<(res_loc)/export_html/images/back@2x.png', ], 'sources!': [ - '<!@(<(list_sources_command) <(qt_moc_list_sources_arg) --exclude_for <(build_os))', @@ -346,7 +392,18 @@ ], 'conditions': [ [ '"<(official_build_target)" != ""', { ---- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-02-06 06:51:56 UTC +--- Telegram/gyp/tests/tests.gyp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/tests/tests.gyp +@@ -13,7 +13,7 @@ + 'src_loc': '../../SourceFiles', + 'submodules_loc': '../../ThirdParty', + 'mac_target': '10.10', +- 'list_tests_command': 'python <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt', ++ 'list_tests_command': '%%PYTHON_CMD%% <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt', + }, + 'targets': [{ + 'target_name': 'tests', +--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -13,11 +13,12 @@ 'variables': { @@ -362,7 +419,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ -@@ -259,7 +260,7 @@ +@@ -263,7 +264,7 @@ }, ], [ @@ -371,7 +428,7 @@ 'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']], }, ], -@@ -378,12 +379,13 @@ +@@ -382,12 +383,15 @@ }, ], [ @@ -380,56 +437,12 @@ 'defines': [ 'WEBRTC_POSIX', ], - 'cflags_cc': [ - '-msse2', -+ '-std=c++11', - ], - 'direct_dependent_settings': { - 'libraries': [ ---- Telegram/gyp/codegen_rules.gypi.orig 2018-02-06 06:53:18 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 @@ - 'inputs': [ - '<(DEPTH)/update_dependent.py', - '<@(qrc_files)', -- '<!@(python <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', -+ '<!@(%%PYTHON_CMD%% <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', - ], - 'action': [ -- 'python', '<(DEPTH)/update_dependent.py', '--qrc', -+ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--qrc', - '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', - '<@(qrc_files)', - ], -@@ -109,7 +109,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)/scheme.tl', - ], - 'message': 'codegen_scheme-ing scheme.tl..', ---- Telegram/gyp/tests/tests.gyp.orig 2018-02-06 06:53:50 UTC -+++ Telegram/gyp/tests/tests.gyp -@@ -13,7 +13,7 @@ - 'src_loc': '../../SourceFiles', - 'submodules_loc': '../../ThirdParty', - 'mac_target': '10.10', -- 'list_tests_command': 'python <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt', -+ 'list_tests_command': '%%PYTHON_CMD%% <(DEPTH)/tests/list_tests.py --input <(DEPTH)/tests/tests_list.txt', - }, - 'targets': [{ - 'target_name': 'tests', ++ 'cflags_cc': [ ++ '-std=gnu++11', ++ ], + 'conditions': [ +- [ '"<!(uname -m)" == "i686"', { ++ [ '"<!(uname -m)" == "i386"', { + 'cflags_cc': [ + '-msse2', + ], diff --git a/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc b/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc index fe51a7a9ec10..5ae670600251 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc +++ b/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_telegram__linux.qrc @@ -1,4 +1,4 @@ ---- Telegram/Resources/qrc/telegram_linux.qrc.orig 2018-01-03 10:46:01 UTC +--- Telegram/Resources/qrc/telegram_linux.qrc.orig 2018-08-04 18:53:40 UTC +++ Telegram/Resources/qrc/telegram_linux.qrc @@ -1,5 +1,4 @@ <RCC> diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp index d5216b269917..dcbed3fd62b2 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/_other/packer.cpp.orig 2018-02-06 05:52:28 UTC +--- Telegram/SourceFiles/_other/packer.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/_other/packer.cpp @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h index e44dc4778250..be466ed84070 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/base/build_config.h.orig 2018-02-06 05:52:11 UTC +--- Telegram/SourceFiles/base/build_config.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/base/build_config.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesk diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h new file mode 100644 index 000000000000..bb0f0420c1e4 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h @@ -0,0 +1,20 @@ +--- ./Telegram/SourceFiles/base/bytes.h.orig 2018-08-04 14:53:40 UTC ++++ ./Telegram/SourceFiles/base/bytes.h +@@ -114,7 +114,7 @@ template < + vector concatenate(Args &&...args) { + const auto size = details::spansLength(args...); + auto result = vector(size); +- details::spansAppend(make_span(result), args...); ++ details::spansAppend(bytes::make_span(result), args...); + return result; + } + +@@ -126,7 +126,7 @@ vector concatenate(SpanRange args) { + size += bytes::make_span(arg).size(); + } + auto result = vector(size); +- auto buffer = make_span(result); ++ auto buffer = bytes::make_span(result); + for (const auto &arg : args) { + const auto part = bytes::make_span(arg); + bytes::copy(buffer, part); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h deleted file mode 100644 index 493450668339..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h +++ /dev/null @@ -1,73 +0,0 @@ ---- Telegram/SourceFiles/base/lambda.h.orig 2018-01-03 10:46:01 UTC -+++ Telegram/SourceFiles/base/lambda.h -@@ -226,11 +226,14 @@ protected: - - template <typename Lambda, typename Return, typename ...Args> - struct vtable_once : public vtable_once_impl<Lambda, is_large<Lambda>, Return, Args...> { -- static const vtable_once instance; -+ static const vtable_once* get_instance(); - }; - - template <typename Lambda, typename Return, typename ...Args> --const vtable_once<Lambda, Return, Args...> vtable_once<Lambda, Return, Args...>::instance = {}; -+const vtable_once<Lambda, Return, Args...>* vtable_once<Lambda, Return, Args...>::get_instance() { -+ static vtable_once<Lambda, Return, Args...> instance; -+ return &instance; -+} - - template <typename Lambda, bool IsLarge, typename Return, typename ...Args> struct vtable_impl; - -@@ -276,12 +279,14 @@ struct vtable_impl<Lambda, false, Return - - template <typename Lambda, typename Return, typename ...Args> - struct vtable : public vtable_impl<Lambda, is_large<Lambda>, Return, Args...> { -- static const vtable instance; -+ static const vtable* get_instance(); - }; - - template <typename Lambda, typename Return, typename ...Args> --const vtable<Lambda, Return, Args...> vtable<Lambda, Return, Args...>::instance = {}; -- -+const vtable<Lambda, Return, Args...>* vtable<Lambda, Return, Args...>::get_instance() { -+ static vtable<Lambda, Return, Args...> instance; -+ return &instance; -+} - } // namespace lambda_internal - - template <typename Return, typename ...Args> -@@ -360,7 +365,7 @@ public: - // Copy / move construct / assign from an arbitrary type. - template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>> - lambda_once(Lambda other) { -- data_.vtable = &lambda_internal::vtable_once<Lambda, Return, Args...>::instance; -+ data_.vtable = lambda_internal::vtable_once<Lambda, Return, Args...>::get_instance(); - lambda_internal::vtable_once<Lambda, Return, Args...>::construct_move_lambda_method(data_.storage, &other); - } - template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>> -@@ -368,7 +373,7 @@ public: - if (data_.vtable) { - data_.vtable->destruct(data_.storage); - } -- data_.vtable = &lambda_internal::vtable_once<Lambda, Return, Args...>::instance; -+ data_.vtable = lambda_internal::vtable_once<Lambda, Return, Args...>::get_instance(); - lambda_internal::vtable_once<Lambda, Return, Args...>::construct_move_lambda_method(data_.storage, &other); - return *this; - } -@@ -443,7 +448,7 @@ public: - - // Copy / move construct / assign from an arbitrary type. - template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>> -- lambda(Lambda other) : Parent(&lambda_internal::vtable<Lambda, Return, Args...>::instance, typename Parent::Private()) { -+ lambda(Lambda other) : Parent(lambda_internal::vtable<Lambda, Return, Args...>::get_instance(), typename Parent::Private()) { - lambda_internal::vtable<Lambda, Return, Args...>::construct_move_lambda_method(this->data_.storage, &other); - } - template <typename Lambda, typename = std::enable_if_t<std::is_convertible<decltype(std::declval<Lambda>()(std::declval<Args>()...)),Return>::value>> -@@ -451,7 +456,7 @@ public: - if (this->data_.vtable) { - this->data_.vtable->destruct(this->data_.storage); - } -- this->data_.vtable = &lambda_internal::vtable<Lambda, Return, Args...>::instance; -+ this->data_.vtable = lambda_internal::vtable<Lambda, Return, Args...>::get_instance(); - lambda_internal::vtable<Lambda, Return, Args...>::construct_move_lambda_method(this->data_.storage, &other); - return *this; - } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp index fd4229e950cc..faefd3302de1 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/boxes/notifications_box.cpp.orig 2018-02-06 06:26:42 UTC +--- Telegram/SourceFiles/boxes/notifications_box.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/boxes/notifications_box.cpp @@ -84,11 +84,11 @@ private: _deleted = true; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h deleted file mode 100644 index 84e3b918c15b..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h +++ /dev/null @@ -1,20 +0,0 @@ ---- Telegram/SourceFiles/config.h.orig 2018-04-08 17:34:33 UTC -+++ Telegram/SourceFiles/config.h -@@ -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 - } -@@ -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 - } - diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp index 5b448bbadc3c..5f38798e852e 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp @@ -1,7 +1,7 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/core/launcher.cpp -@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesk - #include "core/main_queue_processor.h" +@@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesk + #include "core/update_checker.h" #include "application.h" +#include "FREEBSD_QT_PLUGINDIR.h" @@ -9,7 +9,7 @@ namespace Core { std::unique_ptr<Launcher> Launcher::Create(int argc, char *argv[]) { -@@ -31,9 +33,10 @@ void Launcher::init() { +@@ -38,9 +40,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -22,7 +22,7 @@ initHook(); } -@@ -51,6 +54,11 @@ int Launcher::exec() { +@@ -58,6 +61,11 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -34,12 +34,11 @@ 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")); +@@ -139,6 +147,9 @@ void Launcher::prepareSettings() { + case dbipLinux32: gPlatformString = qsl("Linux32bit"); break; + case dbipFreeBSD: -+ gUpdateURL = QUrl(qsl("")); + gPlatformString = qsl("FreeBSD"); + break; } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp new file mode 100644 index 000000000000..243f18190dee --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp @@ -0,0 +1,22 @@ +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/core/update_checker.cpp +@@ -2016,6 +2016,9 @@ int UpdateChecker::size() const { + //} + + bool checkReadyUpdate() { ++#ifdef Q_OS_FREEBSD ++ return false; ++#endif + QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp"); + if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) { + if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { +@@ -2068,6 +2071,9 @@ bool checkReadyUpdate() { + #elif defined Q_OS_LINUX // Q_OS_MAC + QString curUpdater = (cExeDir() + qsl("Updater")); + QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); ++#elif defined Q_OS_FREEBSD ++ QString curUpdater; ++ QFileInfo updater; + #endif // Q_OS_LINUX + if (!updater.exists()) { + QFileInfo current(curUpdater); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h index 2460632aea0d..7ca4fa8c37da 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -451,6 +451,7 @@ enum DBIPlatform { +@@ -433,6 +433,7 @@ enum DBIPlatform { dbipLinux64 = 2, dbipLinux32 = 3, dbipMacOld = 4, diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp index 7e6512aee847..48e0d306190a 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -76,7 +76,7 @@ QString FileNameUnsafe( +@@ -77,7 +77,7 @@ QString FileNameUnsafe( name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); #elif defined Q_OS_MAC name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp new file mode 100644 index 000000000000..fe1508712063 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp @@ -0,0 +1,14 @@ +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/export/data/export_data_types.cpp +@@ -344,9 +344,9 @@ QString CleanDocumentName(QString name) + '|', + #elif defined Q_OS_MAC // Q_OS_WIN + ':', +-#elif defined Q_OS_LINUX // Q_OS_WIN || Q_OS_MAC ++#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 ++#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD + }; + for (const auto ch : controls) { + name = std::move(name).replace(ch, '_'); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp index 5a0a5928505d..49eeff46389d 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp @@ -1,6 +1,6 @@ ---- 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.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1388,13 +1388,13 @@ void InnerWidget::mouseActionFinish(cons +@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(cons _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // TODO diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp index 05550bb9ad1d..7478dd18c6d9 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1336,7 +1336,7 @@ void HistoryInner::mouseActionFinish( +@@ -1344,7 +1344,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()) { -@@ -1345,7 +1345,7 @@ void HistoryInner::mouseActionFinish( +@@ -1353,7 +1353,7 @@ void HistoryInner::mouseActionFinish( QClipboard::Selection); } } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp index c6eea7c0faa3..9cd2e71cd4fc 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp @@ -1,6 +1,6 @@ ---- 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.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2014,7 +2014,7 @@ void ListWidget::mouseActionFinish( +@@ -2017,7 +2017,7 @@ void ListWidget::mouseActionFinish( _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // #TODO select scroll @@ -9,3 +9,12 @@ if (_selectedTextItem && _selectedTextRange.from != _selectedTextRange.to) { if (const auto view = viewForItem(_selectedTextItem)) { +@@ -2026,7 +2026,7 @@ void ListWidget::mouseActionFinish( + QClipboard::Selection); + } + } +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void ListWidget::mouseActionUpdate() { diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp index ebfeaa3174be..4e330b649177 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/layout.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/layout.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/layout.cpp @@ -206,16 +206,16 @@ bool documentIsExecutableName(const QStr *result = qsl("\ diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp index 105c65d378d7..c803a2b874c2 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp @@ -1,22 +1,23 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2018-02-06 05:51:11 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -321,7 +321,7 @@ void start(not_null<Core::Launcher*> lau +@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> lau if (cBetaVersion()) { - cSetDebug(true); + SetDebugEnabled(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 { #ifdef _DEBUG cForceWorkingDir(cExeDir()); -@@ -335,15 +335,15 @@ void start(not_null<Core::Launcher*> lau +@@ -347,15 +347,15 @@ void start(not_null<Core::Launcher*> 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 && !_DEBUG ++#endif // (Q_OS_LINUX || Q_OS_FREEBSD) && !_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 @@ -28,7 +29,7 @@ #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG -@@ -357,7 +357,7 @@ void start(not_null<Core::Launcher*> lau +@@ -369,7 +369,7 @@ void start(not_null<Core::Launcher*> lau cForceWorkingDir(cWorkingDir()); workingDirChosen = true; } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp index 80fed3082b09..d54f70304eb0 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-02-06 05:57:25 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp @@ -121,6 +121,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { return true; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h index da71f3ff3cac..33ed29f68012 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-02-06 05:56:56 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.h @@ -10,14 +10,16 @@ https://github.com/telegramdesktop/tdesk #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp index e438a56bea90..000a3d4362e6 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicat bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h index b95620506be3..0f0e0c327dc9 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_audio.h.orig 2018-02-06 05:55:32 UTC +--- Telegram/SourceFiles/platform/platform_audio.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_audio.h @@ -19,7 +19,7 @@ void DeInit(); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h index 413e1f9bb321..ee5f112c4919 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2018-02-06 05:55:41 UTC +--- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_file_utilities.h -@@ -38,8 +38,8 @@ bool Get(QStringList &files, QByteArray +@@ -45,8 +45,8 @@ bool Get( #ifdef Q_OS_MAC #include "platform/mac/file_utilities_mac.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h index 143df2bc67bc..57ea5af8ce6b 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_launcher.h.orig 2018-02-07 00:52:41 UTC +--- Telegram/SourceFiles/platform/platform_launcher.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_launcher.h @@ -23,8 +23,8 @@ namespace Platform { diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h index 860ee56a3ff6..498a295733e4 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_main_window.h.orig 2018-02-06 05:55:51 UTC +--- Telegram/SourceFiles/platform/platform_main_window.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_main_window.h @@ -19,8 +19,8 @@ class MainWindow; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h index 05bdce840258..510d4105046f 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2018-02-06 05:55:59 UTC +--- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_notifications_manager.h @@ -26,8 +26,8 @@ void FlashBounce(); diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h index fee021f07df8..6efcb257a5c6 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-02-06 05:56:11 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -32,8 +32,8 @@ void finish(); +@@ -34,8 +34,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h index 4a05a9204c72..1eeb5633e491 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-02-06 05:56:19 UTC +--- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_window_title.h @@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &pre #include "platform/mac/window_title_mac.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp index 2d4268cd13f2..020dd9f90e17 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/qt_functions.cpp.orig 2018-02-06 05:16:48 UTC +--- Telegram/SourceFiles/qt_functions.cpp.orig 2018-08-05 22:39:05 UTC +++ Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp index 0078d3d6e606..c4c3228fae8e 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/qt_static_plugins.cpp @@ -14,14 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi Q_IMPORT_PLUGIN(QWebpPlugin) diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp index edda6d1a439f..46849b423da8 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings.cpp.orig 2018-02-06 06:26:16 UTC +--- Telegram/SourceFiles/settings.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/settings.cpp -@@ -83,6 +83,8 @@ DBIPlatform gPlatform = dbipMac; +@@ -81,6 +81,8 @@ DBIPlatform gPlatform = dbipMac; DBIPlatform gPlatform = dbipLinux64; #elif defined Q_OS_LINUX32 DBIPlatform gPlatform = dbipLinux32; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp index e1d7229f3620..17632bf438d1 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig 2018-02-06 06:27:16 UTC +--- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/settings/settings_notifications_widget.cpp @@ -69,9 +69,9 @@ void NotificationsWidget::createNotifica if (Platform::Notifications::Supported()) { diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp index 9d6df137c531..62308072ea4c 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1748,11 +1748,11 @@ private: +@@ -1750,11 +1750,11 @@ private: if (item == -1) return; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp index e3f9d7940a6d..f4c584fa3809 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/text/text_block.cpp @@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font & diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp index ab0965f47a5b..d8e5bbe730e8 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/twidget.cpp -@@ -235,9 +235,9 @@ void sendSynteticMouseEvent(QWidget *wid +@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *wid , button , QGuiApplication::mouseButtons() | button , QGuiApplication::keyboardModifiers() diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp index ec2eecd44ebc..cd2f8c9afde9 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-02-06 06:28:03 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -359,11 +359,11 @@ Text::StateResult FlatLabel::dragActionF +@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionF } } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp new file mode 100644 index 000000000000..b2a25abe1770 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp @@ -0,0 +1,20 @@ +--- Telegram/SourceFiles/window/main_window.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/window/main_window.cpp +@@ -421,7 +421,7 @@ bool MainWindow::minimizeToTray() { + } + + void MainWindow::reActivateWindow() { +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + const auto reActivate = [=] { + if (const auto w = App::wnd()) { + if (auto f = QApplication::focusWidget()) { +@@ -436,7 +436,7 @@ void MainWindow::reActivateWindow() { + }; + crl::on_main(this, reActivate); + App::CallDelayed(200, this, reActivate); +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void MainWindow::showRightColumn(object_ptr<TWidget> widget) { diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h deleted file mode 100644 index b86a5f1ae1c9..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp index 8fa139136183..ac7f0a00d6c6 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-02-07 04:45:28 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -1954,7 +1954,7 @@ static void initMachTimestart() { +@@ -2046,7 +2046,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp new file mode 100644 index 000000000000..70c689716679 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-07-17 16:48:21 UTC ++++ Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp +@@ -29,7 +29,7 @@ + #endif + #include "../os/windows/AudioInputWASAPI.h" + #include "../os/windows/AudioOutputWASAPI.h" +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA + #include "../os/linux/AudioInputALSA.h" + #include "../os/linux/AudioOutputALSA.h" +@@ -62,7 +62,7 @@ shared_ptr<AudioIO> AudioIO::Create(){ + return std::make_shared<ContextlessAudioIO<AudioInputWave, AudioOutputWave>>(inputDevice, outputDevice); + #endif + return std::make_shared<ContextlessAudioIO<AudioInputWASAPI, AudioOutputWASAPI>>(inputDevice, outputDevice); +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #ifndef WITHOUT_ALSA + #ifndef WITHOUT_PULSE + if(AudioPulse::Load()){ diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp index e87740e5ab98..de5db0a3650f 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp @@ -1,15 +1,15 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -@@ -19,7 +19,7 @@ +@@ -24,7 +24,7 @@ #include "../os/windows/AudioInputWave.h" #endif #include "../os/windows/AudioInputWASAPI.h" --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" - #include "../os/linux/AudioInputPulse.h" - #else -@@ -54,7 +54,7 @@ AudioInput *AudioInput::Create(std::stri + #endif +@@ -63,7 +63,7 @@ AudioInput::AudioInput(std::string devic return new AudioInputWave(deviceID); #endif return new AudioInputWASAPI(deviceID); @@ -18,12 +18,12 @@ if(AudioInputPulse::IsAvailable()){ AudioInputPulse* aip=new AudioInputPulse(deviceID); if(!aip->IsInitialized()) -@@ -87,7 +87,7 @@ void AudioInput::EnumerateDevices(std::v +@@ -96,7 +96,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)) + #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) + if(!AudioInputPulse::EnumerateDevices(devs)) AudioInputALSA::EnumerateDevices(devs); - #endif diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp index 2cd3382b818f..f048f947b4d3 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp @@ -1,29 +1,29 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -@@ -20,7 +20,7 @@ +@@ -27,7 +27,7 @@ #include "../os/windows/AudioOutputWave.h" #endif #include "../os/windows/AudioOutputWASAPI.h" --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA #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); +@@ -59,7 +59,7 @@ int32_t AudioOutput::estimatedDelay=60; + return std::unique_ptr<AudioOutput>(new AudioOutputWave(deviceID)); + #endif + return std::unique_ptr<AudioOutput>(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:: +@@ -107,7 +107,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)) + #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) + if(!AudioOutputPulse::EnumerateDevices(devs)) AudioOutputALSA::EnumerateDevices(devs); - #endif diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp index b3a030540688..b80b3691f99c 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/logging.cpp.orig 2018-02-07 04:44:58 UTC +--- Telegram/ThirdParty/libtgvoip/logging.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/logging.cpp @@ -13,7 +13,7 @@ @@ -9,7 +9,7 @@ #include <sys/utsname.h> #endif -@@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(){ +@@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(FILE* #else char* systemVersion="Windows RT"; #endif diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp index 2d5dc520b666..ecdcb71afe4c 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputALSA.cpp @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp.orig 2018-02-07 04:47:15 UTC +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp @@ -12,6 +12,10 @@ #include "../../logging.h" @@ -11,7 +11,7 @@ using namespace tgvoip::audio; #define BUFFER_SIZE 960 -@@ -177,4 +181,4 @@ void AudioInputALSA::EnumerateDevices(st +@@ -172,4 +176,4 @@ void AudioInputALSA::EnumerateDevices(st } dlclose(lib); diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp deleted file mode 100644 index a33dc5cb023a..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <assert.h> - #include <dlfcn.h> - #include <unistd.h> -+#include <libgen.h> - #include "AudioInputPulse.h" - #include "../../logging.h" - #include "../../VoIPController.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp index 8844950e63d6..d859fb6d263d 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp.orig 2018-02-07 04:46:53 UTC +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp @@ -11,6 +11,10 @@ #include "../../logging.h" @@ -11,7 +11,7 @@ #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 +@@ -174,4 +178,4 @@ void AudioOutputALSA::EnumerateDevices(s } dlclose(lib); diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp deleted file mode 100644 index 9406c847bbbf..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <assert.h> - #include <dlfcn.h> - #include <unistd.h> -+#include <libgen.h> - #include "AudioOutputPulse.h" - #include "../../logging.h" - #include "../../VoIPController.h" diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp new file mode 100644 index 000000000000..361a96eaca5e --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp @@ -0,0 +1,19 @@ +--- Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.orig 2018-07-17 16:48:21 UTC ++++ Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp +@@ -7,6 +7,9 @@ + #include "AudioPulse.h" + #include <dlfcn.h> + #include "../../logging.h" ++#ifdef __FreeBSD__ ++#include <libgen.h> ++#endif + + #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL + #define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); return false;} +@@ -272,4 +275,4 @@ bool AudioPulse::DoOneOperation(std::fun + } + pa_mainloop_iterate(ml, 1, NULL); + } +-} +\ No newline at end of file ++} diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h index 58be8043dc96..bab1b6fcb581 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/os/linux/PulseAudioLoader.h.orig 2018-02-07 04:46:43 UTC +--- Telegram/ThirdParty/libtgvoip/os/linux/PulseAudioLoader.h.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/os/linux/PulseAudioLoader.h @@ -9,6 +9,10 @@ diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp index 5b6082b601c7..196cbd32bfd2 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp @@ -1,10 +1,10 @@ ---- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -46,6 +46,7 @@ void NetworkSocketPosix::SetMaxPriority( +@@ -53,6 +53,7 @@ void NetworkSocketPosix::SetMaxPriority( if(res<0){ LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno)); } +#elif defined(__FreeBSD__) - #else + #elif defined(__linux__) int prio=5; int res=setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio)); diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h index c37d231be239..e1950bb82911 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h @@ -1,11 +1,23 @@ ---- Telegram/ThirdParty/libtgvoip/threading.h.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/threading.h.orig 2018-07-17 16:48:21 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) +@@ -42,6 +42,9 @@ namespace tgvoip{ + #ifdef __APPLE__ + #include "os/darwin/DarwinSpecific.h" #endif ++#ifdef __FreeBSD__ ++#include <pthread_np.h> ++#endif + + namespace tgvoip{ + class Mutex{ +@@ -112,7 +115,9 @@ namespace tgvoip{ + static void* ActualEntryPoint(void* arg){ + Thread* self=reinterpret_cast<Thread*>(arg); + if(self->name){ +-#if !defined(__APPLE__) && !defined(__gnu_hurd__) ++#if defined(__FreeBSD__) ++ pthread_set_name_np(self->thread, self->name); ++#elif !defined(__APPLE__) && !defined(__gnu_hurd__) + pthread_setname_np(self->thread, self->name); + #elif !defined(__gnu_hurd__) + pthread_setname_np(self->name); diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h index 307edd6e5a19..b02c92d6083b 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h +++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h @@ -1,4 +1,4 @@ ---- 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.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/webrtc_dsp/webrtc/base/stringutils.h @@ -23,7 +23,7 @@ #endif // WEBRTC_WIN diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake b/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake index d211c25869b2..f0692d5286f0 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake @@ -1,6 +1,6 @@ ---- Telegram/gyp/PrecompiledHeader.cmake.orig 2018-01-03 10:46:01 UTC +--- Telegram/gyp/PrecompiledHeader.cmake.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/PrecompiledHeader.cmake -@@ -79,7 +79,7 @@ function(export_all_flags _filename _sou +@@ -81,7 +81,7 @@ function(export_all_flags _filename _sou endfunction() function(add_precompiled_header _target _input) @@ -9,7 +9,7 @@ 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 +@@ -114,7 +114,7 @@ function(add_precompiled_header _target set(_compiler_FLAGS "@${_pch_c_flags_file}") add_custom_command( OUTPUT "${_output_c}" @@ -18,7 +18,7 @@ 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 +@@ -125,7 +125,7 @@ function(add_precompiled_header _target set(_compiler_FLAGS "@${_pch_cpp_flags_file}") add_custom_command( OUTPUT "${_output_cxx}" @@ -26,8 +26,8 @@ + 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 + COMMENT "Precompiling header ${_name} for ${_target} (C++)") +@@ -163,5 +163,5 @@ function(add_precompiled_header _target OBJECT_DEPENDS "${_object_depends}") endif() endforeach() diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi b/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi index a7a6d0d96da5..2bb0959b79f0 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_common.gypi @@ -1,4 +1,4 @@ ---- Telegram/gyp/common.gypi.orig 2018-02-06 06:29:27 UTC +--- Telegram/gyp/common.gypi.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/common.gypi @@ -29,7 +29,7 @@ }, { diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi b/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi index c129832a49b1..b7a4d7ae488c 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi @@ -1,4 +1,4 @@ ---- Telegram/gyp/settings_linux.gypi.orig 2018-01-03 10:46:01 UTC +--- Telegram/gyp/settings_linux.gypi.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/settings_linux.gypi @@ -11,7 +11,6 @@ 'linux_common_flags': [ @@ -17,7 +17,7 @@ 'defines': [ 'Q_OS_LINUX64', ], -@@ -47,7 +46,6 @@ +@@ -60,7 +59,6 @@ ], 'defines': [ '_REENTRANT', @@ -25,3 +25,13 @@ 'QT_PLUGIN', ], 'cflags_c': [ +@@ -73,9 +71,6 @@ + '-Wno-register', + ], + 'make_global_settings': [ +- ['AR', '/usr/bin/gcc-ar'], +- ['RANLIB', '/usr/bin/gcc-ranlib'], +- ['NM', '/usr/bin/gcc-nm'], + ], + 'configurations': { + 'Debug': { diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt index c8207d48c0fb..3499b593d481 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2018-04-08 17:34:33 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2018-08-04 18:53:40 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -760,14 +760,7 @@ +@@ -797,14 +797,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h diff --git a/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol b/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol index 3507d46554cc..77ad09c16bee 100644 --- a/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol +++ b/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol @@ -1,4 +1,4 @@ ---- lib/xdg/tg.protocol.orig 2018-02-06 05:50:37 UTC +--- lib/xdg/tg.protocol.orig 2018-08-04 18:53:40 UTC +++ lib/xdg/tg.protocol @@ -1,5 +1,5 @@ [Protocol] |