From d15098030db56915a822867883660be72ed3e8d0 Mon Sep 17 00:00:00 2001 From: svalo Date: Wed, 22 Jan 2020 09:07:43 +0100 Subject: Switches to shared libsignal following upstream direction The old behaviour can be restored enabling --with-libsignal-in-tree flag in configure. For detailed changelog refer to upstream --- .SRCINFO | 5 ++--- PKGBUILD | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ef7f8a8..1081a51 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Nov 12 13:05:21 UTC 2018 pkgbase = dino-git pkgdesc = Simple and modern Jabber/XMPP client written in vala - pkgver = r370.38b5320 + pkgver = r640.3b0a27e1 pkgrel = 1 url = https://github.com/dino/dino arch = i686 @@ -22,6 +20,7 @@ pkgbase = dino-git depends = libsoup depends = sqlite depends = qrencode + depends = libsignal-protocol-c optdepends = libcanberra: audio notification support provides = dino conflicts = dino diff --git a/PKGBUILD b/PKGBUILD index 5ac9b14..f14f3ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,13 +2,13 @@ # Contributor: svalo pkgname=dino-git -pkgver=r370.38b5320 +pkgver=r640.3b0a27e1 pkgrel=1 pkgdesc="Simple and modern Jabber/XMPP client written in vala" arch=('i686' 'x86_64' 'aarch64') url="https://github.com/dino/dino" license=('GPL3') -depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite' 'qrencode') +depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite' 'qrencode' 'libsignal-protocol-c' ) makedepends=('git' 'cmake' 'vala>=0.34' 'ninja') optdepends=('libcanberra: audio notification support') provides=("${pkgname%-git}") @@ -25,6 +25,9 @@ sha512sums=('SKIP') #_ENABLE_PLUGINS="--enable-plugin='notification-sound'" +### Since 55b148a0f78c1abef57c21b2a84d97cad32b2290 dino uses by default the shared libsignal library. +# To restore the old behaviour add '--with-libsignal-in-tree' flag to configure + pkgver() { cd "${srcdir}/${pkgname%-git}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" @@ -32,7 +35,7 @@ pkgver() { build() { cd "${srcdir}/${pkgname%-git}" - ./configure $_DISABLE_PLUGINS $_ENABLE_PLUGINS --prefix="/usr" --with-tests CC="$CC" CFLAGS="$CFLAGS" VALACFLAGS="$VALACFLAGS" + ./configure $_DISABLE_PLUGINS $_ENABLE_PLUGINS --with-tests --prefix="/usr" CC="$CC" CFLAGS="$CFLAGS" VALACFLAGS="$VALACFLAGS" make } @@ -45,7 +48,4 @@ check() { cd "${srcdir}/${pkgname%-git}" echo "Executing xmpp-vala-test:" build/xmpp-vala-test - echo - echo "Executing signal-protocol-vala-test:" - build/signal-protocol-vala-test } -- cgit v1.2.3