From 54dcdc07f81bd5c88ac9e6b1f5c3b9e5460a0e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 10 Aug 2020 13:42:29 +0200 Subject: [PATCH 1/3] libsignal-protocol-c: change to shared library --- common/shlibs | 1 + srcpkgs/libsignal-protocol-c-devel | 1 + srcpkgs/libsignal-protocol-c/template | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 120000 srcpkgs/libsignal-protocol-c-devel diff --git a/common/shlibs b/common/shlibs index 1ff9acf93be..c2afa18f98d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3982,3 +3982,4 @@ libcglm.so.0 cglm-0.7.6_1 libfcft.so.3 fcft-2.2.2_1 libaml.so.0 aml-0.1.0_1 libneatvnc.so.0 neatvnc-0.2.0_1 +libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 diff --git a/srcpkgs/libsignal-protocol-c-devel b/srcpkgs/libsignal-protocol-c-devel new file mode 120000 index 00000000000..7f64c9cf85b --- /dev/null +++ b/srcpkgs/libsignal-protocol-c-devel @@ -0,0 +1 @@ +libsignal-protocol-c \ No newline at end of file diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template index 2f60b284e44..9fa03bf6054 100644 --- a/srcpkgs/libsignal-protocol-c/template +++ b/srcpkgs/libsignal-protocol-c/template @@ -1,9 +1,9 @@ # Template file for 'libsignal-protocol-c' pkgname=libsignal-protocol-c version=2.3.3 -revision=1 +revision=2 build_style=cmake -configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE=ON" +configure_args="-DBUILD_SHARED_LIBS=ON" makedepends="libressl-devel" checkdepends="pkg-config check-devel" short_desc="Signal Protocol C Library" @@ -16,3 +16,13 @@ checksum=c22e7690546e24d46210ca92dd808f17c3102e1344cd2f9a370136a96d22319d if [ "${XBPS_CHECK_PKGS}" ]; then configure_args+=" -DBUILD_TESTING=1" fi + +libsignal-protocol-c-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 08fd4a999539a489b0529e61836dc901fe4a46f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 10 Aug 2020 14:13:42 +0200 Subject: [PATCH 2/3] profanity: rebuild against shared libsignal-protocol-c --- srcpkgs/profanity/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template index 76a846005b9..ff808ba106e 100644 --- a/srcpkgs/profanity/template +++ b/srcpkgs/profanity/template @@ -1,7 +1,7 @@ # Template file for 'profanity' pkgname=profanity version=0.9.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable notify notifications) $(vopt_enable otr) $(vopt_enable pgp) $(vopt_enable python python-plugins) $(vopt_enable plugins) @@ -12,7 +12,7 @@ makedepends="libcurl-devel libglib-devel libstrophe-devel readline-devel sqlite- $(vopt_if notify libnotify-devel) $(vopt_if otr 'libotr-devel libgcrypt-devel') $(vopt_if pgp gpgme-devel) $(vopt_if python python3-devel) $(vopt_if gtk gtk+-devel) $(vopt_if xscreensaver libXScrnSaver-devel) - $(vopt_if omemo 'libsignal-protocol-c libgcrypt-devel')" + $(vopt_if omemo 'libsignal-protocol-c-devel libgcrypt-devel')" checkdepends="cmocka-devel" short_desc="Console based XMPP client" maintainer="Anthony Iliopoulos " From 9abf20a8ffcae218c27d3498d17dfc38ca4ad341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 10 Aug 2020 14:15:21 +0200 Subject: [PATCH 3/3] dino: rebuild against shared libsignal-protocol-c, enable tests --- srcpkgs/dino/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template index 77a5b823dc3..66e853e99f2 100644 --- a/srcpkgs/dino/template +++ b/srcpkgs/dino/template @@ -1,14 +1,15 @@ # Template file for 'dino' pkgname=dino version=0.1.0 -revision=3 +revision=4 build_style=cmake -configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON" +configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON + -DBUILD_TESTS=ON" make_cmd=ninja hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel" makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee08-devel libgcrypt-devel libsoup-devel - libsignal-protocol-c sqlite-devel libcanberra-devel" + libsignal-protocol-c-devel sqlite-devel libcanberra-devel" short_desc='Modern XMPP ("Jabber") Chat Client using GTK+/Vala' maintainer="Anjandev Momi " license="GPL-3.0-or-later" @@ -16,6 +17,11 @@ homepage="https://github.com/dino/dino" distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz" checksum="202b7db322d85389b0bebc3c38976e7f7beaceddd1fc46b8123e50c6c7c07b8d" +do_check() { + build/xmpp-vala-test + build/signal-protocol-vala-test +} + post_install() { rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/*.so