23.08.3.r30

3 files changed, 53 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db3ae9e8e868..0a423a476582 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = kaccounts-providers-git
-	pkgdesc = Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others
-	pkgver = v19.12.1.r40.ga530020
+	pkgdesc = Online account providers for the KAccounts system
+	pkgver = 23.08.3.r30.gc1472cd
 	pkgrel = 1
-	url = https://projects.kde.org/projects/playground/base/kde-accounts/kaccounts-providers
+	url = https://invent.kde.org/network/kaccounts-providers
 	arch = x86_64
 	license = GPL
 	makedepends = extra-cmake-modules
 	makedepends = git
 	makedepends = intltool
 	depends = kaccounts-integration
-	provides = kaccounts-providers
+	provides = kaccounts-providers=23.08.3
 	conflicts = kaccounts-providers
-	source = git+https://invent.kde.org/network/kaccounts-providers.git
+	source = kaccounts-providers::git+https://invent.kde.org/network/kaccounts-providers.git
 	sha256sums = SKIP
 
 pkgname = kaccounts-providers-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 3303ac48e442..b078896112a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,58 @@
-# Maintainer Zanny <lordzanny@gmail.com>
-# Maintainer: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-# Author: Antonio Rojas <arojas@archlinux.org>
+# Maintainer:
+# Contributor: Zanny <lordzanny@gmail.com>
+# Contributor: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+# Contributor: Antonio Rojas <arojas@archlinux.org>
 
-pkgname=kaccounts-providers-git
-_name=kaccounts-providers
-pkgver=v19.12.1.r40.ga530020
+_pkgname="kaccounts-providers"
+pkgname="$_pkgname-git"
+pkgver=23.08.3.r30.gc1472cd
 pkgrel=1
-pkgdesc='Small system to administer web accounts for the sites and services across the KDE desktop, including: Google, Facebook, Owncloud, IMAP, 
-Jabber and others'
+pkgdesc='Online account providers for the KAccounts system'
+url='https://invent.kde.org/network/kaccounts-providers'
+license=('GPL')
 arch=(x86_64)
-url='https://projects.kde.org/projects/playground/base/kde-accounts/kaccounts-providers'
-license=(GPL)
-depends=(kaccounts-integration)
-makedepends=(extra-cmake-modules git intltool)
-provides=(kaccounts-providers)
-conflicts=(kaccounts-providers)
-source=("git+https://invent.kde.org/network/$_name.git")
+
+depends=(
+  'kaccounts-integration'
+)
+makedepends=(
+  'extra-cmake-modules'
+  'git'
+  'intltool'
+)
+
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $_name
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$_pkgsrc"
+
+  local _tag=$(git tag | grep -Ev '\.[0-9][0-9]$' | sort -V | tail -1)
+  local _revision=$(git rev-list --count $_tag..HEAD)
+  local _hash=$(git rev-parse --short HEAD)
+
+  printf '%s.r%s.g%s' \
+    "${_tag#v}" \
+    "$_revision" \
+    "$_hash"
 }
 
 build() {
-  cmake -B build -S $_name
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -DBUILD_TESTING=OFF
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
   cmake --build build
 }
 
 package() {
-  DESTDIR="$pkgdir" cmake --install build
+  DESTDIR="${pkgdir:?}" cmake --install build
 }