forked from pool/python-onionshare
Accepting request 1128355 from devel:languages:python
- Fix dependencies * Add onionshare-pr1677-fix-werkzeug3.patch - PEP517: Use pyproject instead of deprecated setup.py OBS-URL: https://build.opensuse.org/request/show/1128355 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-onionshare?expand=0&rev=16
This commit is contained in:
Git OBS Bridge
1168
onionshare-pr1677-fix-werkzeug3.patch
Normal file
1168
onionshare-pr1677-fix-werkzeug3.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 14:22:20 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Fix dependencies
|
||||
* Add onionshare-pr1677-fix-werkzeug3.patch
|
||||
- PEP517: Use pyproject instead of deprecated setup.py
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 31 16:00:56 UTC 2023 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
||||
@@ -34,49 +34,70 @@ Patch1: fix-test-cli-web.patch
|
||||
Patch2: relax-async-mode.patch
|
||||
# PATCH-FIX-UPSTREAM onionshare-poetry-core.patch -- poetry-core is enough to build and has a much smaller footprint
|
||||
Patch3: https://github.com/onionshare/onionshare/commit/a05d7af729585bdaa4f71437167339ac67bf3327.patch#/onionshare-poetry-core.patch
|
||||
# PATCH-FIX-UPSTREAM onionshare-pr1677-fix-werkzeug3.patch gh#onionshare/onionshare#1677
|
||||
Patch4: onionshare-pr1677-fix-werkzeug3.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: python3-Flask >= 1.4.1
|
||||
BuildRequires: python3-Flask-SocketIO >= 5.0.1
|
||||
BuildRequires: python3-PyNaCl
|
||||
BuildRequires: python3-PySocks
|
||||
BuildRequires: python3-Unidecode
|
||||
BuildRequires: python3-cepa >= 1.8.3
|
||||
BuildRequires: python3-colorama
|
||||
BuildRequires: python3-eventlet
|
||||
BuildRequires: python3-pip
|
||||
BuildRequires: python3-poetry-core
|
||||
BuildRequires: python3-psutil
|
||||
BuildRequires: python3-pyside2 >= 5.15.2
|
||||
BuildRequires: update-desktop-files
|
||||
# SECTION test
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-pytest-qt
|
||||
BuildRequires: python3-pytest-xvfb
|
||||
# /SECTION
|
||||
# SECTION runtime test
|
||||
BuildRequires: python3-Flask >= 2.3.2
|
||||
BuildRequires: python3-Flask-Compress >= 1.13
|
||||
BuildRequires: python3-Flask-SocketIO >= 5.3.1
|
||||
BuildRequires: python3-PyNaCl
|
||||
BuildRequires: python3-PySocks
|
||||
BuildRequires: python3-Unidecode
|
||||
BuildRequires: python3-Werkzeug >= 2.3.4
|
||||
BuildRequires: python3-click
|
||||
BuildRequires: python3-colorama
|
||||
BuildRequires: python3-eventlet
|
||||
BuildRequires: python3-gevent-websocket
|
||||
BuildRequires: python3-psutil
|
||||
BuildRequires: python3-pyside2 >= 5.15.2.1
|
||||
BuildRequires: python3-python-gnupg
|
||||
BuildRequires: python3-qrcode
|
||||
BuildRequires: python3-requests
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-stem >= 1.8.1
|
||||
BuildRequires: python3-urllib3
|
||||
BuildRequires: python3-waitress >= 2.1.2
|
||||
BuildRequires: tor
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: python3-Flask >= 1.4.1
|
||||
Requires: python3-Flask-SocketIO >= 5.0.1
|
||||
# /SECTION
|
||||
Requires: python3-Flask >= 2.3.2
|
||||
Requires: python3-Flask-Compress >= 1.13
|
||||
Requires: python3-Flask-SocketIO >= 5.3.1
|
||||
Requires: python3-PyNaCl
|
||||
Requires: python3-PySocks
|
||||
Requires: python3-Unidecode
|
||||
Requires: python3-cepa >= 1.8.3
|
||||
Requires: python3-Werkzeug >= 2.3.4
|
||||
Requires: python3-click
|
||||
Requires: python3-colorama
|
||||
Requires: python3-eventlet
|
||||
Requires: python3-gevent-websocket
|
||||
Requires: python3-psutil
|
||||
Requires: python3-pyside2 >= 5.15.2
|
||||
Requires: python3-pyside2 >= 5.15.2.1
|
||||
Requires: python3-python-gnupg
|
||||
Requires: python3-qrcode
|
||||
Requires: python3-requests
|
||||
Requires: python3-setuptools
|
||||
Requires: python3-stem >= 1.8.1
|
||||
Requires: python3-urllib3
|
||||
Requires: python3-waitress >= 2.1.2
|
||||
Requires: tor
|
||||
Provides: %{name}-%{version}
|
||||
Obsoletes: %{name}-data < %{version}
|
||||
Obsoletes: python310-onionshare < %{version}
|
||||
Obsoletes: python36-onionshare < %{version}
|
||||
Obsoletes: python38-onionshare < %{version}
|
||||
Obsoletes: python39-onionshare < %{version}
|
||||
Provides: python3-onionshare = %{version}-%{release}
|
||||
Provides: python3-onionshare_cli = %{version}-%{release}
|
||||
Obsoletes: python-onionshare-data < 2.3.1
|
||||
Obsoletes: python310-onionshare < 2.3.1
|
||||
Obsoletes: python36-onionshare < 2.3.1
|
||||
Obsoletes: python38-onionshare < 2.3.1
|
||||
Obsoletes: python39-onionshare < 2.3.1
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -93,17 +114,17 @@ Tor Browser to download the file.
|
||||
|
||||
%build
|
||||
pushd cli
|
||||
%python3_build
|
||||
%python3_pyproject_wheel
|
||||
popd
|
||||
pushd desktop
|
||||
%python3_build
|
||||
%python3_pyproject_wheel
|
||||
|
||||
%install
|
||||
pushd cli
|
||||
%python3_install
|
||||
%python3_pyproject_install
|
||||
popd
|
||||
pushd desktop
|
||||
%python3_install
|
||||
%python3_pyproject_install
|
||||
|
||||
install -Dm 0644 org.onionshare.OnionShare.appdata.xml \
|
||||
%{buildroot}%{_datadir}/metainfo/org.onionshare.OnionShare.metainfo.xml
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
diff -Nur onionshare-2.5/cli/onionshare_cli/web/web.py new/cli/onionshare_cli/web/web.py
|
||||
--- onionshare-2.5/cli/onionshare_cli/web/web.py 2022-01-17 21:56:39.000000000 +0100
|
||||
+++ new/cli/onionshare_cli/web/web.py 2022-02-25 01:35:45.401731026 +0100
|
||||
@@ -164,10 +164,10 @@
|
||||
Index: onionshare-2.6/cli/onionshare_cli/web/web.py
|
||||
===================================================================
|
||||
--- onionshare-2.6.orig/cli/onionshare_cli/web/web.py
|
||||
+++ onionshare-2.6/cli/onionshare_cli/web/web.py
|
||||
@@ -164,10 +164,10 @@ class Web:
|
||||
elif self.mode == "chat":
|
||||
if self.common.verbose:
|
||||
self.socketio = SocketIO(
|
||||
@@ -14,3 +15,16 @@ diff -Nur onionshare-2.5/cli/onionshare_cli/web/web.py new/cli/onionshare_cli/we
|
||||
self.socketio.init_app(self.app)
|
||||
self.chat_mode = ChatModeWeb(self.common, self)
|
||||
|
||||
Index: onionshare-2.6/desktop/pyproject.toml
|
||||
===================================================================
|
||||
--- onionshare-2.6.orig/desktop/pyproject.toml
|
||||
+++ onionshare-2.6/desktop/pyproject.toml
|
||||
@@ -6,7 +6,7 @@ authors = ["Micah Lee <micah@micahflee.c
|
||||
license = "GPLv3+"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
-python = ">=3.7,<3.11"
|
||||
+python = ">=3.7"
|
||||
onionshare_cli = {path = "../cli", develop = true}
|
||||
PySide2 = "5.15.2.1"
|
||||
qrcode = "*"
|
||||
|
||||
Reference in New Issue
Block a user