From 8e87c0b3c29e8a77c5c33a60819db5b75369a76b Mon Sep 17 00:00:00 2001 From: inso <insomniak.fr@gmaiL.com> Date: Fri, 6 May 2016 13:05:21 +0200 Subject: [PATCH] Add libsodium manually (#415) --- sakia.spec | 7 ++++--- src/sakia/core/net/node.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sakia.spec b/sakia.spec index 71d772ac..681431cd 100644 --- a/sakia.spec +++ b/sakia.spec @@ -1,13 +1,11 @@ # -*- mode: python -*- -from PyInstaller.compat import is_darwin, is_win +from PyInstaller.compat import is_darwin, is_win, is_linux import ctypes import subprocess import os block_cipher = None - - a = Analysis(['src/sakia/main.py'], pathex=['.'], binaries=None, @@ -31,6 +29,9 @@ if is_darwin: "libsodium.dylib") a.binaries = a.binaries + TOC([('lib/libsodium.dylib', libsodium_path, 'BINARY')]) +if is_linux: + a.binaries = a.binaries + TOC([('libsodium.so', ctypes.util.find_library('libsodium.so'), 'BINARY')]) + if is_win: a.binaries = a.binaries + TOC([('libsodium.dll', ctypes.util.find_library('libsodium.dll'), 'BINARY')]) diff --git a/src/sakia/core/net/node.py b/src/sakia/core/net/node.py index 113f02a1..03bd1c47 100644 --- a/src/sakia/core/net/node.py +++ b/src/sakia/core/net/node.py @@ -336,7 +336,7 @@ class Node(QObject): if manual: asyncio.ensure_future(self.request_peers()) - + if self._refresh_counter % 20 == 0 or manual: self.refresh_informations() self.refresh_uid() -- GitLab