update to version 2.2.35

3 files changed, 28 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1db6b661519d..51758bbb6431 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gns3-gui
 	pkgdesc = GNS3 network simulator. Graphical user interface package.
-	pkgver = 2.2.34
-	pkgrel = 2
+	pkgver = 2.2.35
+	pkgrel = 1
 	url = https://github.com/GNS3/gns3-gui
 	arch = any
 	groups = gns3
@@ -19,9 +19,11 @@ pkgbase = gns3-gui
 	optdepends = gns3-server: GNS3 backend. Manages emulators such as Dynamips, VirtualBox or Qemu/KVM
 	optdepends = xterm: Default terminal emulator for CLI management of virtual instances
 	optdepends = wireshark-qt: Live packet capture
-	source = gns3-gui-2.2.34.tar.gz::https://github.com/GNS3/gns3-gui/archive/v2.2.34.tar.gz
+	source = gns3-gui-2.2.35.tar.gz::https://github.com/GNS3/gns3-gui/archive/v2.2.35.tar.gz
 	source = gns3.desktop
-	sha256sums = bf66313a4808fdb1cd9b06c72d34fd9fc4bcf5abe990dfd8de70d8128a2c26dc
+	source = fix_requirements_for_Arch.diff
+	sha256sums = 5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b
 	sha256sums = 51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166
+	sha256sums = 8731b2b81ba742e0341347b3b339e3dc446af5d32ae9dc3cc7b42811445656dd
 
 pkgname = gns3-gui
diff --git a/PKGBUILD b/PKGBUILD
index b28f9b5d5f50..aa511eca09ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: korjjj <korjjj+aur[at]gmail[dot]com>
 
 pkgname=gns3-gui
-pkgver=2.2.34
-pkgrel=2
+pkgver=2.2.35
+pkgrel=1
 pkgdesc='GNS3 network simulator. Graphical user interface package.'
 arch=('any')
 url='https://github.com/GNS3/gns3-gui'
@@ -27,20 +27,15 @@ optdepends=(
     'xterm: Default terminal emulator for CLI management of virtual instances'
     'wireshark-qt: Live packet capture')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/GNS3/$pkgname/archive/v$pkgver.tar.gz"
-        'gns3.desktop')
-sha256sums=('bf66313a4808fdb1cd9b06c72d34fd9fc4bcf5abe990dfd8de70d8128a2c26dc'
-            '51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166')
+        'gns3.desktop'
+        'fix_requirements_for_Arch.diff')
+sha256sums=('5dee30a6be10a4463d16c3cec516bf81717fc6f37f4f53386347d98de9a1f43b'
+            '51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166'
+            '8731b2b81ba742e0341347b3b339e3dc446af5d32ae9dc3cc7b42811445656dd')
 
 prepare() {
-    cd "$pkgname-$pkgver"
     # Arch usually has the latest versions. Patch requirements to allow them.
-    sed -i \
-        -e 's|^jsonschema==3\.2\.0|jsonschema>=3.2.0|' \
-        -e 's|^sentry-sdk==1\.9\.5$|sentry-sdk>=1.9.5|' \
-        -e 's|^psutil==5\.9\.1$|psutil>=5.9.1|' \
-        -e 's|^distro==1\.7\.0$|distro>=1.7.0|' \
-        -e 's|^setuptools==60\.6\.0|setuptools>=60.6.0|' \
-        requirements.txt
+    patch --strip=1 -i fix_requirements_for_Arch.diff
 }
 
 build() {
diff --git a/fix_requirements_for_Arch.diff b/fix_requirements_for_Arch.diff
new file mode 100644
index 000000000000..844e8b8c34d2
--- /dev/null
+++ b/fix_requirements_for_Arch.diff
@@ -0,0 +1,14 @@
+--- a/gns3-gui-2.2.35/requirements.txt	2022-11-08 16:40:25.000000000 +0100
++++ b/gns3-gui-2.2.35/requirements.txt	2022-11-09 20:39:43.095699452 +0100
+@@ -1,7 +1,5 @@
+-jsonschema>=4.17.0,<4.18; python_version >= '3.7'
+-jsonschema==3.2.0; python_version < '3.7'  # v3.2.0 is the last version to support Python 3.6
+-sentry-sdk==1.10.1,<1.11
+-psutil==5.9.2
++jsonschema>=4.17.0
++sentry-sdk>=1.10.1
++psutil>=5.9.2
+ distro>=1.7.0
+-setuptools>=60.8.1; python_version >= '3.7'
+-setuptools==59.6.0; python_version < '3.7'  # v59.6.0 is the last version to support Python 3.6
++setuptools>=60.8.1