From b2cb1dd2e1c670ef49ab0e80a4162782a286b513 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 7 May 2020 17:14:48 -0700 Subject: Switch from scripts to entrypoints in setup.py; remove python-packages from snap because they are defined in poetry; fix onionshare and onionshare-gui snap apps definition; switch back to download Qt5 from the internet --- snap/snapcraft.yaml | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'snap') diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d41db04b..5ce700ed 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -18,19 +18,20 @@ apps: common-id: org.onionshare.OnionShareGui command: onionshare-gui plugs: + - desktop - home - - opengl - network - network-bind - - pulseaudio + - removable-media - # onionshare: - # common-id: org.onionshare.OnionShare - # command: onionshare - # plugs: - # - home - # - network - # - network-bind + onionshare: + common-id: org.onionshare.OnionShare + command: onionshare + plugs: + - home + - network + - network-bind + - removable-media parts: onionshare: @@ -41,17 +42,6 @@ parts: python-version: python3 python-packages: - poetry - - setuptools - - wheel - - Click - - Flask - - Flask-HTTPAuth - - pycryptodome - - PyQt5==5.14.0 - - PyQt5-sip - - PySocks - - requests - - stem stage-packages: - libatk-bridge2.0-0 - libatspi2.0-0 @@ -63,8 +53,7 @@ parts: qt5: plugin: nil override-pull: | - #wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run - wget http://10.51.172.1:8000/qt-opensource-linux-x64-5.14.0.run + wget https://download.qt.io/official_releases/qt/5.14/5.14.0/qt-opensource-linux-x64-5.14.0.run echo "4379f147c6793ec7e7349d2f9ee7d53b8ab6ea4e4edf8ee0574a75586a6a6e0e *qt-opensource-linux-x64-5.14.0.run" | shasum -a 256 --check chmod +x qt-opensource-linux-x64-5.14.0.run build-packages: -- cgit v1.2.3-54-g00ecf