remove branch restriction and update dependencies

2 files changed, 30 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 776448bfdbba..e5d5ce4fdd38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gns3-gui-git
 	pkgdesc = GNS3 network simulator. Graphical user interface package.
-	pkgver = v2.1.9.r25.g3000a9aa
+	pkgver = v2.2.9.r0.g2530bf97
 	pkgrel = 1
 	url = https://github.com/GNS3/gns3-gui
 	arch = any
@@ -8,22 +8,22 @@ pkgbase = gns3-gui-git
 	license = GPL3
 	makedepends = git
 	makedepends = python-setuptools
-	depends = python-jsonschema
+	depends = desktop-file-utils
 	depends = gns3-converter
-	depends = python-raven
+	depends = python-distro
+	depends = python-jsonschema
 	depends = python-psutil
 	depends = python-pyqt5
+	depends = python-sentry_sdk
 	depends = python-sip
 	depends = qt5-svg
 	depends = qt5-websockets
-	depends = desktop-file-utils
-	optdepends = gns3-server-git: GNS3 backend. Manages emulators such as Dynamips, VirtualBox or Qemu/KVM.
-	optdepends = dynamips: Cisco router emulator.
+	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-gtk: Live packet capture.
 	provides = gns3-gui
 	conflicts = gns3-gui
-	source = gns3-gui::git+git://github.com/GNS3/gns3-gui.git#branch=2.1
+	source = gns3-gui::git+git://github.com/GNS3/gns3-gui.git
 	source = gns3.desktop
 	sha256sums = SKIP
 	sha256sums = 51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166
diff --git a/PKGBUILD b/PKGBUILD
index c3d604c2b248..5e9891638af0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=gns3-gui
 pkgname="$_pkgname"-git
-pkgver=v2.1.9.r25.g3000a9aa
+pkgver=v2.2.9.r0.g2530bf97
 pkgrel=1
 pkgdesc='GNS3 network simulator. Graphical user interface package.'
 arch=('any')
@@ -13,13 +13,23 @@ groups=('gns3')
 provides=('gns3-gui')
 conflicts=('gns3-gui')
 makedepends=('git' 'python-setuptools')
-depends=('python-jsonschema' 'gns3-converter' 'python-raven' 'python-psutil'
-         'python-pyqt5' 'python-sip' 'qt5-svg' 'qt5-websockets' 'desktop-file-utils')
-optdepends=('gns3-server-git: GNS3 backend. Manages emulators such as Dynamips, VirtualBox or Qemu/KVM.'
-            'dynamips: Cisco router emulator.'
-            'xterm: Default terminal emulator for CLI management of virtual instances.'
-            'wireshark-gtk: Live packet capture.')
-source=("$_pkgname::git+git://github.com/GNS3/$_pkgname.git#branch=2.1"
+depends=(
+    'desktop-file-utils'
+    'gns3-converter'
+    'python-distro'
+    'python-jsonschema'
+    'python-psutil'
+    'python-pyqt5'
+    'python-sentry_sdk'
+    'python-sip'
+    'qt5-svg'
+    'qt5-websockets'
+)
+optdepends=(
+    'gns3-server: GNS3 backend. Manages emulators such as Dynamips, VirtualBox or Qemu/KVM.'
+    'xterm: Default terminal emulator for CLI management of virtual instances.'
+    'wireshark-gtk: Live packet capture.')
+source=("$_pkgname::git+git://github.com/GNS3/$_pkgname.git"
         'gns3.desktop')
 sha256sums=('SKIP'
             '51e6db5b47e6af3d008d85e8c597755369fafb75ddb2af9e79a441f943f4c166')
@@ -29,6 +39,11 @@ pkgver() {
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+    cd "$_pkgname"
+    sed -i -e 's|^psutil==5\.6\.6$|psutil>=5.6.6|' requirements.txt
+}
+
 build() {
     cd "$_pkgname"
     python setup.py build