From 679fbf15661ee0f3ee294716ab90b96d3f138326 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Fri, 18 Dec 2015 19:16:58 +0100
Subject: [PATCH] Accept licence
---
ci/travis/before_install.sh | 3 +--
setup.py | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index e37cda69..5e82c0e2 100755
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -1,6 +1,5 @@
brew update
-brew install wget
brew install libsodium
## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
brew install qt5
@@ -32,7 +31,7 @@ wget http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.
tar xzf PyQt-gpl-5.5.1.tar.gz
cd PyQt-gpl-5.5.1/
pyenv activate sakia-env
-python configure.py --verbose
+python configure.py --verbose --confirm-license
make && make install
pyenv rehash
diff --git a/setup.py b/setup.py
index fb1a7ce1..81773159 100644
--- a/setup.py
+++ b/setup.py
@@ -53,8 +53,6 @@ if sys.platform == "win32":
includefiles.append((os.path.join(path, "Scripts", "plugins", "iconengines", f), os.path.join("iconengines", f) ))
includefiles.append(libEGL_path)
includefiles.append(libsodium_path)
-elif sys.platform == "darwin":
- pass
else:
libsodium_path = ""
print(QtCore.QCoreApplication.libraryPaths())
--
GitLab