Merged with official ABS kdiagram PKGBUILD

2 files changed, 30 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7696558e4462..683ae3b4cc84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = kdiagram-git
-	pkgdesc = Powerful libraries (KChart, KGantt) for creating business diagrams. (GIT version)
-	pkgver = 2.6.1.r21.g47b29c2
+	pkgdesc = Powerful libraries for creating business diagrams
+	pkgver = 2.7.90_r297.gd5089ef
 	pkgrel = 1
-	url = http://quickgit.kde.org/?p=kdiagram.git
-	arch = i686
+	url = https://www.kde.org/
 	arch = x86_64
-	license = LGPL
+	license = GPL2
 	makedepends = git
-	makedepends = extra-cmake-modules
+	makedepends = extra-cmake-modules-git
+	makedepends = qt5-tools
+	makedepends = qt5-doc
+	makedepends = doxygen
 	depends = qt5-svg
 	provides = kdiagram
 	conflicts = kdiagram
-	source = git://anongit.kde.org/kdiagram.git
+	source = git+https://github.com/KDE/kdiagram.git
 	sha256sums = SKIP
 
 pkgname = kdiagram-git
diff --git a/PKGBUILD b/PKGBUILD
index e1b5648cdbf4..b282083f22ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,33 @@
+# Merged with official ABS kdiagram PKGBUILD by João, 2021/02/13 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
+
 pkgname=kdiagram-git
-pkgver=2.6.1.r21.g47b29c2
+pkgver=2.7.90_r297.gd5089ef
 pkgrel=1
-pkgdesc="Powerful libraries (KChart, KGantt) for creating business diagrams. (GIT version)"
-arch=('i686' 'x86_64')
-url='http://quickgit.kde.org/?p=kdiagram.git'
-license=('LGPL')
-depends=('qt5-svg')
-makedepends=('git'
-             'extra-cmake-modules'
-             )
-conflicts=('kdiagram')
-provides=('kdiagram')
-source=("git://anongit.kde.org/kdiagram.git")
+pkgdesc="Powerful libraries for creating business diagrams"
+arch=($CARCH)
+url="https://www.kde.org/"
+license=(GPL2)
+depends=(qt5-svg)
+makedepends=(git extra-cmake-modules-git qt5-tools qt5-doc doxygen)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd kdiagram
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  mkdir -p build
+  cd ${pkgname%-git}
+  _ver="$(git describe | sed 's/^v//;s/-.*//')"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd build
-  cmake ../kdiagram \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DKDE_INSTALL_LIBDIR=lib \
-      -DBUILD_TESTING=OFF
-  make
+  cmake -B build -S ${pkgname%-git} \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  cmake --build build
 }
 
 package() {
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
 }