0.4.1.r69

3 files changed, 58 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdff4ab6cd66..f481178d551d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,26 @@
 pkgbase = lightly-git
-	pkgdesc = A modern style for qt applications
-	pkgver = r2184.1a831f7f
+	pkgdesc = Modern style for Qt applications
+	pkgver = 0.4.1.r69.g1a831f7f
 	pkgrel = 1
 	url = https://github.com/boehs/lightly
 	arch = x86_64
 	arch = aarch64
 	license = GPL2
-	makedepends = git
 	makedepends = cmake
 	makedepends = extra-cmake-modules
-	makedepends = kcmutils5
+	makedepends = git
 	makedepends = kdecoration
 	makedepends = qt5-declarative
 	makedepends = qt5-x11extras
+	depends = breeze-icons
 	depends = frameworkintegration5
+	depends = hicolor-icon-theme
+	depends = kcmutils5
 	depends = kdecoration
-	depends = breeze-icons
 	depends = kwayland5
-	depends = hicolor-icon-theme
-	provides = lightly-qt
-	conflicts = lightly-qt
-	source = git+https://github.com/boehs/lightly
-	sha512sums = SKIP
+	provides = lightly
+	conflicts = lightly
+	source = lightly::git+https://github.com/boehs/lightly.git
+	sha256sums = SKIP
 
 pkgname = lightly-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 49f9d7fc5108..304d1aaa9c44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,58 @@
 # Maintainer: Nico <d3sox at protonmail dot com>
 # Contributor: Sefa Eyeoglu <contact@scrumplex.net>
-pkgname=lightly-git
-_gitname=lightly
-pkgver=r2184.1a831f7f
+
+_pkgname="lightly"
+pkgname="$_pkgname-git"
+pkgver=0.4.1.r69.g1a831f7f
 pkgrel=1
-pkgdesc="A modern style for qt applications"
+pkgdesc="Modern style for Qt applications"
+url="https://github.com/boehs/lightly"
 arch=('x86_64' 'aarch64')
-url="https://github.com/boehs/$_gitname"
 license=("GPL2")
-depends=("frameworkintegration5" "kdecoration" "breeze-icons" "kwayland5" "hicolor-icon-theme")
-makedepends=("git" "cmake" "extra-cmake-modules" "kcmutils5" "kdecoration" "qt5-declarative" "qt5-x11extras")
-provides=("lightly-qt")
-conflicts=("lightly-qt")
-source=("git+$url") 
-sha512sums=('SKIP')
+
+depends=(
+  'breeze-icons'
+  'frameworkintegration5'
+  'hicolor-icon-theme'
+  'kcmutils5'
+  'kdecoration'
+  'kwayland5'
+)
+makedepends=(
+  'cmake'
+  'extra-cmake-modules'
+  'git'
+  'kdecoration'
+  'qt5-declarative'
+  'qt5-x11extras'
+)
+
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgname"::"git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_gitname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$_pkgsrc"
+  git describe --long --tags --exclude='*[a-zA-Z][a-zA-Z]*' \
+    | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$_gitname"
-  mkdir -p build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_TESTING=OFF ..
-  make
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DCMAKE_INSTALL_LIBDIR='lib'
+    -DBUILD_TESTING=OFF
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
-  cd "$srcdir/$_gitname/build"
-  make DESTDIR="$pkgdir" install
-  install -Dm 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "$srcdir/$_gitname/COPYING"
+  DESTDIR="${pkgdir:?}" cmake --install build
 }