svn commit: r528475 - in head/net-im/telegram-desktop: . files
Tobias C. Berner
tcberner at FreeBSD.org
Sun Mar 15 08:12:59 UTC 2020
Author: tcberner
Date: Sun Mar 15 08:12:54 2020
New Revision: 528475
URL: https://svnweb.freebsd.org/changeset/ports/528475
Log:
net-im/telegram-desktop: update to 1.9.14
PR: 244651
Submitted by: Henry Hu <henry.hu.sh at gmail.com> (maintainer)
Added:
head/net-im/telegram-desktop/files/patch-Telegram_CMakeLists.txt (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__info.h (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_platform_ui__platform__utility.h (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp (contents, props changed)
head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_labels.cpp (contents, props changed)
head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt (contents, props changed)
head/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt (contents, props changed)
Deleted:
head/net-im/telegram-desktop/files/CMakeLists.inj
head/net-im/telegram-desktop/files/gyp-patches
head/net-im/telegram-desktop/files/patch-Telegram_Resources_qrc_linux.qrc
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.h
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h
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__info.h
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_platform_ui__platform__utility.h
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_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp
head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake
head/net-im/telegram-desktop/files/patch-Telegram_gyp_common_common.gypi
head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram_sources.txt
head/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol
Modified:
head/net-im/telegram-desktop/Makefile
head/net-im/telegram-desktop/distinfo
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_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_logs.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp
head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp
head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
head/net-im/telegram-desktop/pkg-plist
Modified: head/net-im/telegram-desktop/Makefile
==============================================================================
--- head/net-im/telegram-desktop/Makefile Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/Makefile Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= telegram-desktop
-DISTVERSIONPREFIX= v
-DISTVERSION= 1.8.15
+DISTVERSION= 1.9.14
CATEGORIES= net-im
MAINTAINER= henry.hu.sh at gmail.com
@@ -19,42 +18,44 @@ NOT_FOR_ARCHS_REASON= Only little endian is supported
BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \
dee>0:devel/dee \
- gyp:devel/py-gyp@${PY_FLAVOR} \
pulseaudio>0:audio/pulseaudio \
- range-v3>0:devel/range-v3
+ range-v3>0:devel/range-v3 \
+ microsoft-gsl>0:devel/microsoft-gsl \
+ tl-expected>0:devel/tl-expected
LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libdbus-1.so:devel/dbus \
libminizip.so:archivers/minizip \
libopenal.so:audio/openal-soft \
- libopus.so:audio/opus
+ libopus.so:audio/opus \
+ libdbusmenu-qt5.so:devel/libdbusmenu-qt \
+ libhunspell-1.7.so:textproc/hunspell \
+ libxxhash.so:devel/xxhash \
+ libenchant-2.so:textproc/enchant2
-USES= cmake:noninja compiler:c++17-lang desktop-file-utils gmake \
- gnome pkgconfig python:2.7,build qt:5 ssl xorg
+USES= cmake compiler:c++17-lang desktop-file-utils \
+ gnome pkgconfig python:3.7,build qt:5 ssl xorg
-USE_GITHUB= yes
+MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
+DISTNAME= tdesktop-${DISTVERSION}-full
+
GH_ACCOUNT= telegramdesktop
GH_PROJECT= tdesktop
-GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \
- mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \
- Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \
- telegramdesktop:libtgvoip:d4a0f71:libtgvoip/Telegram/ThirdParty/libtgvoip \
- telegramdesktop:crl:52baf11:crl/Telegram/ThirdParty/crl \
- Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash \
- john-preston:rlottie:589db02:rlottie/Telegram/ThirdParty/rlottie \
- lz4:lz4:9a2a9f2:lz4/Telegram/ThirdParty/lz4
USE_GNOME= glib20
USE_QT= core dbus gui imageformats network widgets buildtools_build \
qmake_build
USE_XORG= x11 xcb
-CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release
+CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
+ TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
+CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \
+ DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP
+CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
+ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
+ -Ddisable_autoupdate=1
# Telegram asks each custom build to have its own API ID and hash.
-# Use the default ones for now. We may need to switch to the official ones,
-# or create our own.
-TELEGRAM_API_ID= 17349
-TELEGRAM_API_HASH= 344583e45741c457fe1862106095a5eb
-GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
+TELEGRAM_API_ID= 601761
+TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d
# Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
# It dynamically loads PulseAudio, and if this fails, it loads ALSA.
@@ -70,56 +71,12 @@ GTK_DESC= Gtk integration (Use Gtk dialogs, etc.)
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+GTK_CMAKE_BOOL_OFF= TDESKTOP_DISABLE_GTK_INTEGRATION
+
.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>
-
-post-patch:
- @cd ${WRKSRC} && \
- (${SED} -e " \
- s|%%QT_VERSION%%|${QT5_VERSION}| ; \
- s|%%LOCALBASE%%|${LOCALBASE}| ; \
- s|%%CFLAGS%%|${CFLAGS:C/(.*)/'\1',/}| ; \
- s|%%CXXFLAGS%%|${CXXFLAGS:C/(.*)/'\1',/}| ; \
- s|%%LDFLAGS%%|${LDFLAGS:C/(.*)/'\1',/}| ; \
- s|%%QT_BINDIR%%|${QT_BINDIR}| ; \
- s|%%QT_INCDIR%%|${QT_INCDIR}| ; \
- s|%%QT_LIBDIR%%|${QT_LIBDIR}| ; \
- s|%%QMAKESPEC%%|${QMAKESPEC}| ; \
- s|%%PYTHON_CMD%%|${PYTHON_CMD}|" \
- ${FILESDIR}/gyp-patches | \
- ${PATCH} -z .bak -s)
- @${ECHO} "#define FREEBSD_QT_PLUGINDIR \"${QT_PLUGINDIR}\"" > ${WRKSRC}/Telegram/SourceFiles/FREEBSD_QT_PLUGINDIR.h
- @${REINPLACE_CMD} "/Icon=/s|telegram|${PORTNAME}|" ${WRKSRC}/lib/xdg/telegramdesktop.desktop
-
-pre-configure:
- @cd ${WRKSRC} && gyp \
- -Dapi_id=${TELEGRAM_API_ID} \
- -Dapi_hash=${TELEGRAM_API_HASH} \
- -Dbuild_defines=${GYP_DEFINES} \
- -Gconfig=Release \
- --depth=Telegram/gyp --generator-output=../.. -Goutput_dir=out Telegram/gyp/Telegram.gyp --format=cmake
- @TOT=`wc -l < ${WRKSRC}/out/Release/CMakeLists.txt` && NUM=`expr $$TOT - 2` && \
- ${REINPLACE_CMD} "$$NUM r ${FILESDIR}/CMakeLists.inj" ${WRKSRC}/out/Release/CMakeLists.txt
-
-do-install:
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/Telegram ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/lib/xdg/telegramdesktop.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/kservices5
- ${INSTALL_DATA} ${WRKSRC}/lib/xdg/tg.protocol ${STAGEDIR}${PREFIX}/share/kservices5
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
- ${INSTALL_DATA} ${WRKSRC}/lib/xdg/telegramdesktop.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/${PORTNAME}.appdata.xml
-.for icon_size in 16 32 48 64 128 256 512
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps
- ${INSTALL_DATA} \
- ${WRKSRC}/Telegram/Resources/art/icon${icon_size}.png \
- ${STAGEDIR}${PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps/${PORTNAME}.png
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/telegram-desktop/distinfo
==============================================================================
--- head/net-im/telegram-desktop/distinfo Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/distinfo Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,19 +1,3 @@
-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
-SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686
-SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468
-SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930
-SHA256 (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = bff049b414bdaafe488f3d46d894e910c06ff5233bf33001d59fe50b7de3702a
-SIZE (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = 1484804
-SHA256 (telegramdesktop-crl-52baf11_GH0.tar.gz) = 04effcfcbcd1486619d93dba0a30ca16579bca5cc37273ed1908dd8b375e3e3b
-SIZE (telegramdesktop-crl-52baf11_GH0.tar.gz) = 21842
-SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed
-SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534
-SHA256 (john-preston-rlottie-589db02_GH0.tar.gz) = 415a78d04836f5bf4e535b034a7d5cf540d55cce98b9be869c3178e1c251f361
-SIZE (john-preston-rlottie-589db02_GH0.tar.gz) = 7887733
-SHA256 (lz4-lz4-9a2a9f2_GH0.tar.gz) = 437827e1a1a0eec752777d29ef7ac78b195c805438448fe08154d9b5b181b8ea
-SIZE (lz4-lz4-9a2a9f2_GH0.tar.gz) = 293999
+TIMESTAMP = 1583109660
+SHA256 (tdesktop-1.9.14-full.tar.gz) = 864d1d5e810e30368e60d4ea389c644387abbc803b3b5426268efa5016d15a4b
+SIZE (tdesktop-1.9.14-full.tar.gz) = 25324084
Added: head/net-im/telegram-desktop/files/patch-Telegram_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_CMakeLists.txt Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,10 @@
+--- Telegram/CMakeLists.txt.orig 2020-02-18 08:28:06 UTC
++++ Telegram/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ # For license and copyright information please follow this link:
+ # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+
++link_directories(${OPUS_LIBDIR})
+ add_executable(Telegram WIN32 MACOSX_BUNDLE)
+ init_target(Telegram)
+
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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,40 +1,11 @@
---- Telegram/SourceFiles/core/launcher.cpp.orig 2019-10-07 15:58:21 UTC
+--- Telegram/SourceFiles/core/launcher.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/core/launcher.cpp
-@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste
- #include "base/concurrent_timer.h"
- #include "facades.h"
+@@ -248,7 +248,7 @@ void Launcher::init() {
-+#include "FREEBSD_QT_PLUGINDIR.h"
-+
- namespace Core {
- namespace {
+ QApplication::setApplicationName(qsl("TelegramDesktop"));
-@@ -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)));
--#elif defined(Q_OS_LINUX) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+#elif (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
- QApplication::setDesktopFileName(qsl("telegramdesktop.desktop"));
+-#if defined(Q_OS_LINUX) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
++#if (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+ QApplication::setDesktopFileName(Platform::GetLauncherFilename());
#endif
--#ifndef OS_MAC_OLD
-+#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-+ // Retina display support is working fine, others are not.
- QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
--#endif // OS_MAC_OLD
-+#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0
-
- initHook();
- }
-@@ -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
-+
-+ // I don't know why path is not in QT_PLUGIN_PATH by default
-+ QCoreApplication::addLibraryPath(FREEBSD_QT_PLUGINDIR);
-+ // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943
-+ unsetenv("QT_QPA_PLATFORMTHEME");
-
- auto result = executeApplication();
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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-10-07 15:58:21 UTC
+--- Telegram/SourceFiles/core/update_checker.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/core/update_checker.cpp
-@@ -1459,6 +1459,9 @@ int UpdateChecker::size() const {
+@@ -1460,6 +1460,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()) {
-@@ -1511,6 +1514,9 @@ bool checkReadyUpdate() {
+@@ -1512,6 +1515,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_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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- 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.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
-@@ -1438,13 +1438,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
+@@ -1451,13 +1451,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
_mouseSelectType = TextSelectType::Letters;
//_widget->noSelectingScroll(); // TODO
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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-10-07 15:58:21 UTC
+--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/history/history_inner_widget.cpp
-@@ -1401,7 +1401,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1403,7 +1403,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()) {
-@@ -1410,7 +1410,7 @@ void HistoryInner::mouseActionFinish(
+@@ -1412,7 +1412,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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- 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.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
-@@ -2061,7 +2061,7 @@ void ListWidget::mouseActionFinish(
+@@ -2066,7 +2066,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)) {
-@@ -2070,7 +2070,7 @@ void ListWidget::mouseActionFinish(
+@@ -2075,7 +2075,7 @@ void ListWidget::mouseActionFinish(
QClipboard::Selection);
}
}
Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp
==============================================================================
--- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/logs.cpp.orig 2019-07-07 13:34:35 UTC
+--- Telegram/SourceFiles/logs.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/logs.cpp
-@@ -338,7 +338,7 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {
if (cAlphaVersion()) {
workingDirChosen = true;
@@ -9,7 +9,7 @@
} else {
if (!cWorkingDir().isEmpty()) {
// This value must come from TelegramForcePortable
-@@ -353,16 +353,16 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {
}
workingDirChosen = true;
@@ -30,7 +30,7 @@
#ifdef _DEBUG
cForceWorkingDir(cExeDir());
#else // _DEBUG
-@@ -379,7 +379,7 @@ void start(not_null<Core::Launcher*> launcher) {
+@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {
workingDirChosen = true;
}
Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp
==============================================================================
--- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,20 +1,17 @@
---- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2019-02-01 12:51:46 UTC
+--- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/qt_static_plugins.cpp
-@@ -14,15 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
- Q_IMPORT_PLUGIN(QWebpPlugin)
+@@ -19,7 +19,7 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+ #elif defined Q_OS_MAC // Q_OS_WIN
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
Q_IMPORT_PLUGIN(QGenericEnginePlugin)
-#elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC
--Q_IMPORT_PLUGIN(QWebpPlugin)
--Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
--Q_IMPORT_PLUGIN(QConnmanEnginePlugin)
--Q_IMPORT_PLUGIN(QGenericEnginePlugin)
--Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin)
--Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
--Q_IMPORT_PLUGIN(NimfInputContextPlugin)
--#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
+#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_WIN | Q_OS_MAC
+ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
+ Q_IMPORT_PLUGIN(QGenericEnginePlugin)
+ Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
+@@ -33,4 +33,4 @@ Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin)
+ Q_IMPORT_PLUGIN(NimfInputContextPlugin)
+ Q_IMPORT_PLUGIN(QXdgDesktopPortalThemePlugin)
+ #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
+-#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX
+#endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX | Q_OS_FREEBSD
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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-10-07 15:58:21 UTC
+--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/settings/settings_notifications.cpp
-@@ -496,11 +496,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(
+@@ -495,11 +495,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(
_deleted = true;
// Ubuntu has a lag if deleteLater() called immediately.
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 Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-10-07 15:58:21 UTC
+--- Telegram/SourceFiles/window/main_window.cpp.orig 2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/window/main_window.cpp
-@@ -573,7 +573,7 @@ bool MainWindow::minimizeToTray() {
+@@ -589,7 +589,7 @@ bool MainWindow::minimizeToTray() {
}
void MainWindow::reActivateWindow() {
@@ -9,10 +9,10 @@
const auto reActivate = [=] {
if (const auto w = App::wnd()) {
if (auto f = QApplication::focusWidget()) {
-@@ -588,7 +588,7 @@ void MainWindow::reActivateWindow() {
+@@ -604,7 +604,7 @@ void MainWindow::reActivateWindow() {
};
crl::on_main(this, reActivate);
- App::CallDelayed(200, this, reActivate);
+ base::call_delayed(200, this, reActivate);
-#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_ThirdParty_libtgvoip_VoIPController.cpp
==============================================================================
--- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,6 +1,6 @@
---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-07-15 12:59:17 UTC
+--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2020-02-12 13:11:18 UTC
+++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp
-@@ -3048,7 +3048,7 @@ static void initMachTimestart() {
+@@ -3005,7 +3005,7 @@ static void initMachTimestart() {
#endif
double VoIPController::GetCurrentTime(){
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_bytes.h Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,20 @@
+--- Telegram/lib_base/base/bytes.h.orig 2020-01-29 09:41:30 UTC
++++ Telegram/lib_base/base/bytes.h
+@@ -136,7 +136,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;
+ }
+
+@@ -148,7 +148,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);
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__file__utilities.h Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,13 @@
+--- Telegram/lib_base/base/platform/base_platform_file_utilities.h.orig 2020-01-29 09:41:30 UTC
++++ Telegram/lib_base/base/platform/base_platform_file_utilities.h
+@@ -22,8 +22,8 @@ void RemoveQuarantine(const QString &path);
+
+ #ifdef Q_OS_MAC
+ #include "base/platform/mac/base_file_utilities_mac.h"
+-#elif defined Q_OS_LINUX // Q_OS_MAC
++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC
+ #include "base/platform/linux/base_file_utilities_linux.h"
+-#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX
++#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD
+ #include "base/platform/win/base_file_utilities_win.h"
+ #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__info.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__info.h Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,14 @@
+--- Telegram/lib_base/base/platform/base_platform_info.h.orig 2020-01-29 09:41:30 UTC
++++ Telegram/lib_base/base/platform/base_platform_info.h
+@@ -53,8 +53,8 @@ void Finish();
+
+ #ifdef Q_OS_MAC
+ #include "base/platform/mac/base_info_mac.h"
+-#elif defined Q_OS_LINUX // Q_OS_MAC
++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC
+ #include "base/platform/linux/base_info_linux.h"
+-#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX
++#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINU || Q_OS_FREEBSD X
+ #include "base/platform/win/base_info_win.h"
+-#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN
++#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_FREEBSD X
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_zlib__help.h Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,13 @@
+--- Telegram/lib_base/base/zlib_help.h.orig 2020-01-29 09:41:30 UTC
++++ Telegram/lib_base/base/zlib_help.h
+@@ -6,8 +6,8 @@
+ //
+ #pragma once
+
+-#include "zip.h"
+-#include "unzip.h"
++#include "minizip/zip.h"
++#include "minizip/unzip.h"
+ #include "logs.h"
+
+ #ifdef small
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_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_lib__ui_ui_platform_ui__platform__utility.h Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,11 @@
+--- Telegram/lib_ui/ui/platform/ui_platform_utility.h.orig 2020-02-10 08:12:05 UTC
++++ Telegram/lib_ui/ui/platform/ui_platform_utility.h
+@@ -37,7 +37,7 @@ void DrainMainQueue(); // Needed only if UseMainQueueG
+
+ #ifdef Q_OS_MAC
+ #include "ui/platform/mac/ui_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_utility_linux.h"
+ #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX
+ #include "ui/platform/win/ui_utility_win.h"
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,11 @@
+--- Telegram/lib_ui/ui/style/style_core_font.cpp.orig 2020-02-10 08:12:05 UTC
++++ Telegram/lib_ui/ui/style/style_core_font.cpp
+@@ -22,7 +22,7 @@ void style_InitFontsResource() {
+ Q_INIT_RESOURCE(win);
+ #elif defined Q_OS_MAC // Q_OS_WIN
+ Q_INIT_RESOURCE(mac);
+-#elif defined Q_OS_LINUX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN || Q_OS_MAC
++#elif (defined Q_OS_LINUX || defined Q_OS_FREEBSD) && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN || Q_OS_MAC
+ Q_INIT_RESOURCE(linux);
+ #endif // Q_OS_WIN || Q_OS_MAC || (Q_OS_LINUX && !DESKTOP_APP_USE_PACKAGED)
+ }
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_labels.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_labels.cpp Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,18 @@
+--- Telegram/lib_ui/ui/widgets/labels.cpp.orig 2020-02-10 08:12:05 UTC
++++ Telegram/lib_ui/ui/widgets/labels.cpp
+@@ -454,13 +454,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()) {
+ TextUtilities::SetClipboardText(
+ _text.toTextForMimeData(_selection),
+ QClipboard::Selection);
+ }
+-#endif // Q_OS_LINUX32 || Q_OS_LINUX64
++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD
+
+ return state;
+ }
Added: head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,11 @@
+--- cmake/external/opus/CMakeLists.txt.orig 2020-02-18 08:27:33 UTC
++++ cmake/external/opus/CMakeLists.txt
+@@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(OPUS opus)
+
+- target_include_directories(external_opus INTERFACE ${OPUS_INCLUDE_DIRS})
++ target_include_directories(external_opus INTERFACE ${OPUS_INCLUDEDIR})
+ else()
+ target_include_directories(external_opus SYSTEM
+ INTERFACE
Added: head/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt Sun Mar 15 08:12:54 2020 (r528475)
@@ -0,0 +1,13 @@
+--- cmake/external/qt/CMakeLists.txt.orig 2020-02-18 08:27:33 UTC
++++ cmake/external/qt/CMakeLists.txt
+@@ -10,8 +10,10 @@ add_library(desktop-app::external_qt ALIAS external_qt
+ if (LINUX)
+ if (NOT build_linux32)
+ target_compile_definitions(external_qt INTERFACE Q_OS_LINUX64)
++ target_compile_definitions(external_qt INTERFACE Q_OS_FREEBSD)
+ else()
+ target_compile_definitions(external_qt INTERFACE Q_OS_LINUX32)
++ target_compile_definitions(external_qt INTERFACE Q_OS_FREEBSD)
+ endif()
+ endif()
+
Modified: head/net-im/telegram-desktop/pkg-plist
==============================================================================
--- head/net-im/telegram-desktop/pkg-plist Sun Mar 15 07:45:41 2020 (r528474)
+++ head/net-im/telegram-desktop/pkg-plist Sun Mar 15 08:12:54 2020 (r528475)
@@ -1,11 +1,10 @@
bin/telegram-desktop
-share/appdata/telegram-desktop.appdata.xml
-share/applications/telegram-desktop.desktop
-share/kservices5/tg.protocol
-share/icons/hicolor/128x128/apps/telegram-desktop.png
-share/icons/hicolor/16x16/apps/telegram-desktop.png
-share/icons/hicolor/256x256/apps/telegram-desktop.png
-share/icons/hicolor/32x32/apps/telegram-desktop.png
-share/icons/hicolor/48x48/apps/telegram-desktop.png
-share/icons/hicolor/512x512/apps/telegram-desktop.png
-share/icons/hicolor/64x64/apps/telegram-desktop.png
+share/applications/telegramdesktop.desktop
+share/icons/hicolor/128x128/apps/telegram.png
+share/icons/hicolor/16x16/apps/telegram.png
+share/icons/hicolor/256x256/apps/telegram.png
+share/icons/hicolor/32x32/apps/telegram.png
+share/icons/hicolor/48x48/apps/telegram.png
+share/icons/hicolor/512x512/apps/telegram.png
+share/icons/hicolor/64x64/apps/telegram.png
+share/metainfo/telegramdesktop.appdata.xml
More information about the svn-ports-all
mailing list