2.0.0

2 files changed, 36 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f09c6f0d0419..b32290e62977 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,13 @@
 pkgbase = bibata-cursor-theme
 	pkgdesc = Material Based Cursor Theme
-	pkgver = 1.1.2
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://github.com/ful1e5/Bibata_Cursor
 	arch = any
 	license = GPL3
-	makedepends = python-clickgen
+	makedepends = python-clickgen>=2.0.0
 	depends = libxcursor
 	depends = libpng
-	noextract = bibata-cursor-theme-bitmaps-1.1.2.zip
 	options = !strip
-	source = bibata-cursor-theme-1.1.2.tar.gz::https://github.com/ful1e5/Bibata_Cursor/archive/v1.1.2.tar.gz
-	source = bibata-cursor-theme-bitmaps-1.1.2.zip::https://github.com/ful1e5/Bibata_Cursor/releases/download/v1.1.2/bitmaps.zip
-	sha256sums = c0a9b8b09835de7dfc8270de9e4754bc1b96890d4d91b2350fd7ca026f577a62
-	sha256sums = 31ecd4c40d40abf639b3a2b5992f2531a765d8c8b8fefba1f71a3890d53596dd
 
 pkgname = bibata-cursor-theme
diff --git a/PKGBUILD b/PKGBUILD
index cae635575739..a4146f26e14d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,36 +3,58 @@
 # Contributor: ful1e5 <kaizmandhu at gmail dot com>
 
 pkgname=bibata-cursor-theme
-pkgver=1.1.2
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Material Based Cursor Theme"
 arch=('any')
 url="https://github.com/ful1e5/Bibata_Cursor"
 license=('GPL3')
 depends=('libxcursor' 'libpng')
-makedepends=('python-clickgen')
+makedepends=('python-clickgen>=2.0.0')
 options=('!strip')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        "$pkgname-bitmaps-$pkgver.zip::$url/releases/download/v$pkgver/bitmaps.zip")
-noextract=("$pkgname-bitmaps-$pkgver.zip")
-sha256sums=('c0a9b8b09835de7dfc8270de9e4754bc1b96890d4d91b2350fd7ca026f577a62'
-            '31ecd4c40d40abf639b3a2b5992f2531a765d8c8b8fefba1f71a3890d53596dd')
+sha256sums=('c27c40ffde4338cccf71d8ba8977be745dfdfd9caa7753587c72ead021858f19')
 
 prepare() {
   cd Bibata_Cursor-$pkgver
-  mkdir -p bitmaps
-  bsdtar -xf "$srcdir/$pkgname-bitmaps-$pkgver.zip" -C bitmaps
-
   rm -rf themes
 }
 
 build() {
-  cd Bibata_Cursor-$pkgver/builder
-  make build_unix
+  cd Bibata_Cursor-$pkgver
+  echo "Building 'Bibata Modern Amber' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Modern-Amber' \
+    -c 'Yellowish and rounded edge Bibata cursors.' \
+    -d 'bitmaps/Bibata-Modern-Amber'
+
+  echo "Building 'Bibata Original Amber' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Original-Amber' \
+    -c 'Yellowish and sharp edge Bibata cursors.' \
+    -d 'bitmaps/Bibata-Original-Amber'
+
+  echo "Building 'Bibata Modern Classic' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Modern-Classic' \
+    -c 'Black and rounded edge Bibata cursors.' \
+    -d 'bitmaps/Bibata-Modern-Classic'
+
+  echo "Building 'Bibata Original Classic' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Original-Classic' \
+    -c 'Black and sharp edge Bibata cursors.' \
+    -d 'bitmaps/Bibata-Original-Classic'
+
+  echo "Building 'Bibata Modern Ice' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Modern-Ice' \
+    -c 'White and rounded edge Bibata cursors.' \
+    -d 'bitmaps/Bibata-Modern-Ice'
+
+  echo "Building 'Bibata Original Ice' Cursors"
+  ctgen build.toml -p 'x11' -n 'Bibata-Original-Ice' \
+    -c 'White and sharp edge bibata cursors.' \
+    -d 'bitmaps/Bibata-Original-Ice'
 }
 
 package() {
   cd Bibata_Cursor-$pkgver
   install -d "$pkgdir"/usr/share/icons
-  cp -r themes/Bibata-* "$pkgdir"/usr/share/icons
+  cp -r themes/Bibata-* "$pkgdir"/usr/share/icons/
 }