On Thu, Jun 23, 2022 at 03:57:17PM +0000, Klemens Nanni wrote:
> On a simple cwm(1) setup without any DE, I noticed the following
> (see net/tdesktop/Makefile r1.31):
>
> opening videos/pictures worked only once, i.e. clicking on the first
> photo after startup would show it in Qt's media viewer, another attempt
> would show nothing (video's audio would still be played)
I have no idea what changed, but this no longer happens on my exact same
setup...
The qt6 flavour works as well as the qt5 flavour for me with cwm and so
far I've had zero reports about any tdesktop issue whatsoever.
Shall we save some build time and use qt6 by default?
(Still building over night...)
Index: net/Makefile
===================================================================
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1309
diff -u -p -r1.1309 Makefile
--- net/Makefile 3 Jul 2022 14:57:12 -0000 1.1309
+++ net/Makefile 31 Jul 2022 21:58:29 -0000
@@ -696,7 +696,6 @@
SUBDIR += tcptrace
SUBDIR += tcptraceroute
SUBDIR += tdesktop
- SUBDIR += tdesktop,qt6
SUBDIR += tdlib
SUBDIR += telegram-purple
SUBDIR += telepathy
Index: net/tdesktop/Makefile
===================================================================
RCS file: /cvs/ports/net/tdesktop/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- net/tdesktop/Makefile 21 Jul 2022 14:11:16 -0000 1.35
+++ net/tdesktop/Makefile 31 Jul 2022 21:58:58 -0000
@@ -6,7 +6,7 @@ NOT_FOR_ARCHS = ${BE_ARCHS} i386
COMMENT = Telegram Desktop messenger
PORTROACH = limit:-full$$
V = 4.0.2
-REVISION = 0
+REVISION = 1
DISTNAME = tdesktop-${V}-full
PKGNAME = ${DISTNAME:-full=}
CATEGORIES = net
@@ -23,7 +23,9 @@ MAINTAINER = Andrew Krasavin <noiseless
# rlottie: LGPL 2.1 with freetype, LGPL, MIT, BSD dependencies
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} absl_strings avcodec avformat avutil c crypto
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Core5Compat Qt6Gui Qt6Network
Qt6OpenGL
+WANTLIB += Qt6OpenGLWidgets Qt6Svg Qt6Widgets
+WANTLIB += absl_strings avcodec avformat avutil c crypto
WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 hunspell-1.7 jpeg
WANTLIB += lz4 m openal qrcodegencpp rnnoise sigc-2.0 swresample swscale tg_owt
WANTLIB += xcb xcb-keysyms xcb-record xcb-screensaver xxhash z
@@ -87,40 +89,10 @@ CFLAGS += -DIOAPI_NO_64
# unported and required
NEEDED_BUNDLES += rlottie tgcalls
-
-FLAVORS = qt6
-FLAVOR ?= # empty/qt5
-.if ${FLAVOR:Mqt6}
-# avoid conflict with unflavored package to allow installing both
-FULLPKGNAME = tdesktop${FLAVOR_EXT}-${V}
-WANTLIB += Qt6Core Qt6Core5Compat Qt6Gui Qt6Network Qt6OpenGL Qt6OpenGLWidgets
-WANTLIB += Qt6Svg Qt6Widgets
-
MODULES += x11/qt6
LIB_DEPENDS += x11/qt6/qt5compat \
x11/qt6/qtsvg
RUN_DEPENDS += x11/qt6/qtimageformats
-
-post-install:
- mv ${PREFIX}/bin/telegram-desktop{,${FLAVOR_EXT}}
- mv ${PREFIX}/share/applications/telegramdesktop{,${FLAVOR_EXT}}.desktop
- sed -i \
- -e /Name=/s,$$,' (${FLAVOR_EXT})', \
- -e /Exec=/s,desktop,\&${FLAVOR_EXT}, \
- -e /Icon=/s,$$,${FLAVOR_EXT}, \
- ${PREFIX}/share/applications/telegramdesktop${FLAVOR_EXT}.desktop
- find ${PREFIX} -type f -name telegram.png -execdir \
- mv {} telegram${FLAVOR_EXT}.png \;
- mv ${PREFIX}/share/metainfo/telegramdesktop{,${FLAVOR_EXT}}.metainfo.xml
-.else
-WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5Widgets
-
-MODULES += x11/qt5
-LIB_DEPENDS += x11/qt5/qtsvg
-RUN_DEPENDS += x11/qt5/qtimageformats
-CONFIGURE_ARGS += -DDESKTOP_APP_QT6=OFF
-.endif
-
post-extract:
# All bundles:
Index: net/tdesktop/pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/tdesktop/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- net/tdesktop/pkg/DESCR 3 Jul 2022 14:57:12 -0000 1.2
+++ net/tdesktop/pkg/DESCR 31 Jul 2022 21:56:57 -0000
@@ -1,6 +1,2 @@
Telegram Desktop is the official desktop client for the Telegram messenger,
based on the Telegram API and the MTProto secure protocol.
-
-Available flavors:
-
- qt6: Built against Qt 6 (default upstream) instead of Qt 5
Index: net/tdesktop/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/tdesktop/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- net/tdesktop/pkg/PLIST 3 Jul 2022 14:57:12 -0000 1.3
+++ net/tdesktop/pkg/PLIST 31 Jul 2022 21:54:11 -0000
@@ -1,13 +1,14 @@
-@bin bin/telegram-desktop${FLAVOR_EXT}
-share/applications/telegramdesktop${FLAVOR_EXT}.desktop
-share/icons/hicolor/128x128/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/16x16/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/256x256/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/32x32/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/48x48/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/512x512/apps/telegram${FLAVOR_EXT}.png
-share/icons/hicolor/64x64/apps/telegram${FLAVOR_EXT}.png
+@pkgpath net/tdesktop,qt6
+@bin bin/telegram-desktop
+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/
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
-share/metainfo/telegramdesktop${FLAVOR_EXT}.metainfo.xml
+share/metainfo/telegramdesktop.metainfo.xml
