FreeBSD Bugzilla – Attachment 233538 Details for
Bug 263611
net-im/telegram-desktop: update from 3.6.1 to 3.7.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
[PATCH] net-im/telegram-desktop: update from 3.6.1 to 3.7.3
telegram-desktop.diff (text/plain), 9.91 KB, created by
Sergey A. Osokin
on 2022-04-27 16:46:09 UTC
(
hide
)
Description:
[PATCH] net-im/telegram-desktop: update from 3.6.1 to 3.7.3
Filename:
MIME Type:
Creator:
Sergey A. Osokin
Created:
2022-04-27 16:46:09 UTC
Size:
9.91 KB
patch
obsolete
>diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile >index b2767d980381..ef7de2afa72e 100644 >--- a/net-im/telegram-desktop/Makefile >+++ b/net-im/telegram-desktop/Makefile >@@ -1,5 +1,5 @@ > PORTNAME= telegram-desktop >-DISTVERSION= 3.6.1 >+DISTVERSION= 3.7.3 > CATEGORIES= net-im > MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ > DISTNAME= tdesktop-${DISTVERSION}-full >@@ -92,8 +92,8 @@ TELEGRAM_API_ID= 601761 > > .include <bsd.port.pre.mk> > >-.if ${COMPILER_VERSION} < 120 >-LLVM_VER= 12 >+.if ${COMPILER_VERSION} < 130 >+LLVM_VER= 13 > BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} > CC= ${LOCALBASE}/bin/clang${LLVM_VER} > CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} >diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo >index 913b87189c04..8f70236ba961 100644 >--- a/net-im/telegram-desktop/distinfo >+++ b/net-im/telegram-desktop/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1647535499 >-SHA256 (tdesktop-3.6.1-full.tar.gz) = 1e87df0970b135d566f5af4bc6c2695fc98ba387dc1137100a478f02d48c12e8 >-SIZE (tdesktop-3.6.1-full.tar.gz) = 41226549 >+TIMESTAMP = 1650978211 >+SHA256 (tdesktop-3.7.3-full.tar.gz) = 9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e >+SIZE (tdesktop-3.7.3-full.tar.gz) = 41365751 >diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__overlay__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__overlay__widget.cpp >new file mode 100644 >index 000000000000..3ad29281ce5d >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__overlay__widget.cpp >@@ -0,0 +1,11 @@ >+--- Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp.orig 2022-04-20 09:56:09 UTC >++++ Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp >+@@ -499,7 +499,7 @@ void OverlayWidget::moveToScreen(bool inMove) { >+ DEBUG_LOG(("Viewer Pos: Currently on screen %1, moving to screen %2") >+ .arg(screenList.indexOf(myScreen)) >+ .arg(screenList.indexOf(activeWindowScreen))); >+- _widget->setScreen(activeWindowScreen); >++ window()->setScreen(activeWindowScreen); >+ DEBUG_LOG(("Viewer Pos: New actual screen: %1") >+ .arg(screenList.indexOf(_widget->screen()))); >+ } >diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__pip.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__pip.cpp >new file mode 100644 >index 000000000000..509b4addb73c >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_media_view_media__view__pip.cpp >@@ -0,0 +1,11 @@ >+--- Telegram/SourceFiles/media/view/media_view_pip.cpp.orig 2022-04-20 09:56:09 UTC >++++ Telegram/SourceFiles/media/view/media_view_pip.cpp >+@@ -475,7 +475,7 @@ void PipPanel::setPositionDefault() { >+ const auto parentScreen = widgetScreen(_parent); >+ const auto myScreen = widgetScreen(widget()); >+ if (parentScreen && myScreen && myScreen != parentScreen) { >+- widget()->setScreen(parentScreen); >++ widget()->windowHandle()->setScreen(parentScreen); >+ } >+ auto position = Position(); >+ position.snapped = RectPart::Top | RectPart::Left; >diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_hunspell_tests_suggestiontest_Makefile b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_hunspell_tests_suggestiontest_Makefile >new file mode 100644 >index 000000000000..b43f7ce18f54 >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_hunspell_tests_suggestiontest_Makefile >@@ -0,0 +1,14 @@ >+--- 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.* >+- >diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__ui_CMakeLists.txt b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_CMakeLists.txt >new file mode 100644 >index 000000000000..5f9b7cc0b66d >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_CMakeLists.txt >@@ -0,0 +1,48 @@ >+--- 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 >diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.cpp >new file mode 100644 >index 000000000000..581641a6706d >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.cpp >@@ -0,0 +1,24 @@ >+--- 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 >diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.h b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.h >new file mode 100644 >index 000000000000..63c0f4eeeb0e >--- /dev/null >+++ b/net-im/telegram-desktop/files/patch-Telegram_lib__ui_ui_rp__widget.h >@@ -0,0 +1,13 @@ >+--- 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(); >diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile >index 867efa84aa16..9278915c39ca 100644 >--- a/net-im/tg_owt/Makefile >+++ b/net-im/tg_owt/Makefile >@@ -1,7 +1,7 @@ > # Created by: Henry Hu <henry.hu.sh@gmail.com> > > PORTNAME= tg_owt >-PORTVERSION= 0.0.20220225 >+PORTVERSION= 0.0.20220425 > CATEGORIES= net-im > > MAINTAINER= glebius@FreeBSD.org >@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > 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 \ >@@ -25,7 +24,7 @@ USE_XORG= x11 xcomposite xdamage xrender xrandr xtst > USE_GL= gbm > USE_GITHUB= yes > GH_ACCOUNT= desktop-app >-GH_TAGNAME= a264028 >+GH_TAGNAME= c1aea3d > > # 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 92cd46027a7e..f9e16ee33380 100644 >--- a/net-im/tg_owt/distinfo >+++ b/net-im/tg_owt/distinfo >@@ -1,5 +1,5 @@ >-TIMESTAMP = 1647273787 >-SHA256 (desktop-app-tg_owt-0.0.20220225-a264028_GH0.tar.gz) = 48a688423a3580b5bdbee8bdba026365034c36f6e59634aab41861cca2828609 >-SIZE (desktop-app-tg_owt-0.0.20220225-a264028_GH0.tar.gz) = 16495007 >+TIMESTAMP = 1650920381 >+SHA256 (desktop-app-tg_owt-0.0.20220425-c1aea3d_GH0.tar.gz) = b3aba858d9948178f393d132121e7d18e454c7301ede4d8d4e1f7b9e4fe86a83 >+SIZE (desktop-app-tg_owt-0.0.20220425-c1aea3d_GH0.tar.gz) = 16493191 > SHA256 (HenryHu-libyuv-ad89006_GH0.tar.gz) = 96fc87a2c7051d289a9dcf31c4f8100e341dda3b5499e4bf6d82369f5d18416e > SIZE (HenryHu-libyuv-ad89006_GH0.tar.gz) = 475161 >diff --git a/net-im/tg_owt/pkg-plist b/net-im/tg_owt/pkg-plist >index b701c2b01374..e8a8fdb3f42d 100644 >--- a/net-im/tg_owt/pkg-plist >+++ b/net-im/tg_owt/pkg-plist >@@ -3006,7 +3006,6 @@ lib/libtg_owt.a > @dir include/tg_owt/third_party/openh264/src/test/processing > @dir include/tg_owt/third_party/openh264/src/testbin > @dir include/tg_owt/third_party/pffft/patches >-@dir include/tg_owt/third_party/pipewire > @dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_CONNECT > @dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_FRAGMENT > @dir include/tg_owt/third_party/usrsctp/usrsctplib/fuzzer/CORPUS_LISTEN
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 263611
: 233538