From 2beed19a487aa01d502327f2e3afd53c81dddd09 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Wed, 11 May 2022 07:18:13 -0500 Subject: [PATCH 1/2] gns3-server: update to 2.2.32. --- .../gns3-server/patches/requirements.patch | 22 ------------------- srcpkgs/gns3-server/template | 15 ++++++++----- 2 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/gns3-server/patches/requirements.patch diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch deleted file mode 100644 index 27cd2441e53c..000000000000 --- a/srcpkgs/gns3-server/patches/requirements.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,12 +1,11 @@ --jsonschema==3.2.0 -+jsonschema>=3.2.0 --aiohttp==3.7.4.post0 -+aiohttp>=3.7.4 - aiohttp-cors==0.7.0 - aiofiles==0.8.0 --Jinja2==3.0.3 -+Jinja2>=3.0.3 --sentry-sdk==1.5.4 --psutil==5.9.0 -+psutil>=5.9.0 - async-timeout==3.0.1 --distro==1.6.0 -+distro>=1.6.0 - py-cpuinfo==8.0.0 --setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 -+setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 - setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index c45f0a8f8b82..9b8660a43179 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,11 +1,11 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.2.31 -revision=2 +version=2.2.32 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl - python3-Jinja2 python3-psutil python3-aiofiles +depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors + python3-yarl python3-Jinja2 python3-psutil python3-aiofiles python3-py-cpuinfo python3-distro python3-async-timeout dynamips" checkdepends="${depends} python3-pytest python3-flake8 python3-pytest-timeout python3-pytest-aiohttp" short_desc="Graphical Network Simulator 3 - Server" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gns3.com" changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc +checksum=9e208622f91fdca217964e9b93121d85b1415f7d26ba106be035a079beb21519 # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we @@ -23,3 +23,8 @@ checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc # for gns3. For more information, see this ticket: # https://github.com/GNS3/gns3-server/issues/970 archs="x86_64" + +post_patch() { + # comment out requirements since versions are usually out of sync with Void packages + vsed -e 's|^|#|' -i requirements.txt +} From 926d0f0b657f5008b84705a67450ed0422f76b39 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Wed, 11 May 2022 07:18:17 -0500 Subject: [PATCH 2/2] gns3-gui: update to 2.2.32. --- srcpkgs/gns3-gui/patches/requirements.patch | 14 -------------- srcpkgs/gns3-gui/template | 12 +++++++++--- 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/gns3-gui/patches/requirements.patch diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch deleted file mode 100644 index 6cf6d68d94cc..000000000000 --- a/srcpkgs/gns3-gui/patches/requirements.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,5 @@ --jsonschema==3.2.0 -+jsonschema>=3.2.0 --sentry-sdk==1.5.4 --psutil==5.9.0 -+psutil>=5.9.0 --distro==1.6.0 -+distro>=1.6.0 --setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 -+setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 - setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 348325010d73..b5d09ed345dc 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,7 +1,7 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.2.31 -revision=2 +version=2.2.32 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema @@ -14,7 +14,13 @@ license="GPL-3.0-or-later" homepage="https://gns3.com" changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036 +checksum=a43f51567ac69db894d2ac6e41edf1549bc992ddf98979e1576c59b08571d943 + + +post_patch() { + # comment out requirements since versions are usually out of sync with Void packages + vsed -e 's|^|#|' -i requirements.txt +} post_install() { vinstall gns3-gui.desktop 644 usr/share/applications