summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Springer2021-04-11 15:43:36 +0200
committerStephan Springer2021-04-11 15:43:36 +0200
commit685cb05745011fddfd3b8911e87be942528e28c3 (patch)
tree9511ba891662f321e38117f90cc92f02259944a2
parent25d8b9bb2f49a6c5151b0e663a828d6f8b3a96e8 (diff)
downloadaur-685cb05745011fddfd3b8911e87be942528e28c3.tar.gz
fix dependencies and requirements
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD15
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5d5ce4fdd38..d1e9379c3de2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gns3-gui-git
pkgdesc = GNS3 network simulator. Graphical user interface package.
- pkgver = v2.2.9.r0.g2530bf97
+ pkgver = v2.2.20.r0.gf90267b4
pkgrel = 1
url = https://github.com/GNS3/gns3-gui
arch = any
@@ -9,7 +9,6 @@ pkgbase = gns3-gui-git
makedepends = git
makedepends = python-setuptools
depends = desktop-file-utils
- depends = gns3-converter
depends = python-distro
depends = python-jsonschema
depends = python-psutil
@@ -18,9 +17,9 @@ pkgbase = gns3-gui-git
depends = python-sip
depends = qt5-svg
depends = qt5-websockets
- 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.
+ 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
provides = gns3-gui
conflicts = gns3-gui
source = gns3-gui::git+git://github.com/GNS3/gns3-gui.git
diff --git a/PKGBUILD b/PKGBUILD
index 5e9891638af0..b522b6821c31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=gns3-gui
pkgname="$_pkgname"-git
-pkgver=v2.2.9.r0.g2530bf97
+pkgver=v2.2.20.r0.gf90267b4
pkgrel=1
pkgdesc='GNS3 network simulator. Graphical user interface package.'
arch=('any')
@@ -15,7 +15,6 @@ conflicts=('gns3-gui')
makedepends=('git' 'python-setuptools')
depends=(
'desktop-file-utils'
- 'gns3-converter'
'python-distro'
'python-jsonschema'
'python-psutil'
@@ -26,9 +25,9 @@ depends=(
'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.')
+ 'gns3-server: GNS3 backend. Manages emulators such as Dynamips, VirtualBox or Qemu/KVM'
+ 'xterm: Default terminal emulator for CLI management of virtual instances'
+ 'wireshark-qt: Live packet capture')
source=("$_pkgname::git+git://github.com/GNS3/$_pkgname.git"
'gns3.desktop')
sha256sums=('SKIP'
@@ -41,7 +40,11 @@ pkgver() {
prepare() {
cd "$_pkgname"
- sed -i -e 's|^psutil==5\.6\.6$|psutil>=5.6.6|' requirements.txt
+ # Arch usually has the latest versions. Patch requirements to allow them.
+ sed -i \
+ -e 's|^psutil==5\.8\.0$|psutil>=5.8.0|' \
+ -e 's|^distro==1\.5\.0$|distro>=1.5.0|' \
+ requirements.txt
}
build() {