Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Sep 2022 21:11:16 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5d4db9ef3bae - main - net-im/t*: update Telegram Desktop: 4.1.1 -> 4.2.0
Message-ID:  <202209182111.28ILBGXX070174@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5d4db9ef3bae8883887b3f81169d076327ddc301

commit 5d4db9ef3bae8883887b3f81169d076327ddc301
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-09-18 20:42:02 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-09-18 21:11:11 +0000

    net-im/t*: update Telegram Desktop: 4.1.1 -> 4.2.0
    
    Remove experimental support for QT6.    (*)
    
    Changelog:      https://github.com/telegramdesktop/tdesktop/compare/v4.1.1...v4.2.0
    
    Discussed with: fluffy  (*)
    
    (cherry picked from commit f0fa5987b7a844886421f6c642b5a82731c4f7b6)
---
 net-im/telegram-desktop/Makefile | 24 +++++-------------------
 net-im/telegram-desktop/distinfo |  6 +++---
 net-im/tg_owt/Makefile           |  5 ++---
 net-im/tg_owt/distinfo           |  6 +++---
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index cb67a778ec67..9d82e47eb4cf 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	telegram-desktop
-DISTVERSION=	4.1.1
-PORTREVISION=	2
+DISTVERSION=	4.2.0
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
@@ -42,29 +41,16 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libxxhash.so:devel/xxhash \
 		libvpx.so:multimedia/libvpx
 
-FLAVORS=	qt5 qt6
-FLAVOR?=	${FLAVORS:[1]}
-qt5_PKGNAMESUFFIX=
-qt6_PKGNAMESUFFIX=	-qt6
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
-qt6_CONFLICTS_INSTALL=	${PORTNAME}
-
 USES=		cmake compiler:c++17-lang desktop-file-utils gl \
-		gnome pkgconfig python:3.7+,build ssl xorg
+		gnome kde:5 pkgconfig python:3.7+,build qt:5 ssl xorg
+USE_KDE=	coreaddons
+USE_QT=		buildtools:build core dbus gui imageformats network qmake:build \
+		svg wayland widgets
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
 
-.if ${FLAVOR} == qt5
-USES+=		qt:5
-USE_QT=		buildtools:build core dbus gui imageformats network qmake:build \
-		svg wayland widgets
-.else
-USES+=		qt:6
-USE_QT=		5compat base imageformats svg wayland
-.endif
-
 USE_GL=		gl
 USE_GNOME=	glib20 glibmm
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index 4590ea6bceba..f6286c2d5177 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660743688
-SHA256 (tdesktop-4.1.1-full.tar.gz) = 5574cb8ebfa4983157d347883e7ef3bd85a8d71f972b8458d41fab0d7f733f56
-SIZE (tdesktop-4.1.1-full.tar.gz) = 41431505
+TIMESTAMP = 1663428409
+SHA256 (tdesktop-4.2.0-full.tar.gz) = d3c78c6daa5b4e336d55dd1dd2dc0003e34dad501e6d212719b51ea8cad71dde
+SIZE (tdesktop-4.2.0-full.tar.gz) = 41513036
diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile
index 1dbd14183be9..862f71d2a413 100644
--- a/net-im/tg_owt/Makefile
+++ b/net-im/tg_owt/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	tg_owt
-PORTVERSION=	0.0.20220811
-PORTREVISION=	1
+PORTVERSION=	0.0.20220914
 CATEGORIES=	net-im
 
 MAINTAINER=	osa@FreeBSD.org
@@ -23,7 +22,7 @@ USE_XORG=	x11 xcomposite xdamage xrender xrandr xtst
 USE_GL=		gbm
 USE_GITHUB=	yes
 GH_ACCOUNT=	desktop-app
-GH_TAGNAME=	a5fbc91
+GH_TAGNAME=	621f3da
 
 # libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
 # when updating port check if hash tag in the submodule was updated
diff --git a/net-im/tg_owt/distinfo b/net-im/tg_owt/distinfo
index e62b650a70ad..7ad7cc05fcbe 100644
--- a/net-im/tg_owt/distinfo
+++ b/net-im/tg_owt/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1660390269
-SHA256 (desktop-app-tg_owt-0.0.20220811-a5fbc91_GH0.tar.gz) = 50e244dc180cfa958de308667c6aaefecfce36c82f5e8f95c3ef2bdad1041a10
-SIZE (desktop-app-tg_owt-0.0.20220811-a5fbc91_GH0.tar.gz) = 15797823
+TIMESTAMP = 1663428929
+SHA256 (desktop-app-tg_owt-0.0.20220914-621f3da_GH0.tar.gz) = ce345a58b802ef0e0e23c95321164aa1751fb494f6c0a6042ef06be75636db96
+SIZE (desktop-app-tg_owt-0.0.20220914-621f3da_GH0.tar.gz) = 15797366
 SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e
 SIZE (HenryHu-libyuv-ad89006_GH0.tar.gz) = 475161
 SHA256 (google-crc32c-21fc8ef_GH0.tar.gz) = 9cb6093f9a554f9fb8397ce9a1a07eec44f1ae0918d7816b60c7b14ef745e082



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209182111.28ILBGXX070174>