On Sun, Jul 31, 2022 at 10:39:05PM +0200, Omar Polo wrote:
> Klemens Nanni <k...@openbsd.org> wrote:
> > Looking at our net/tdesktop and github.com/desktop-app/cmake_helpers
> > which is telegram's code handling libdispatch, I'm sure it would pick
> > it up.
> >
> > Right now, it tries to find system dispatch, fails, tries to build the
> > bundled version, fails again since we intentionally zapped the bundle
> > and eventually tdesktop still builds/runs fine...
> >
> > I vaguely remember upstream introducing libdispatch as dependency and
> > Andrew and me trying to disable/neuter it, but I plain forgot how we
> > arrived at the current status quo.
>
> right, if libdispatch is installed is picked up automatically by
> net/tdesktop. I'm playing with diff below and the qt5 package seems to
> work as fine as before (qt5 and not qt6 because i forgot to set FLAVOR
> when building; will try again with qt6 during this week.)
Thanks for testing, the diff is OK kn provided it works for you.
I just sent a qt5 removal diff for tdesktop, maybe you want to retest
qt6 using that.
>
> I'm also reattaching the port with @pkgpath as per sthen's suggestion.
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/net/tdesktop/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 21 Jul 2022 14:11:16 -0000 1.35
> +++ Makefile 31 Jul 2022 18:49:56 -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
> @@ -24,9 +24,10 @@ MAINTAINER = Andrew Krasavin <noiseless
> PERMIT_PACKAGE = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} 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
> +WANTLIB += dispatch gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0
> +WANTLIB += hunspell-1.7 jpeg lz4 m openal qrcodegencpp rnnoise sigc-2.0
> +WANTLIB += swresample swscale tg_owt xcb xcb-keysyms xcb-record
> xcb-screensaver
> +WANTLIB += xxhash z
>
> # C++17 set below
> COMPILER = base-clang ports-gcc
> @@ -48,6 +49,7 @@ LIB_DEPENDS = archivers/lz4 \
> devel/abseil-cpp \
> devel/glib2 \
> devel/glib2mm \
> + devel/libdispatch \
> devel/libsigc++-2 \
> graphics/ffmpeg \
> graphics/qr-code-generator>=1.7.0p1 \
>
>
