Better PKGBUILD

2 files changed, 35 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26f49b67f11d..7676a632bb47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = colorpick-git
 	pkgdesc = Color picker and contrast checker
-	pkgver = r54.16e386d
+	pkgver = r1.52dfc47
 	pkgrel = 1
 	url = https://github.com/agateau/colorpick
 	arch = x86_64
 	license = BSD
+	makedepends = cmake
 	makedepends = git
 	depends = qt5-base
 	depends = kguiaddons
 	depends = kwidgetsaddons
 	provides = colorpick
 	conflicts = colorpick
-	source = colorpick-git::git+https://github.com/agateau/colorpick.git
+	source = colorpick::git+https://github.com/agateau/colorpick.git
 	sha256sums = SKIP
 
 pkgname = colorpick-git
-
diff --git a/PKGBUILD b/PKGBUILD
index e0af1fa916ec..2929a20eb0b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,42 @@
 # Maintainer: redtide <redtid3@gmail.com>
 
-_pkgname="colorpick"
-pkgname="${_pkgname}-git"
-pkgver=r54.16e386d
+_pkgname=colorpick
+pkgname=$_pkgname-git
+pkgver=r1.52dfc47
 pkgrel=1
 pkgdesc="Color picker and contrast checker"
-url="https://github.com/agateau/${_pkgname}"
-arch=('x86_64')
-license=('BSD')
-depends=('qt5-base' 'kguiaddons' 'kwidgetsaddons')
-makedepends=('git')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-source=("${pkgname}"::"git+https://github.com/agateau/${_pkgname}.git")
-sha256sums=('SKIP')
+url=https://github.com/agateau/$_pkgname
+arch=(x86_64)
+license=(BSD)
+depends=(
+  qt5-base
+  kguiaddons
+  kwidgetsaddons
+)
+makedepends=(
+  cmake
+  git
+)
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=($_pkgname::git+$url.git)
+sha256sums=(SKIP)
 pkgver() {
-	cd "${pkgname}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 build() {
-    mkdir -p build
-    cd build
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" "${srcdir}/${pkgname}"
-    cmake --build . --target all
+  local cmake_options=(
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_BUILD_TYPE=None
+    -Wno-dev
+    -B build
+    -S $_pkgname
+  )
+  cmake "${cmake_options[@]}"
+  cmake --build build --verbose
 }
 package() {
-    DESTDIR="${pkgdir}" cmake --build "${srcdir}/build" --target install
-    install -Dm644 "${srcdir}/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  DESTDIR="$pkgdir" cmake --install build
+  install -vDm 644 $_pkgname/LICENSE -t "$pkgdir"/usr/share/licenses/$_pkgname/
+  install -vDm 644 $_pkgname/README.md -t "$pkgdir"/usr/share/doc/$_pkgname/
 }