On Thu, Nov 10, 2022 at 09:30:07AM +0100, Paco Esteban wrote:
> On Wed, 09 Nov 2022, Klemens Nanni wrote:
>
> > It dies on startup after an update:
> >
> > (dino:78839): libsoup-ERROR **: 10:48:45.147: libsoup3 symbols
> > detected. Using libsoup2 and libsoup3 in the same process is not supported.
> > Trace/BPT trap (core dumped)
> >
> > This is because
> > $ LD_DEBUG=1 dino 2>&1 | grep 'loading: libsoup-[23]'
> > loading: libsoup-3.0.so.0.2 required by
> > /usr/local/lib/libgupnp-1.6.so.0.0
> > loading: libsoup-3.0.so.0.2 required by
> > /usr/local/lib/libgssdp-1.6.so.0.0
> > loading: libsoup-2.4.so.10.6 required by
> > /usr/local/lib/dino/plugins/http-files.so
> >
> > cmake/FindSoup.cmake can be made using version 3, but that blows up the
> > module, so just disable the module.
> >
> > I don't know what it does, but this diff make dino usable again.
>
> I've been looking into this.
> It seems upstream already saw the possibility of using libsoup3 for that
> plugin in the latest version but, for some reason, the version auto
> detect does not work.
>
> There is a config option to force it though. This diff should make it
> work correctly with libsoup3
Builds and runs, OK kn
Can you move the libsoup3 dep out on its own line and comment on
dlopen() like I did?
>
> ok to commit ?
>
> diff /usr/ports
> commit - 7dc231780b8234b049194a8283eafc9fd8f73f7b
> path + /usr/ports
> blob - 4602c86b087376a3da4d7b8019c5f6c68da6b019
> file + net/dino/Makefile
> --- net/dino/Makefile
> +++ net/dino/Makefile
> @@ -1,5 +1,5 @@
> COMMENT= XMPP desktop client
> -VERSION= 0.3.0
> +VERSION= 0.3.1
> DISTNAME= dino-${VERSION}
> CATEGORIES= net x11
>
> @@ -23,7 +23,7 @@ LIB_DEPENDS= devel/libgee \
> RUN_DEPENDS= devel/desktop-file-utils \
> x11/gtk+3,-guic
> LIB_DEPENDS= devel/libgee \
> - devel/libsoup \
> + devel/libsoup3 \
> graphics/libqrencode \
> multimedia/gstreamer1/plugins-base \
> net/libnice \
> @@ -44,9 +44,9 @@ WANTLIB += qrencode signal-protocol-c soup-2.4 sqlite3
> WANTLIB += gnutls gobject-2.0 gpgme gspell-1 gstapp-1.0 gstaudio-1.0
> WANTLIB += gstbase-1.0 gstreamer-1.0 gstrtp-1.0 gtk-3 harfbuzz
> WANTLIB += icudata icuuc intl m nice pango-1.0 pangocairo-1.0
> -WANTLIB += qrencode signal-protocol-c soup-2.4 sqlite3 srtp2
> +WANTLIB += qrencode signal-protocol-c soup-3.0 sqlite3 srtp2
>
> -CONFIGURE_ARGS = -DBUILD_TESTS=ON
> +CONFIGURE_ARGS = -DBUILD_TESTS=ON -DUSE_SOUP3=yes
>
> MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
>
> blob - 2047f7fdbb180e38d725b02fc6dbdcb487539b88
> file + net/dino/distinfo
> --- net/dino/distinfo
> +++ net/dino/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (dino-0.3.0.tar.gz) = OXDKz1OtMou4SN0ZcRgmeX+4rtUQ6fv3/6wq18sR3B4=
> -SIZE (dino-0.3.0.tar.gz) = 804810
> +SHA256 (dino-0.3.1.tar.gz) = qkz4kKY1PPJ/ANbPTNenpVKRUwE4pMYKQJzHFufFRuc=
> +SIZE (dino-0.3.1.tar.gz) = 806613
>
> --
> Paco Esteban.
> 0x5818130B8A6DBC03
>
