Fix error after compiling

2 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d6ab761c75b..b53ba82565af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = canonical-multipass-git
 	pkgdesc = Multipass orchestrates virtual Ubuntu instances
-	pkgver = 1.6.0.dev.r36.gcbd952db
+	pkgver = 1.8.0.r203.g09cd5195
 	pkgrel = 1
 	url = https://multipass.run
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
 	makedepends = git
-	makedepends = libvirt
 	depends = qt5-x11extras
 	depends = apparmor
 	depends = hicolor-icon-theme
-	depends = libssh
-	source = canonical-multipass::git+https://github.com/canonical/multipass
+	depends = libvirt
+	conflicts = poco
+	conflicts = libssh
+	source = git+https://github.com/canonical/multipass.git
 	sha256sums = SKIP
 
 pkgname = canonical-multipass-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4fd310cdbd9d..b018c72ff739 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: Daniele Basso <daniele05 dot bass at gmail dot com>
+# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=canonical-multipass-git
 _pkgname=multipass
-pkgver=1.6.0.dev.r36.gcbd952db
+pkgver=1.8.0.r203.g09cd5195
 pkgrel=1
 pkgdesc="Multipass orchestrates virtual Ubuntu instances"
 arch=('x86_64')
@@ -11,32 +12,34 @@ license=('GPL3')
 depends=('qt5-x11extras'
          'apparmor'
          'hicolor-icon-theme'
-         'libssh')
-makedepends=('cmake' 'git' 'libvirt')
-source=("canonical-multipass::git+https://github.com/canonical/multipass")
+         'libvirt')
+makedepends=('cmake' 'git')
+conflicts=('poco'
+           'libssh')
+source=("git+https://github.com/canonical/multipass.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd canonical-multipass
+  cd $_pkgname
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd canonical-multipass
+  cd $_pkgname
   git submodule update --init --recursive
 }
 
 build() {
-  cd canonical-multipass
+  cd $_pkgname
   rm -rf build
   mkdir -p build
   cd build
-  export CXXFLAGS='-Wno-error=cpp -Wno-error=deprecated-declarations'
+  #export CXXFLAGS='-Wno-error=cpp -Wno-error=deprecated-declarations'
   cmake -DCMAKE_INSTALL_PREFIX=/usr ..
   make
 }
 
 package() {
-  cd canonical-multipass/build
+  cd $_pkgname/build
   make DESTDIR="${pkgdir}" install
 }