Summary: | net-im/telegram-desktop: Update to 2.8.11 | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Henry Hu <henry.hu.sh> | ||||||||||||
Component: | Individual Port(s) | Assignee: | Li-Wen Hsu <lwhsu> | ||||||||||||
Status: | Closed FIXED | ||||||||||||||
Severity: | Affects Only Me | CC: | dmitry.wagin, lwhsu, xxjack12xx | ||||||||||||
Priority: | --- | ||||||||||||||
Version: | Latest | ||||||||||||||
Hardware: | Any | ||||||||||||||
OS: | Any | ||||||||||||||
URL: | https://github.com/telegramdesktop/tdesktop/releases/tag/v2.8.11 | ||||||||||||||
Bug Depends on: | 257289 | ||||||||||||||
Bug Blocks: | |||||||||||||||
Attachments: |
|
Description
Henry Hu
2021-07-20 00:02:22 UTC
Created attachment 226575 [details]
Patch to 2.8.11
Updated patch. I've added 2 patches so that it now builds on FreeBSD 12 (with LLVM 10). One class specifies both operator== and operator!=. As a result, Clang 10 thinks that it's ambiguous. Clang 11 is fine.
I'm not sure if we need to add the additional dependencies reported by stage-qa. IMO, they're dependencies of tg_owt, not telegram-desktop. They're included because telegram is statically linked, so the libraries are carried here.
As we've already added them to tg_owt, maybe we should not dup them here?
Poudriere logs on 12.2/amd64: https://raw.githubusercontent.com/HenryHu/ports/master/.logs/12.2-amd64/tg_owt-0.0.20210718.log https://raw.githubusercontent.com/HenryHu/ports/master/.logs/12.2-amd64/telegram-desktop-2.8.11.log A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c4c9a818b894f8d37374e4d5ccfcb1f628dfb52 commit 4c4c9a818b894f8d37374e4d5ccfcb1f628dfb52 Author: Henry Hu <henry.hu.sh@gmail.com> AuthorDate: 2021-07-21 19:30:54 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-07-21 19:30:54 +0000 net-im/telegram-desktop: Update to 2.8.11 * New dependency, rnnoise * It starts using jemalloc. For FreeBSD, we can use the system one. We also don't need to link against jemalloc, etc. * Remove some integrated patches. PR: 257290 net-im/telegram-desktop/Makefile | 4 ++-- net-im/telegram-desktop/distinfo | 6 +++--- ...am_SourceFiles_platform_linux_specific__linux.cpp (new) | 11 +++++++++++ ...h-Telegram_ThirdParty_tgcalls_tgcalls_Manager.cpp (new) | 13 +++++++++++++ ...tch-Telegram_ThirdParty_tgcalls_tgcalls_Manager.h (new) | 10 ++++++++++ ...w_platform_linux_webview__linux__webkit__gtk.cpp (gone) | 11 ----------- ...iew_platform_linux_webview__linux__webkit__gtk.h (gone) | 13 ------------- .../files/patch-cmake_external_CMakeLists.txt (new) | 12 ++++++++++++ .../files/patch-cmake_options__linux.cmake (new) | 14 ++++++++++++++ 9 files changed, 65 insertions(+), 29 deletions(-) Created attachment 226674 [details]
Compilation error
I'm getting a compilation error on 13.0-STABLE
FreeBSD 13.0-STABLE #0 stable/13-n246270-cd2e5ae71bb1: Wed Jul 14 23:39:18 PDT 2021
===> The following configuration options are available for telegram-desktop-2.8.11:
GTK=off: Gtk integration (Use Gtk dialogs, etc.)
====> Audio backend for voice calls: you have to choose at least one of them
ALSA=off: ALSA audio architecture support
PULSEAUDIO=on: PulseAudio sound server support
===> Use 'make config' to modify these settings
Missing dependency from pipewire after pkg autoremove: ld-elf.so.1: Shared object "libpipewire-0.3.so.0" not found, required by "telegram-desktop" (In reply to Dmitry Wagin from comment #6) Ah, now I see the dependency issue is tricky. pipewire is a runtime dependency of tg_owt. But I marked tg_owt as only a build time dependency of telegram-desktop, as it builds libtg_owt.a, which is statically linked to telegram-desktop. As a result, tg_owt would be removed with autoremove after building telegram-desktop. In turn, pipewire would be auto-removed as well. However, telegram-desktop gets the runtime requirement from tg_owt. It can be fixed in one way or the other: 1. make tg_owt a runtime dependency of telegram-desktop This will keep all its runtime dependencies. 2. add the runtime dependencies of tg_owt to telegram-desktop I'd rather not do this as we're duplicating these in both ports; on the other hand, it allows you to remove the tg_owt static library, which is not used. 3. check if tg_owt can be made into a shared library It does have this option; maybe we should explore this possibility. For now, we can choose option 1) first, by moving tg_owt from build dep to lib dep; this would fix the dependency issue, and if in the future we make it a shared lib, it'll still work. (In reply to Jack from comment #4) This is interesting. It's trying to find the symbols of absl 20210324, which seems to be the ports version (https://www.freshports.org/devel/abseil), while tg_owt should have linked with its internal version (which, as I remember, disabled the version-specific namespace). Questions: 1. Do you have the abseil from ports installed? 2. Did you build and install tg_owt first? My machine also has abseil installed, so I think it should work fine even if the port version is installed, but maybe something is missed. I have abseil-20210324.2 installed and tg_owt was built and installed first. I did a portupgrade to upgrade everything and then discovered the failure but manually building it also fails. Created attachment 226698 [details] patch to fix build with libabsl installed (In reply to Jack from comment #9) I realized that I should not remove the old patch of tg_owt; I thought this problem was fixed, but not really. The patch restores the code to add the included libabsl to the beginning of the include paths, thus tg_owt would be compiled with the included libabsl's headers, not the ones from port. Please test it to see if it fixes your problem. I've built tg_owt, then telegram-desktop, on 13, successfully with it. It also added some new dependencies; I realized that these are new ones and should be added. Patch fixed the compilation error. A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8a92dabbfdb03b6b67f190bef193cc58e99f0ae commit f8a92dabbfdb03b6b67f190bef193cc58e99f0ae Author: Henry Hu <henry.hu.sh@gmail.com> AuthorDate: 2021-07-27 19:11:20 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-07-27 19:11:20 +0000 net-im/tg_owt: Adding missing dependencies and revive a required patch PR: 257290 net-im/tg_owt/Makefile | 5 ++++- net-im/tg_owt/files/patch-CMakeLists.txt (new) | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) Created attachment 226748 [details]
patch to add dependencies to telegram-desktop
So, I don't like the idea of copying all the dependencies of tg_owt over.
But I don't like stage-qa to report so many missing dependencies as well.
And making tg_owt a runtime dep of telegram-desktop is also strange, as it's statically linked.
This patch takes the approach of copying the dependencies of tg_owt over to telegram-desktop.
So now you're free to delete tg_owt, after installing telegram-desktop.
stage-qa still reports some missing deps:
* libsoup
* harfbuzz
* cairo
I don't see these deps used anywhere in telegram-desktop or tg_owt. Reading the code, they seem to be introduced by gtk3 and/or webkit2-gtk3. Since they already depend on these libraries, I'll not mark them as dependencies.
Reopen for comment #13 A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=529b6b1239ef88cd68cfe71f5df4e9057e294cb6 commit 529b6b1239ef88cd68cfe71f5df4e9057e294cb6 Author: Henry Hu <henry.hu.sh@gmail.com> AuthorDate: 2021-08-07 04:47:33 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-08-09 05:24:13 +0000 net-im/telegram-desktop: Copying dependencies of tg_owt over to telegram-desktop tg_owt is statically linked but there are some its LIB_DEPENDS still needed by telegram-desktop PR: 257290 net-im/telegram-desktop/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed576bf5cf3e7abcb935f1905160c72ad03c390a commit ed576bf5cf3e7abcb935f1905160c72ad03c390a Author: Li-Wen Hsu <lwhsu@FreeBSD.org> AuthorDate: 2021-08-09 06:25:51 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-08-09 07:37:53 +0000 net-im/telegram-desktop: Bump PORTREVISION for 529b6b1239ef PR: 257290 net-im/telegram-desktop/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) |