Date: Sun, 28 Jun 2020 05:46:48 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540676 - in head/net-im/telegram-desktop: . files Message-ID: <202006280546.05S5kmHZ046010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Sun Jun 28 05:46:48 2020 New Revision: 540676 URL: https://svnweb.freebsd.org/changeset/ports/540676 Log: Update to 2.1.13 PR: 247527 Submitted by: Volodymyr Kostyrko <arcade@b1t.name> Approved by: Henry Hu <henry.hu.sh@gmail.com (maintainer) Deleted: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.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_platform_platform__audio.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_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_lib__base_base_platform_base__platform__file__utilities.h head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_base__platform__info.h head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_platform_ui__platform__utility.h head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_style_style__core__font.cpp head/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_widgets_labels.cpp head/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt Modified: head/net-im/telegram-desktop/Makefile head/net-im/telegram-desktop/distinfo head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Sun Jun 28 05:44:56 2020 (r540675) +++ head/net-im/telegram-desktop/Makefile Sun Jun 28 05:46:48 2020 (r540676) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= telegram-desktop -DISTVERSION= 2.1.7 +DISTVERSION= 2.1.13 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Sun Jun 28 05:44:56 2020 (r540675) +++ head/net-im/telegram-desktop/distinfo Sun Jun 28 05:46:48 2020 (r540676) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590358574 -SHA256 (tdesktop-2.1.7-full.tar.gz) = c944b07f1a7d600a32cea9e4ce45b4954fe0d18176a7491c2f1e98f3425cca62 -SIZE (tdesktop-2.1.7-full.tar.gz) = 36509059 +TIMESTAMP = 1593031017 +SHA256 (tdesktop-2.1.13-full.tar.gz) = d1653a386107836a0808c3d828341ad54aa962f167d8b2e17430d8aedc710357 +SIZE (tdesktop-2.1.13-full.tar.gz) = 36549505 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 Jun 28 05:44:56 2020 (r540675) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Sun Jun 28 05:46:48 2020 (r540676) @@ -11,12 +11,12 @@ if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) { if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { @@ -1512,6 +1515,9 @@ bool checkReadyUpdate() { - #elif defined Q_OS_LINUX // Q_OS_MAC + #elif defined Q_OS_UNIX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); +#elif defined Q_OS_FREEBSD + QString curUpdater; + QFileInfo updater; - #endif // Q_OS_LINUX + #endif // Q_OS_UNIX if (!updater.exists()) { QFileInfo current(curUpdater); Modified: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp Sun Jun 28 05:44:56 2020 (r540675) +++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp Sun Jun 28 05:46:48 2020 (r540676) @@ -1,11 +1,53 @@ ---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2020-03-30 09:44:51 UTC -+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp -@@ -65,7 +65,7 @@ QString SystemVersionPretty() { - const auto result = getenv("XDG_CURRENT_DESKTOP"); +--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2020-06-24 20:32:27.483667000 +0300 ++++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-06-24 20:45:44.399296000 +0300 +@@ -13,7 +13,6 @@ + #include <QtCore/QVersionNumber> + #include <QtCore/QDate> + #include <QtGui/QGuiApplication> +-#include <gnu/libc-version.h> + + namespace Platform { + namespace { +@@ -72,11 +71,9 @@ const auto value = result ? QString::fromLatin1(result) : QString(); const auto list = value.split(':', QString::SkipEmptyParts); -- return list.isEmpty() ? "Linux" : "Linux " + list[0]; -+ return list.isEmpty() ? "FreeBSD" : "FreeBSD " + list[0]; + +- return "Linux " ++ return "FreeBSD " + + (list.isEmpty() ? QString() : list[0] + ' ') +- + (IsWayland() ? "Wayland " : "X11 ") +- + "glibc " +- + GetGlibCVersion(); ++ + (IsWayland() ? "Wayland " : "X11 "); } QString SystemCountry() { +@@ -92,13 +89,6 @@ + } + + QDate WhenSystemBecomesOutdated() { +- if (IsLinux32Bit()) { +- return QDate(2020, 9, 1); +- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) { +- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) { +- return QDate(2020, 9, 1); // Older than Ubuntu 16.04. +- } +- } + return QDate(); + } + +@@ -120,14 +110,6 @@ + } + } + +-QString GetGlibCVersion() { +- static const auto result = [&] { +- const auto version = QString::fromLatin1(gnu_get_libc_version()); +- return QVersionNumber::fromString(version).isNull() ? QString() : version; +- }(); +- return result; +-} +- + bool IsWayland() { + return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006280546.05S5kmHZ046010>