svn commit: r564939 - in head/net-im/telegram-desktop: . files
Li-Wen Hsu
lwhsu at FreeBSD.org
Thu Feb 11 12:32:33 UTC 2021
Author: lwhsu
Date: Thu Feb 11 12:32:32 2021
New Revision: 564939
URL: https://svnweb.freebsd.org/changeset/ports/564939
Log:
net-im/telegram-desktop: update to 2.5.8
PR: 253336
Submitted by: Henry Hu <henry.hu.sh at gmail.com> (maintainer)
Added:
head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp (contents, props changed)
Deleted:
head/net-im/telegram-desktop/files/patch-cmake_external_webrtc_CMakeLists.txt
head/net-im/telegram-desktop/files/patch-tg__owt_CMakeLists.txt
head/net-im/telegram-desktop/files/patch-tg__owt_cmake_libevent.cmake
head/net-im/telegram-desktop/files/patch-tg__owt_src_media_sctp_sctp__transport.cc
head/net-im/telegram-desktop/files/patch-tg__owt_src_rtc__base_byte__order.h
head/net-im/telegram-desktop/files/patch-tg__owt_src_rtc__base_ip__address.cc
head/net-im/telegram-desktop/files/patch-tg__owt_src_rtc__base_physical__socket__server.cc
head/net-im/telegram-desktop/files/patch-tg__owt_src_rtc__base_physical__socket__server.h
head/net-im/telegram-desktop/files/patch-tg__owt_src_rtc__base_platform__thread__types.cc
Modified:
head/net-im/telegram-desktop/Makefile
head/net-im/telegram-desktop/distinfo
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 Thu Feb 11 12:31:45 2021 (r564938)
+++ head/net-im/telegram-desktop/Makefile Thu Feb 11 12:32:32 2021 (r564939)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= telegram-desktop
-DISTVERSION= 2.4.4
-PORTREVISION= 2
+DISTVERSION= 2.5.8
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
@@ -25,7 +24,8 @@ BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \
range-v3>0:devel/range-v3 \
tl-expected>0:devel/tl-expected \
v4l_compat>0:multimedia/v4l_compat \
- yasm:devel/yasm
+ yasm:devel/yasm \
+ ${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt
LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libdbus-1.so:devel/dbus \
libdbusmenu-qt5.so:devel/libdbusmenu-qt \
@@ -50,7 +50,6 @@ NO_CCACHE= yes
USE_GITHUB= nodefault
GH_ACCOUNT= telegramdesktop
GH_PROJECT= tdesktop
-GH_TUPLE= desktop-app:tg_owt:c73a471:tg_owt/tg_owt
USE_GNOME= glib20
USE_QT= core dbus gui imageformats network widgets buildtools_build \
qmake_build wayland
@@ -58,14 +57,14 @@ USE_XORG= x11 xcb
USE_GL= gl
CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
- TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
+ TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION \
+ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \
DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP \
DESKTOP_APP_USE_PACKAGED_FONTS
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 \
- -DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src
+ -Ddisable_autoupdate=1
# Disable DCHECKs, otherwise video calls will crash.
CXXFLAGS+= -DNDEBUG
@@ -98,15 +97,4 @@ INSTALLS_ICONS= yes
USE_GNOME+= gtk30
.endif
-.include <bsd.port.pre.mk>
-
-pre-configure:
- @cd ${WRKSRC}/tg_owt && \
- ${MKDIR} out/${CMAKE_BUILD_TYPE} && \
- cd out/${CMAKE_BUILD_TYPE} && \
- ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/tg_owt
-
-pre-build:
- @cd ${WRKSRC}/tg_owt/out/${CMAKE_BUILD_TYPE} && ${DO_MAKE_BUILD}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/net-im/telegram-desktop/distinfo
==============================================================================
--- head/net-im/telegram-desktop/distinfo Thu Feb 11 12:31:45 2021 (r564938)
+++ head/net-im/telegram-desktop/distinfo Thu Feb 11 12:32:32 2021 (r564939)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1603766669
-SHA256 (tdesktop-2.4.4-full.tar.gz) = 88799708daedaf5c132752259945b4e1b5dcbb62385661e2cca7b8e5d58c9026
-SIZE (tdesktop-2.4.4-full.tar.gz) = 36220573
-SHA256 (desktop-app-tg_owt-c73a471_GH0.tar.gz) = d1886a3ba6966fef257f63a3dd39f53d01ff8db0177fcd6de1b64916cd4076e1
-SIZE (desktop-app-tg_owt-c73a471_GH0.tar.gz) = 18383113
+TIMESTAMP = 1612728578
+SHA256 (tdesktop-2.5.8-full.tar.gz) = 9c89cb31f8ba8a26821fe3c2769b04162e8d7629d327f9cd25a892e88878417e
+SIZE (tdesktop-2.5.8-full.tar.gz) = 36685925
Added: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp Thu Feb 11 12:32:32 2021 (r564939)
@@ -0,0 +1,11 @@
+--- Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp.orig 2021-01-28 15:30:24 UTC
++++ Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
+@@ -114,7 +114,7 @@ bool ShowInFolder(const QString &filepath) {
+ }
+
+ if (g_app_info_launch_default_for_uri(
+- g_filename_to_uri(absoluteDirPath.toUtf8(), nullptr, nullptr),
++ g_filename_to_uri(absoluteDirPath.toUtf8().constData(), nullptr, nullptr),
+ nullptr,
+ nullptr)) {
+ return true;
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 Thu Feb 11 12:31:45 2021 (r564938)
+++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp Thu Feb 11 12:32:32 2021 (r564939)
@@ -1,50 +1,41 @@
---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2020-10-20 16:29:09 UTC
+--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2021-01-28 15:30:24 UTC
+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-@@ -11,7 +11,6 @@
- #include <QtCore/QVersionNumber>
+@@ -14,11 +14,6 @@
#include <QtCore/QDate>
#include <QtGui/QGuiApplication>
--#include <gnu/libc-version.h>
+-// this file is used on both Linux & BSD
+-#ifdef Q_OS_LINUX
+-#include <gnu/libc-version.h>
+-#endif // Q_OS_LINUX
+-
namespace Platform {
+ namespace {
-@@ -32,11 +31,9 @@ QString SystemVersionPretty() {
- const auto value = result ? QString::fromLatin1(result) : QString();
- const auto list = value.split(':', QString::SkipEmptyParts);
+@@ -103,7 +98,7 @@ QString SystemVersionPretty() {
+ static const auto result = [&] {
+ QStringList resultList{};
-- return "Linux "
-+ return "FreeBSD "
- + (list.isEmpty() ? QString() : list[0] + ' ')
-- + (IsWayland() ? "Wayland " : "X11 ")
-- + "glibc "
-- + GetGlibCVersion();
-+ + (IsWayland() ? "Wayland " : "X11 ");
+-#ifdef Q_OS_LINUX
++#if 0
+ resultList << "Linux";
+ #else // Q_OS_LINUX
+ resultList << QSysInfo::kernelType();
+@@ -186,7 +181,7 @@ QString AutoUpdateKey() {
}
- QString SystemCountry() {
-@@ -54,10 +51,6 @@ QString SystemLanguage() {
- 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();
+ QString GetLibcName() {
+-#ifdef Q_OS_LINUX
++#if 0
+ return "glibc";
+ #endif // Q_OS_LINUX
+
+@@ -194,7 +189,7 @@ QString GetLibcName() {
}
-@@ -78,14 +71,6 @@ QString AutoUpdateKey() {
- } else {
- Unexpected("Platform in AutoUpdateKey.");
- }
--}
--
--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() {
+ QString GetLibcVersion() {
+-#ifdef Q_OS_LINUX
++#if 0
+ static const auto result = [&] {
+ const auto version = QString::fromLatin1(gnu_get_libc_version());
+ return QVersionNumber::fromString(version).isNull() ? QString() : version;
More information about the svn-ports-head
mailing list