git: 6a6a9ad85d35 - main - net-im/telegram-desktop: update to 4.9.3 release (+)

Reply: Sergey A. Osokin: "Re: git: 6a6a9ad85d35 - main - net-im/telegram-desktop: update to 4.9.3 release (+)"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Mon, 25 Sep 2023 15:09:07 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a6a9ad85d351525e0a974e5e9ae36a30b30155a

commit 6a6a9ad85d351525e0a974e5e9ae36a30b30155a
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2023-09-25 15:08:32 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2023-09-25 15:08:32 +0000

    net-im/telegram-desktop: update to 4.9.3 release (+)
    
    Telegram Desktop 4.9.3 is latest release which supports Qt 5.15.8 before migrating to Qt 5.15.10 API
    
    PR:     274043, 274064
---
 net-im/telegram-desktop/Makefile                        | 12 +++---------
 net-im/telegram-desktop/distinfo                        |  6 +++---
 ...tform_linux_base__system__media__controls__linux.cpp | 17 -----------------
 .../patch-cmake_external_glib_cppgir_CMakeLists.txt     | 13 -------------
 .../patch-cmake_external_glib_cppgir_tools_cppgir.cpp   | 13 -------------
 .../patch-cmake_external_glib_cppgir_tools_function.hpp |  8 --------
 .../patch-cmake_external_glib_cppgir_tools_genbase.cpp  |  8 --------
 .../patch-cmake_external_glib_cppgir_tools_genns.cpp    | 13 -------------
 net-im/telegram-desktop/pkg-plist                       |  1 +
 9 files changed, 7 insertions(+), 84 deletions(-)

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 03b0860b213a..2ca507a22e7b 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	telegram-desktop
-DISTVERSION=	4.8.4
-PORTREVISION=	4
+DISTVERSION=	4.9.3
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
@@ -54,7 +53,6 @@ qt6_CONFLICTS_INSTALL=	${PORTNAME}
 USES=		cmake desktop-file-utils gl gnome jpeg localbase \
 		minizip openal pkgconfig python:build ssl xorg
 
-USE_CXXSTD=	c++17
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
@@ -106,14 +104,10 @@ TELEGRAM_API_ID=	601761
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} > 1400000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079
 USES+=	llvm:build
-CC=	${_LLVM_MK_PREFIX}/bin/clang
-CPP=	${_LLVM_MK_PREFIX}/bin/clang-cpp
-CXX=	${_LLVM_MK_PREFIX}/bin/clang++
-#LD?=	${_LLVM_MK_PREFIX}/bin/ld
 .else
-USES+=	compiler:c++17-lang
+USES+=	compiler:c++20-lang
 .endif
 
 post-patch:
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index f343cf8ca583..ee9cbae15235 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687099818
-SHA256 (tdesktop-4.8.4-full.tar.gz) = 4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d
-SIZE (tdesktop-4.8.4-full.tar.gz) = 69090626
+TIMESTAMP = 1695648456
+SHA256 (tdesktop-4.9.3-full.tar.gz) = 2ef462651d397d807576f5df3a5d3de2764accf8d155a0b4d576a354a614d107
+SIZE (tdesktop-4.9.3-full.tar.gz) = 69517868
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp
deleted file mode 100644
index 0f126e486ec7..000000000000
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp.orig	2023-06-03 03:29:41 UTC
-+++ Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp
-@@ -16,11 +16,12 @@
- #include <QtGui/QImage>
- #include <ksandbox.h>
- 
--using namespace gi::repository;
--
- namespace base::Platform {
- 
- namespace {
-+
-+using namespace gi::repository;
-+namespace GObject = gi::repository::GObject;
- 
- // QString to GLib::Variant.
- inline auto Q2V(const QString &s) {
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt
deleted file mode 100644
index 41ca852809b2..000000000000
--- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/external/glib/cppgir/CMakeLists.txt.orig	2023-05-17 06:10:31 UTC
-+++ cmake/external/glib/cppgir/CMakeLists.txt
-@@ -65,8 +65,8 @@ target_compile_definitions(cppgir PRIVATE
-     -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH})
- target_compile_definitions(cppgir PRIVATE
-     -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM})
--target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES})
--set_property(TARGET cppgir PROPERTY CXX_STANDARD 14)
-+target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES})
-+set_property(TARGET cppgir PROPERTY CXX_STANDARD 17)
- 
- add_library(gi INTERFACE)
- target_include_directories(gi INTERFACE
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp
deleted file mode 100644
index 41e57cfe1ef5..000000000000
--- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/external/glib/cppgir/tools/cppgir.cpp.orig	2023-06-15 00:49:41 UTC
-+++ cmake/external/glib/cppgir/tools/cppgir.cpp
-@@ -3,8 +3,8 @@
- #include "genns.hpp"
- #include "repository.hpp"
- 
--#include <experimental/filesystem>
--namespace fs = std::experimental::filesystem;
-+#include <filesystem>
-+namespace fs = std::filesystem;
- 
- #include <boost/algorithm/string/classification.hpp>
- #include <boost/algorithm/string/split.hpp>
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp
deleted file mode 100644
index 6875de52fc6a..000000000000
--- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
---- cmake/external/glib/cppgir/tools/function.hpp.orig	2023-06-15 00:41:50 UTC
-+++ cmake/external/glib/cppgir/tools/function.hpp
-@@ -1,3 +1,5 @@
-+#include <map>
-+
- #ifndef FUNCTION_HPP
- #define FUNCTION_HPP
- 
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp
deleted file mode 100644
index ef2e474ce9ff..000000000000
--- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
---- cmake/external/glib/cppgir/tools/genbase.cpp.orig	2023-06-15 00:42:39 UTC
-+++ cmake/external/glib/cppgir/tools/genbase.cpp
-@@ -1,3 +1,5 @@
-+#include <map>
-+
- #include "genbase.hpp"
- 
- static std::string
diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp
deleted file mode 100644
index 8262affc33f2..000000000000
--- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/external/glib/cppgir/tools/genns.cpp.orig	2023-06-15 00:40:47 UTC
-+++ cmake/external/glib/cppgir/tools/genns.cpp
-@@ -5,8 +5,8 @@
- #include <boost/algorithm/string/join.hpp>
- #include <boost/format.hpp>
- 
--#include <experimental/filesystem>
--namespace fs = std::experimental::filesystem;
-+#include <filesystem>
-+namespace fs = std::filesystem;
- 
- #include <boost/property_tree/xml_parser.hpp>
- 
diff --git a/net-im/telegram-desktop/pkg-plist b/net-im/telegram-desktop/pkg-plist
index 106d6671dbba..e3e83819267c 100644
--- a/net-im/telegram-desktop/pkg-plist
+++ b/net-im/telegram-desktop/pkg-plist
@@ -1,5 +1,6 @@
 bin/telegram-desktop
 share/applications/org.telegram.desktop.desktop
+share/dbus-1/services/org.telegram.desktop.service
 share/icons/hicolor/128x128/apps/telegram.png
 share/icons/hicolor/16x16/apps/telegram.png
 share/icons/hicolor/256x256/apps/telegram.png