On Mon, Feb 14, 2022 at 06:32:26AM +0000, Klemens Nanni wrote:
> On Sun, Feb 13, 2022 at 06:15:50PM +0000, Klemens Nanni wrote:
> > Build-testing on sparc64 shows linking errors when building tests.
> > Compiler invocations are the same on amd64 and sparc64, so the "only"
> > difference is base-clang/lld vs. base-gcc/bfd.
> >
> > I don't immediately see what's wrong and other architectures probably
> > have the same issue... so far I've just disabled building tests on
> > sparc64.
>
> That part was about net/libnice and not net/dino, sorry for mixing
> things up. tb provided what looks like a proper fix.
>
> > This way, I can build and package dino on sparc64.
> >
> > Sort LIB_DEPENDS, set NO_TEST and comment patch while here.
>
> Here's an updated version that enables and executes tests.
>
> > dino builds and runs fine with gstreamer1-plugins-base alone but then
> > it'll print this upon startup:
> > rtpbin is not supported on this platform
> >
> > ktrace shows it wants to dlopen() plugins-good libs, thus add it as
> > LIB_DEPENDS; this makes the warning go away and plugins are loaded.
> >
> > SHARED_LIBS are bumped are per check_sym.
> >
> > Feedback? OK?
Anyone?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/dino/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 11 Oct 2021 09:31:25 -0000 1.6
+++ Makefile 20 Feb 2022 16:45:25 -0000
@@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.6 2021/10/11 09:31:25 kn Exp $
COMMENT= XMPP desktop client
-VERSION= 0.2.2
+VERSION= 0.3.0
DISTNAME= dino-${VERSION}
CATEGORIES= net x11
-REVISION= 0
-SHARED_LIBS += dino 0.0 # 0.0
+SHARED_LIBS += crypto-vala 0.0 # 0.0
+SHARED_LIBS += dino 1.0 # 0.0
SHARED_LIBS += qlite 0.0 # 0.1
-SHARED_LIBS += xmpp-vala 0.0 # 0.1
+SHARED_LIBS += xmpp-vala 1.0 # 0.1
HOMEPAGE= https://dino.im/
@@ -24,21 +24,36 @@ BUILD_DEPENDS= devel/gettext,-tools \
lang/vala
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS= x11/gtk+3 \
- devel/libgee \
+LIB_DEPENDS= devel/libgee \
devel/libsoup \
+ graphics/libqrencode \
+ multimedia/gstreamer1/plugins-base \
+ net/libnice \
+ net/libsignal-protocol-c \
+ security/gnutls \
security/gpgme \
security/libgcrypt \
- graphics/libqrencode \
+ security/libsrtp \
+ textproc/gspell \
textproc/icu4c \
- net/libsignal-protocol-c
+ x11/gtk+3
+
+# links against plugins-base, dlopen()s plugins-good
+LIB_DEPENDS += multimedia/gstreamer1/plugins-good
-WANTLIB += assuan atk-1.0 c cairo cairo-gobject gcrypt gdk-3 gdk_pixbuf-2.0
-WANTLIB += gee-0.8 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error gpgme
-WANTLIB += gtk-3 harfbuzz icudata icuuc intl m pango-1.0 pangocairo-1.0
-WANTLIB += qrencode signal-protocol-c soup-2.4 sqlite3
+WANTLIB += atk-1.0 c cairo cairo-gobject enchant-2 gcrypt gdk-3
+WANTLIB += gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0 gmodule-2.0
+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
+
+CONFIGURE_ARGS = -DBUILD_TESTS=ON
post-patch:
${SUBST_CMD} ${WRKSRC}/libdino/CMakeLists.txt
+
+do-test:
+ find ${WRKBUILD} -type f -perm -+x -name \*-test -print -exec {} \;
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/dino/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 4 Oct 2021 16:32:34 -0000 1.4
+++ distinfo 20 Feb 2022 16:45:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (dino-0.2.2.tar.gz) = PgdvUcZZZ8/VHLq/C3JJp+o25hr6Jfk/grk0hGayuGQ=
-SIZE (dino-0.2.2.tar.gz) = 514648
+SHA256 (dino-0.3.0.tar.gz) = OXDKz1OtMou4SN0ZcRgmeX+4rtUQ6fv3/6wq18sR3B4=
+SIZE (dino-0.3.0.tar.gz) = 804810
Index: patches/patch-libdino_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/dino/patches/patch-libdino_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libdino_CMakeLists_txt
--- patches/patch-libdino_CMakeLists_txt 16 Jan 2021 21:08:39 -0000
1.2
+++ patches/patch-libdino_CMakeLists_txt 20 Feb 2022 16:45:25 -0000
@@ -5,7 +5,7 @@ avoid stupid links to libraries
Index: libdino/CMakeLists.txt
--- libdino/CMakeLists.txt.orig
+++ libdino/CMakeLists.txt
-@@ -84,7 +84,7 @@ add_definitions(${VALA_CFLAGS} -DDINO_SYSTEM_PLUGIN_DI
+@@ -93,7 +93,7 @@ add_definitions(${VALA_CFLAGS} -DDINO_SYSTEM_PLUGIN_DI
add_library(libdino SHARED ${LIBDINO_VALA_C}
${CMAKE_BINARY_DIR}/exports/dino_i18n.h)
add_dependencies(libdino dino-vapi)
target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_PACKAGES} m)
Index: patches/patch-main_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/net/dino/patches/patch-main_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-main_CMakeLists_txt
--- patches/patch-main_CMakeLists_txt 16 Jan 2021 21:08:39 -0000 1.2
+++ patches/patch-main_CMakeLists_txt 20 Feb 2022 16:45:25 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-main_CMakeLists_txt,v 1.2 2021/01/16 21:08:39 kn Exp $
-https://github.com/dino/dino/issues/438
+Fix crash on startup, see https://github.com/dino/dino/issues/438
Index: main/CMakeLists.txt
--- main/CMakeLists.txt.orig
+++ main/CMakeLists.txt
-@@ -191,6 +191,7 @@ add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_T
+@@ -217,6 +217,7 @@ add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_T
add_dependencies(dino ${GETTEXT_PACKAGE}-translations)
target_include_directories(dino PRIVATE src)
target_link_libraries(dino libdino ${MAIN_PACKAGES})
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/dino/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 16 Jan 2021 21:08:39 -0000 1.2
+++ pkg/PLIST 20 Feb 2022 16:45:25 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2021/01/16 21:08:39 kn Exp $
@bin bin/dino
+include/crypto-vala.h
include/dino.h
include/dino_i18n.h
include/qlite.h
@@ -7,8 +8,11 @@ include/xmpp-vala.h
lib/dino/
lib/dino/plugins/
@so lib/dino/plugins/http-files.so
+@so lib/dino/plugins/ice.so
@so lib/dino/plugins/omemo.so
@so lib/dino/plugins/openpgp.so
+@so lib/dino/plugins/rtp.so
+@lib lib/libcrypto-vala.so.${LIBcrypto-vala_VERSION}
@lib lib/libdino.so.${LIBdino_VERSION}
@lib lib/libqlite.so.${LIBqlite_VERSION}
@lib lib/libxmpp-vala.so.${LIBxmpp-vala_VERSION}
@@ -33,12 +37,18 @@ share/locale/ca/LC_MESSAGES/dino.mo
share/locale/cs/LC_MESSAGES/dino-omemo.mo
share/locale/cs/LC_MESSAGES/dino-openpgp.mo
share/locale/cs/LC_MESSAGES/dino.mo
+share/locale/da/LC_MESSAGES/dino.mo
share/locale/de/LC_MESSAGES/dino-omemo.mo
share/locale/de/LC_MESSAGES/dino-openpgp.mo
share/locale/de/LC_MESSAGES/dino.mo
+share/locale/el/LC_MESSAGES/dino-omemo.mo
+share/locale/el/LC_MESSAGES/dino-openpgp.mo
+share/locale/el/LC_MESSAGES/dino.mo
share/locale/en/LC_MESSAGES/dino-omemo.mo
share/locale/en/LC_MESSAGES/dino-openpgp.mo
share/locale/en/LC_MESSAGES/dino.mo
+share/locale/eo/LC_MESSAGES/dino-omemo.mo
+share/locale/eo/LC_MESSAGES/dino-openpgp.mo
share/locale/eo/LC_MESSAGES/dino.mo
share/locale/es/LC_MESSAGES/dino-omemo.mo
share/locale/es/LC_MESSAGES/dino-openpgp.mo
@@ -46,6 +56,8 @@ share/locale/es/LC_MESSAGES/dino.mo
share/locale/eu/LC_MESSAGES/dino-omemo.mo
share/locale/eu/LC_MESSAGES/dino-openpgp.mo
share/locale/eu/LC_MESSAGES/dino.mo
+share/locale/fa/LC_MESSAGES/dino-omemo.mo
+share/locale/fa/LC_MESSAGES/dino-openpgp.mo
share/locale/fa/LC_MESSAGES/dino.mo
share/locale/fi/LC_MESSAGES/dino-omemo.mo
share/locale/fi/LC_MESSAGES/dino-openpgp.mo
@@ -59,6 +71,9 @@ share/locale/gl/LC_MESSAGES/dino.mo
share/locale/hu/LC_MESSAGES/dino-omemo.mo
share/locale/hu/LC_MESSAGES/dino-openpgp.mo
share/locale/hu/LC_MESSAGES/dino.mo
+share/locale/id/LC_MESSAGES/dino-omemo.mo
+share/locale/id/LC_MESSAGES/dino-openpgp.mo
+share/locale/id/LC_MESSAGES/dino.mo
share/locale/ie/
share/locale/ie/LC_MESSAGES/
share/locale/ie/LC_MESSAGES/dino-omemo.mo
@@ -70,6 +85,7 @@ share/locale/it/LC_MESSAGES/dino.mo
share/locale/ja/LC_MESSAGES/dino-omemo.mo
share/locale/ja/LC_MESSAGES/dino-openpgp.mo
share/locale/ja/LC_MESSAGES/dino.mo
+share/locale/kab/LC_MESSAGES/dino.mo
share/locale/ko/LC_MESSAGES/dino.mo
share/locale/lb/
share/locale/lb/LC_MESSAGES/
@@ -108,6 +124,9 @@ share/locale/ro/LC_MESSAGES/dino.mo
share/locale/ru/LC_MESSAGES/dino-omemo.mo
share/locale/ru/LC_MESSAGES/dino-openpgp.mo
share/locale/ru/LC_MESSAGES/dino.mo
+share/locale/sq/LC_MESSAGES/dino-omemo.mo
+share/locale/sq/LC_MESSAGES/dino-openpgp.mo
+share/locale/sq/LC_MESSAGES/dino.mo
share/locale/sv/LC_MESSAGES/dino-omemo.mo
share/locale/sv/LC_MESSAGES/dino-openpgp.mo
share/locale/sv/LC_MESSAGES/dino.mo
@@ -115,6 +134,8 @@ share/locale/ta/LC_MESSAGES/dino.mo
share/locale/tr/LC_MESSAGES/dino-omemo.mo
share/locale/tr/LC_MESSAGES/dino-openpgp.mo
share/locale/tr/LC_MESSAGES/dino.mo
+share/locale/uk/LC_MESSAGES/dino-omemo.mo
+share/locale/uk/LC_MESSAGES/dino-openpgp.mo
share/locale/uk/LC_MESSAGES/dino.mo
share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo
share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo
@@ -124,6 +145,8 @@ share/locale/zh_TW/LC_MESSAGES/dino-open
share/locale/zh_TW/LC_MESSAGES/dino.mo
share/metainfo/
share/metainfo/im.dino.Dino.appdata.xml
+share/vala/vapi/crypto-vala.deps
+share/vala/vapi/crypto-vala.vapi
share/vala/vapi/dino.deps
share/vala/vapi/dino.vapi
share/vala/vapi/qlite.deps
