Added extra arch & PKGBUILD cleanup

2 files changed, 28 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9da3cf4c75ce..4ff179466f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,33 @@
 pkgbase = plasma-angelfish-git
 	pkgdesc = Web browser for Plasma Mobile
-	pkgver = r855.5869f59
+	pkgver = v1.8.0.r43.g14ecc30
 	pkgrel = 1
 	url = https://invent.kde.org/plasma-mobile/angelfish
 	arch = x86_64
+	arch = arm
+	arch = armv7h
+	arch = armv6h
+	arch = aarch64
 	license = GPL2
 	makedepends = extra-cmake-modules
 	makedepends = git
 	makedepends = corrosion-git
+	makedepends = qt5-svg
+	makedepends = qt5-tools
 	depends = qt5-webengine
+	depends = qt5-feedback
 	depends = purpose
 	depends = kirigami2
-	depends = qt5-feedback
+	depends = ki18n
+	depends = kconfig
+	depends = kcoreaddons
+	depends = kdbusaddons
+	depends = kwindowsystem
+	depends = knotifications
 	provides = plasma-angelfish
 	conflicts = plasma-angelfish
 	source = git+https://invent.kde.org/plasma-mobile/angelfish.git
-	sha512sums = SKIP
+	sha256sums = SKIP
 
 pkgname = plasma-angelfish-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e8f2c35edc6..e1e7a6d58439 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,33 @@
 # Maintainer Gustavo Castro < gustawho [ at ] gmail [ dot ] com >
 
 pkgname=plasma-angelfish-git
-pkgver=r855.5869f59
+pkgver=v1.8.0.r43.g14ecc30
 pkgrel=1
-arch=('x86_64')
+arch=('x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64')
 pkgdesc="Web browser for Plasma Mobile"
 url="https://invent.kde.org/plasma-mobile/angelfish"
 license=('GPL2')
-depends=('qt5-webengine' 'purpose' 'kirigami2' 'qt5-feedback')
-makedepends=('extra-cmake-modules' 'git' 'corrosion-git')
+depends=('qt5-webengine' 'qt5-feedback' 'purpose' 'kirigami2' 'ki18n' 'kconfig'
+         'kcoreaddons' 'kdbusaddons' 'kwindowsystem' 'knotifications')
+makedepends=('extra-cmake-modules' 'git' 'corrosion-git' 'qt5-svg' 'qt5-tools')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 source=("git+${url}.git")
-sha512sums=('SKIP')
+sha256sums=('SKIP')
 
 pkgver() {
   cd angelfish
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 build() {
-  cd angelfish
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -B build
-  make -C build
+  cmake -B build -S angelfish -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
 }
 
 package() {
-  cd angelfish
-  make -C build DESTDIR="${pkgdir}" PREFIX=/usr install
+  DESTDIR="${pkgdir}" cmake --install build
 }
-
-#vim: syntax=sh