On Sun, 13 Dec 2020 11:01:34 +0100 Alex Holst <[email protected]>: > Runs OK on amd64. Would anyone confirm and test on other platforms? > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/dino/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 13 Feb 2020 11:58:55 -0000 1.1.1.1 > +++ Makefile 24 Nov 2020 15:45:30 -0000 > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2020/02/13 11:58:55 landry Exp $ > > COMMENT= XMPP desktop client > -VERSION= 0.1.0 > +VERSION= 0.2.0 > DISTNAME= dino-${VERSION} > CATEGORIES= net x11 > > @@ -34,6 +34,8 @@ WANTLIB += atk-1.0 c cairo cairo-gobject > WANTLIB += gee-0.8 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpgme > WANTLIB += gtk-3 harfbuzz icudata icuuc intl m pango-1.0 pangocairo-1.0 > WANTLIB += qrencode signal-protocol-c soup-2.4 sqlite3 > + > +NO_TEST = Yes > > post-patch: > ${SUBST_CMD} ${WRKSRC}/libdino/CMakeLists.txt > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/dino/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 13 Feb 2020 11:58:55 -0000 1.1.1.1 > +++ distinfo 13 Nov 2020 09:18:24 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (dino-0.1.0.tar.gz) = EAVC/PBXgfN/WocUia/+CoLyBc0V49DTzf1xf6EUmDU= > -SIZE (dino-0.1.0.tar.gz) = 441638 > +SHA256 (dino-0.2.0.tar.gz) = VluV2fxpdBLtyJgiWJD5XSbUKjWU4SaAy9fQONeBL0Y= > +SIZE (dino-0.2.0.tar.gz) = 514257 > Index: patches/patch-plugins_signal-protocol_CMakeLists_txt > =================================================================== > RCS file: patches/patch-plugins_signal-protocol_CMakeLists_txt > diff -N patches/patch-plugins_signal-protocol_CMakeLists_txt > --- patches/patch-plugins_signal-protocol_CMakeLists_txt 7 Apr 2020 > 23:34:52 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,16 +0,0 @@ > -$OpenBSD: patch-plugins_signal-protocol_CMakeLists_txt,v 1.1 2020/04/07 > 23:34:52 jca Exp $ > - > -Loosen the dep on libsignal-protocol-c > - > -Index: plugins/signal-protocol/CMakeLists.txt > ---- plugins/signal-protocol/CMakeLists.txt.orig > -+++ plugins/signal-protocol/CMakeLists.txt > -@@ -32,7 +32,7 @@ if(NOT BUILD_LIBSIGNAL_IN_TREE) > - # libsignal-protocol-c has a history of breaking compatibility on the > patch level > - # we'll have to check compatibility for every new release > - # distro maintainers may update this dependency after compatibility > tests > -- find_package(SignalProtocol 2.3.2 EXACT REQUIRED) > -+ find_package(SignalProtocol 2.3 EXACT REQUIRED) > - else() > - add_subdirectory(libsignal-protocol-c EXCLUDE_FROM_ALL) > - set_property(TARGET curve25519 PROPERTY POSITION_INDEPENDENT_CODE ON) > Index: > patches/patch-xmpp-vala_src_module_xep_0030_service_discovery_module_vala > =================================================================== > RCS file: > patches/patch-xmpp-vala_src_module_xep_0030_service_discovery_module_vala > diff -N > patches/patch-xmpp-vala_src_module_xep_0030_service_discovery_module_vala > --- patches/patch-xmpp-vala_src_module_xep_0030_service_discovery_module_vala > 2 Nov 2020 09:10:42 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,16 +0,0 @@ > -$OpenBSD: > patch-xmpp-vala_src_module_xep_0030_service_discovery_module_vala,v 1.1 > 2020/11/02 09:10:42 jasper Exp $ > - > -https://github.com/dino/dino/commit/8a2edbe661b77dfd66fb038c45690017129db96b > - > -Index: xmpp-vala/src/module/xep/0030_service_discovery/module.vala > ---- xmpp-vala/src/module/xep/0030_service_discovery/module.vala.orig > -+++ xmpp-vala/src/module/xep/0030_service_discovery/module.vala > -@@ -2,7 +2,7 @@ using Gee; > - > - namespace Xmpp.Xep.ServiceDiscovery { > - > --private const string NS_URI = "http://jabber.org/protocol/disco"; > -+public const string NS_URI = "http://jabber.org/protocol/disco"; > - public const string NS_URI_INFO = NS_URI + "#info"; > - public const string NS_URI_ITEMS = NS_URI + "#items"; > - > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/dino/pkg/PLIST,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 PLIST > --- pkg/PLIST 13 Feb 2020 11:58:55 -0000 1.1.1.1 > +++ pkg/PLIST 13 Nov 2020 11:40:33 -0000 > @@ -9,6 +9,7 @@ lib/dino/plugins/ > @so lib/dino/plugins/http-files.so > @so lib/dino/plugins/omemo.so > @so lib/dino/plugins/openpgp.so > +lib/libdino.so.0 > @lib lib/libdino.so.${LIBdino_VERSION} > @lib lib/libqlite.so.${LIBqlite_VERSION} > @lib lib/libxmpp-vala.so.${LIBxmpp-vala_VERSION} > @@ -30,6 +31,9 @@ share/locale/ar/LC_MESSAGES/dino.mo > share/locale/ca/LC_MESSAGES/dino-omemo.mo > share/locale/ca/LC_MESSAGES/dino-openpgp.mo > 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/de/LC_MESSAGES/dino-omemo.mo > share/locale/de/LC_MESSAGES/dino-openpgp.mo > share/locale/de/LC_MESSAGES/dino.mo > @@ -43,6 +47,7 @@ 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.mo > share/locale/fi/LC_MESSAGES/dino-omemo.mo > share/locale/fi/LC_MESSAGES/dino-openpgp.mo > share/locale/fi/LC_MESSAGES/dino.mo > @@ -55,17 +60,26 @@ 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/ie/ > +share/locale/ie/LC_MESSAGES/ > +share/locale/ie/LC_MESSAGES/dino-omemo.mo > +share/locale/ie/LC_MESSAGES/dino-openpgp.mo > +share/locale/ie/LC_MESSAGES/dino.mo > share/locale/it/LC_MESSAGES/dino-omemo.mo > share/locale/it/LC_MESSAGES/dino-openpgp.mo > 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/ko/LC_MESSAGES/dino.mo > share/locale/lb/ > share/locale/lb/LC_MESSAGES/ > share/locale/lb/LC_MESSAGES/dino-omemo.mo > share/locale/lb/LC_MESSAGES/dino-openpgp.mo > share/locale/lb/LC_MESSAGES/dino.mo > +share/locale/lt/LC_MESSAGES/dino-omemo.mo > +share/locale/lt/LC_MESSAGES/dino-openpgp.mo > +share/locale/lt/LC_MESSAGES/dino.mo > share/locale/nb/LC_MESSAGES/dino-omemo.mo > share/locale/nb/LC_MESSAGES/dino-openpgp.mo > share/locale/nb/LC_MESSAGES/dino.mo > @@ -77,10 +91,15 @@ share/locale/nl_BE/LC_MESSAGES/ > share/locale/nl_BE/LC_MESSAGES/dino-omemo.mo > share/locale/nl_BE/LC_MESSAGES/dino-openpgp.mo > share/locale/nl_BE/LC_MESSAGES/dino.mo > +share/locale/oc/LC_MESSAGES/dino-omemo.mo > +share/locale/oc/LC_MESSAGES/dino-openpgp.mo > share/locale/oc/LC_MESSAGES/dino.mo > share/locale/pl/LC_MESSAGES/dino-omemo.mo > share/locale/pl/LC_MESSAGES/dino-openpgp.mo > share/locale/pl/LC_MESSAGES/dino.mo > +share/locale/pt/LC_MESSAGES/dino-omemo.mo > +share/locale/pt/LC_MESSAGES/dino-openpgp.mo > +share/locale/pt/LC_MESSAGES/dino.mo > share/locale/pt_BR/LC_MESSAGES/dino-omemo.mo > share/locale/pt_BR/LC_MESSAGES/dino-openpgp.mo > share/locale/pt_BR/LC_MESSAGES/dino.mo > @@ -93,6 +112,11 @@ share/locale/ru/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 > +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.mo > share/locale/zh_CN/LC_MESSAGES/dino-omemo.mo > share/locale/zh_CN/LC_MESSAGES/dino-openpgp.mo > share/locale/zh_CN/LC_MESSAGES/dino.mo >
I add to remove this line from pkg/PLIST because it is unnecessary and producing an error: +lib/libdino.so.0 otherwise I'm fine. Tested on amd64
