On Mon, Jan 24, 2022 at 07:16:42PM +0100, Omar Polo wrote: > Hello, > > Klemens Nanni <k...@openbsd.org> writes: > > > This has been working great so far on amd64 (arm64 I've also tested a > > few weeks ago, with an older version). > > > > Audio and video calls work, with both IPv4 and IPv6. > > We can send files, viewing media works, etc. > > > > There is one rare crash when ending calls in a specific way, but we're > > on it. > > > > All our patches are communicated towards upstream, some need further > > changes to not break other systems, so that'll take some time. > > > > As with tg_owt, I've been using PATCHFILES heavily so we don't carry > > local patch files unless needed. > > maybe I'm blind, but I don't see any PATCHFILES ;) > > % grep -i patch Makefile > PATCHORIG = .pat.orig > # disable use of unported dispatch library
My bad, mixed things up in writing the mails. tdesktop used to have PATCHFILES, now we're carrying patches which haven't beaten into possibly acceptable PRs. Other PRs have been merged already! > > Feedback? OK? > > thanks for working on this port :) > > I can log-in, see previous messages, and even make calls. so far, > everything seems to work fine! > > The port and the patches looks fine, just a couple of things: > > - I'd drop the @echoes and the `ls -x' in post-extract (same story for > tg_owt.) Those are helpful to me at least, especially when updating, to notice new dependencies and get an insight into what is being deleted before deleting it (without maintaining a static list of 3rdparty directories like i used to to before). > - Does it really need PATCHORIG? ThirdParty/hunspell is removed as per > post-extract, so it shouldn't cause any issue with update-patches. Good catch, then it can go in case there are no other offenders left. > Otherwise it's ok for me, but I prefer if someone else could take a look > too. I'll continue to test it and will report any issue found :) > > > However, if possible I'd like if the dbus integration could be enabled. > It's needed to route the notifications through for e.g. dunst (see > settings -> notifications -> use native notifications.) It needs > x11/dbusmenu-qt and to "whitelist" statusnotifieritem, but doesn't grow > the build time significantly. Something like this: This is on the list, but can we handle this in-tree, please? Testing has been without dbus integration, builds do take time and it is a lot of patching already, not to mention the work that went into (new) dependencies, e.g. updates, cleanups, test policies (who know what fun glib2mm, libsigc++-2 and dbusmenu-qt bring in). Once our telegram ports settled, we can polish, upstream, test, etc. See the libyuv for another side-quest that came out of this. > --- /tmp/tdesktop/Makefile Mon Jan 24 15:54:38 2022 > +++ Makefile Mon Jan 24 19:15:44 2022 > @@ -23,14 +23,15 @@ > # rlottie: LGPL 2.1 with freetype, LGPL, MIT, BSD dependencies > PERMIT_PACKAGE = Yes > > -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5Svg > -WANTLIB += Qt5Widgets X11 absl_base absl_int128 absl_log_severity > +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network > +WANTLIB += Qt5Svg Qt5Widgets X11 absl_base absl_int128 absl_log_severity > WANTLIB += absl_raw_logging_internal absl_spinlock_wait absl_strings > WANTLIB += absl_strings_internal absl_throw_delegate avcodec avformat > -WANTLIB += avutil c crypto event_core event_extra hunspell-1.7 > -WANTLIB += lz4 m openal qrcodegencpp rnnoise swresample swscale > -WANTLIB += tg_owt usrsctp vpx xcb xcb-keysyms xcb-record xcb-screensaver > -WANTLIB += xxhash z > +WANTLIB += avutil c crypto dbusmenu-qt5 event_core event_extra > +WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 hunspell-1.7 > +WANTLIB += lz4 m openal qrcodegencpp rnnoise sigc-2.0 swresample > +WANTLIB += swscale tg_owt usrsctp vpx xcb xcb-keysyms xcb-record > +WANTLIB += xcb-screensaver xxhash z > > # C++17 set below > COMPILER = base-clang ports-gcc > @@ -48,13 +49,16 @@ > audio/rnnoise \ > audio/openal \ > devel/abseil-cpp \ > + devel/glib2mm \ > devel/libevent2 \ > + devel/libsigc++-2 \ > graphics/ffmpeg \ > graphics/qr-code-generator>=1.7.0p1 \ > net/tg_owt \ > net/usrsctp>=0.9.5.0p2 \ > sysutils/xxhash \ > textproc/hunspell \ > + x11/dbusmenu-qt \ > x11/qt5/qtsvg > > RUN_DEPENDS = devel/desktop-file-utils \ > @@ -73,7 +77,6 @@ > > # disable unported/unwanted components > CONFIGURE_ARGS += -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \ > - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ > -DDESKTOP_APP_QT6=OFF > > # match standard version with abseil > @@ -87,6 +90,8 @@ > > # archivers/minizip is minizip-ng, telegram requires incompatible original > zlib > NEEDED_BUNDLES += minizip > +# statusnotifieritem is not available in the port tree > +NEEDED_BUNDLES += statusnotifieritem That's what next line is for already. > # unported and required > NEEDED_BUNDLES += rlottie tgcalls > >