Attachment #233538 for bug #263611

View | Details | Raw Unified | Return to bug 263611
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/net-im/telegram-desktop/Makefile (-3 / +3 lines)
1	PORTNAME= telegram-desktop	1	PORTNAME= telegram-desktop
2	DISTVERSION= 3.6.1	2	DISTVERSION= 3.7.3
3	CATEGORIES= net-im	3	CATEGORIES= net-im
4	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
5	DISTNAME= tdesktop-${DISTVERSION}-full	5	DISTNAME= tdesktop-${DISTVERSION}-full
Lines 92-99 TELEGRAM_API_ID= 601761 Link Here
92		92
93	.include <bsd.port.pre.mk>	93	.include <bsd.port.pre.mk>
94		94
95	.if ${COMPILER_VERSION} < 120	95	.if ${COMPILER_VERSION} < 130
96	LLVM_VER= 12	96	LLVM_VER= 13
97	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}	97	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
98	CC= ${LOCALBASE}/bin/clang${LLVM_VER}	98	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
99	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}	99	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}

Lines 1-3 Link Here

(-)b/net-im/telegram-desktop/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1647535499	1	TIMESTAMP = 1650978211
2	SHA256 (tdesktop-3.6.1-full.tar.gz) = 1e87df0970b135d566f5af4bc6c2695fc98ba387dc1137100a478f02d48c12e8	2	SHA256 (tdesktop-3.7.3-full.tar.gz) = 9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e
3	SIZE (tdesktop-3.6.1-full.tar.gz) = 41226549	3	SIZE (tdesktop-3.7.3-full.tar.gz) = 41365751

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__overlay__widget.cpp (+11 lines)
1	--- Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp.orig 2022-04-20 09:56:09 UTC
2	+++ Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
3	@@ -499,7 +499,7 @@ void OverlayWidget::moveToScreen(bool inMove) {
4	DEBUG_LOG(("Viewer Pos: Currently on screen %1, moving to screen %2")
5	.arg(screenList.indexOf(myScreen))
6	.arg(screenList.indexOf(activeWindowScreen)));
7	- _widget->setScreen(activeWindowScreen);
8	+ window()->setScreen(activeWindowScreen);
9	DEBUG_LOG(("Viewer Pos: New actual screen: %1")
10	.arg(screenList.indexOf(_widget->screen())));
11	}

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__pip.cpp (+11 lines)
1	--- Telegram/SourceFiles/media/view/media_view_pip.cpp.orig 2022-04-20 09:56:09 UTC
2	+++ Telegram/SourceFiles/media/view/media_view_pip.cpp
3	@@ -475,7 +475,7 @@ void PipPanel::setPositionDefault() {
4	const auto parentScreen = widgetScreen(_parent);
5	const auto myScreen = widgetScreen(widget());
6	if (parentScreen && myScreen && myScreen != parentScreen) {
7	- widget()->setScreen(parentScreen);
8	+ widget()->windowHandle()->setScreen(parentScreen);
9	}
10	auto position = Position();
11	position.snapped = RectPart::Top \| RectPart::Left;




--- Telegram/ThirdParty/hunspell/tests/suggestiontest/Makefile.orig	2020-03-16 13:55:43 UTC
+++ Telegram/ThirdParty/hunspell/tests/suggestiontest/Makefile
@@ -1,11 +0,0 @@
-all:
-	./prepare
-	./test
-
-single:
-	./prepare2
-	./test
-
-clean:
-	rm *.[1-5] result.*
-




--- Telegram/lib_ui/CMakeLists.txt.orig	2022-04-20 07:41:10 UTC
+++ Telegram/lib_ui/CMakeLists.txt
@@ -4,6 +4,13 @@
 # For license and copyright information please follow this link:
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
+if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION AND NOT DESKTOP_APP_QT6)
+    find_package(ECM REQUIRED)
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+    find_package(QtWaylandScanner REQUIRED)
+    find_package(WaylandProtocols)
+endif()
+
 add_library(lib_ui STATIC)
 add_library(desktop-app::lib_ui ALIAS lib_ui)
 init_target(lib_ui)
@@ -20,6 +27,12 @@ set(style_files
     ui/widgets/widgets.style
 )
 
+if (WaylandProtocols_FOUND)
+    set(wayland_protocols_loc ${WaylandProtocols_DATADIR})
+else()
+    set(wayland_protocols_loc ${third_party_loc}/wayland-protocols)
+endif()
+
 generate_palette(lib_ui ui/colors.palette)
 generate_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette)
 generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
@@ -273,10 +286,16 @@ elseif(LINUX)
     if (DESKTOP_APP_QT6)
         qt6_generate_wayland_protocol_client_sources(lib_ui
         FILES
-            ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
+            ${wayland_protocols_loc}/stable/xdg-shell/xdg-shell.xml
         )
     else()
-        message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
+        ecm_add_qtwayland_client_protocol(xdg_shell_protocol_srcs
+            PROTOCOL ${wayland_protocols_loc}/stable/xdg-shell/xdg-shell.xml
+            BASENAME xdg-shell
+        )
+
+        target_sources(lib_ui PRIVATE ${xdg_shell_protocol_srcs})
+        target_include_directories(lib_ui PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
     endif()
 
     target_link_libraries(lib_ui




--- Telegram/lib_ui/ui/rp_widget.cpp.orig	2022-04-20 07:41:10 UTC
+++ Telegram/lib_ui/ui/rp_widget.cpp
@@ -11,6 +11,8 @@
 #include <QtGui/QWindow>
 #include <QtGui/QtEvents>
 
+#include <private/qwidget_p.h>
+
 namespace Ui {
 namespace {
 
@@ -207,3 +209,12 @@ auto RpWidgetWrap::eventStreams() const -> EventStream
 }
 
 } // namespace Ui
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+
+bool TWidget::setScreen(QScreen *next) {
+	// This method becomes public in Qt6. So anyway reveal it right here.
+	return qt_widget_private(this)->setScreen(next);
+}
+
+#endif  // Qt < 6.0.0




--- Telegram/lib_ui/ui/rp_widget.h.orig	2022-04-20 07:41:10 UTC
+++ Telegram/lib_ui/ui/rp_widget.h
@@ -206,6 +206,10 @@ class TWidget : public TWidgetHelper<QWidget> { (publi
 		return rectNoMargins().size();
 	}
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+	bool setScreen(QScreen*);
+#endif  // Qt < 6.0.0
+
 	// Updates the area that is visible inside the scroll container.
 	void setVisibleTopBottom(int visibleTop, int visibleBottom) {
 		auto max = height();




# Created by: Henry Hu <henry.hu.sh@gmail.com>

PORTNAME=	tg_owt
PORTVERSION=	0.0.20220425
CATEGORIES=	net-im

MAINTAINER=	glebius@FreeBSD.org

BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat \
		yasm:devel/yasm
LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
		libepoxy.so:graphics/libepoxy \
		libevent.so:devel/libevent \
		libjpeg.so:graphics/jpeg-turbo \
		libopus.so:audio/opus \

USE_GL=		gbm
USE_GITHUB=	yes
GH_ACCOUNT=	desktop-app
GH_TAGNAME=	c1aea3d

# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
# when updating port check if hash tag in the submodule was updated

Lines 1-5 Link Here

(-)b/net-im/tg_owt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1647273787	1	TIMESTAMP = 1650920381
2	SHA256 (desktop-app-tg_owt-0.0.20220225-a264028_GH0.tar.gz) = 48a688423a3580b5bdbee8bdba026365034c36f6e59634aab41861cca2828609	2	SHA256 (desktop-app-tg_owt-0.0.20220425-c1aea3d_GH0.tar.gz) = b3aba858d9948178f393d132121e7d18e454c7301ede4d8d4e1f7b9e4fe86a83
3	SIZE (desktop-app-tg_owt-0.0.20220225-a264028_GH0.tar.gz) = 16495007	3	SIZE (desktop-app-tg_owt-0.0.20220425-c1aea3d_GH0.tar.gz) = 16493191
4	SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e	4	SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e
5	SIZE (HenryHu-libyuv-ad89006_GH0.tar.gz) = 475161	5	SIZE (HenryHu-libyuv-ad89006_GH0.tar.gz) = 475161

Lines 3006-3012 lib/libtg_owt.a Link Here

(-)b/net-im/tg_owt/pkg-plist (-1 lines)
3006	@dir include/tg_owt/third_party/openh264/src/test/processing	3006	@dir include/tg_owt/third_party/openh264/src/test/processing
3007	@dir include/tg_owt/third_party/openh264/src/testbin	3007	@dir include/tg_owt/third_party/openh264/src/testbin
3008	@dir include/tg_owt/third_party/pffft/patches	3008	@dir include/tg_owt/third_party/pffft/patches
3009	@dir include/tg_owt/third_party/pipewire
3010	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT	3009	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT
3011	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_FRAGMENT	3010	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_FRAGMENT
3012	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_LISTEN	3011	@dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_LISTEN

Return to bug 263611

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_hunspell_tests_suggestiontest_Makefile (+14 lines)
1	--- Telegram/ThirdParty/hunspell/tests/suggestiontest/Makefile.orig 2020-03-16 13:55:43 UTC
2	+++ Telegram/ThirdParty/hunspell/tests/suggestiontest/Makefile
3	@@ -1,11 +0,0 @@
4	-all:
5	- ./prepare
6	- ./test
7	-
8	-single:
9	- ./prepare2
10	- ./test
11	-
12	-clean:
13	- rm .[1-5] result.
14	-

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_CMakeLists.txt (+48 lines)
1	--- Telegram/lib_ui/CMakeLists.txt.orig 2022-04-20 07:41:10 UTC
2	+++ Telegram/lib_ui/CMakeLists.txt
3	@@ -4,6 +4,13 @@
4	# For license and copyright information please follow this link:
5	# https://github.com/desktop-app/legal/blob/master/LEGAL
6
7	+if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION AND NOT DESKTOP_APP_QT6)
8	+ find_package(ECM REQUIRED)
9	+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
10	+ find_package(QtWaylandScanner REQUIRED)
11	+ find_package(WaylandProtocols)
12	+endif()
13	+
14	add_library(lib_ui STATIC)
15	add_library(desktop-app::lib_ui ALIAS lib_ui)
16	init_target(lib_ui)
17	@@ -20,6 +27,12 @@ set(style_files
18	ui/widgets/widgets.style
19	)
20
21	+if (WaylandProtocols_FOUND)
22	+ set(wayland_protocols_loc ${WaylandProtocols_DATADIR})
23	+else()
24	+ set(wayland_protocols_loc ${third_party_loc}/wayland-protocols)
25	+endif()
26	+
27	generate_palette(lib_ui ui/colors.palette)
28	generate_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette)
29	generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
30	@@ -273,10 +286,16 @@ elseif(LINUX)
31	if (DESKTOP_APP_QT6)
32	qt6_generate_wayland_protocol_client_sources(lib_ui
33	FILES
34	- ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
35	+ ${wayland_protocols_loc}/stable/xdg-shell/xdg-shell.xml
36	)
37	else()
38	- message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
39	+ ecm_add_qtwayland_client_protocol(xdg_shell_protocol_srcs
40	+ PROTOCOL ${wayland_protocols_loc}/stable/xdg-shell/xdg-shell.xml
41	+ BASENAME xdg-shell
42	+ )
43	+
44	+ target_sources(lib_ui PRIVATE ${xdg_shell_protocol_srcs})
45	+ target_include_directories(lib_ui PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
46	endif()
47
48	target_link_libraries(lib_ui

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.cpp (+24 lines)
1	--- Telegram/lib_ui/ui/rp_widget.cpp.orig 2022-04-20 07:41:10 UTC
2	+++ Telegram/lib_ui/ui/rp_widget.cpp
3	@@ -11,6 +11,8 @@
4	#include <QtGui/QWindow>
5	#include <QtGui/QtEvents>
6
7	+#include <private/qwidget_p.h>
8	+
9	namespace Ui {
10	namespace {
11
12	@@ -207,3 +209,12 @@ auto RpWidgetWrap::eventStreams() const -> EventStream
13	}
14
15	} // namespace Ui
16	+
17	+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
18	+
19	+bool TWidget::setScreen(QScreen *next) {
20	+ // This method becomes public in Qt6. So anyway reveal it right here.
21	+ return qt_widget_private(this)->setScreen(next);
22	+}
23	+
24	+#endif // Qt < 6.0.0

Added Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.h (+13 lines)
1	--- Telegram/lib_ui/ui/rp_widget.h.orig 2022-04-20 07:41:10 UTC
2	+++ Telegram/lib_ui/ui/rp_widget.h
3	@@ -206,6 +206,10 @@ class TWidget : public TWidgetHelper<QWidget> { (publi
4	return rectNoMargins().size();
5	}
6
7	+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
8	+ bool setScreen(QScreen*);
9	+#endif // Qt < 6.0.0
10	+
11	// Updates the area that is visible inside the scroll container.
12	void setVisibleTopBottom(int visibleTop, int visibleBottom) {
13	auto max = height();

Lines 1-7 Link Here

(-)b/net-im/tg_owt/Makefile (-3 / +2 lines)
1	# Created by: Henry Hu <henry.hu.sh@gmail.com>	1	# Created by: Henry Hu <henry.hu.sh@gmail.com>
2		2
3	PORTNAME= tg_owt	3	PORTNAME= tg_owt
4	PORTVERSION= 0.0.20220225	4	PORTVERSION= 0.0.20220425
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6		6
7	MAINTAINER= glebius@FreeBSD.org	7	MAINTAINER= glebius@FreeBSD.org
Lines 13-19 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
13	BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat \	13	BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat \
14	yasm:devel/yasm	14	yasm:devel/yasm
15	LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \	15	LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
16	libepoxy.so:graphics/libepoxy \
17	libevent.so:devel/libevent \	16	libevent.so:devel/libevent \
18	libjpeg.so:graphics/jpeg-turbo \	17	libjpeg.so:graphics/jpeg-turbo \
19	libopus.so:audio/opus \	18	libopus.so:audio/opus \
Lines 25-31 USE_XORG= x11 xcomposite xdamage xrender xrandr xtst Link Here
25	USE_GL= gbm	24	USE_GL= gbm
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= desktop-app	26	GH_ACCOUNT= desktop-app
28	GH_TAGNAME= a264028	27	GH_TAGNAME= c1aea3d
29		28
30	# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv	29	# libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
31	# when updating port check if hash tag in the submodule was updated	30	# when updating port check if hash tag in the submodule was updated